Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change color of overwritten settings equal to overwrite to orange #1285

Merged
merged 17 commits into from
Feb 7, 2020
Merged

Change color of overwritten settings equal to overwrite to orange #1285

merged 17 commits into from
Feb 7, 2020

Conversation

veteran29
Copy link
Member

@veteran29 veteran29 commented Jan 19, 2020 •
edited
Loading

When merged this pull request will:

  • title

image

@veteran29 veteran29 requested a review from commy2 January 19, 2020 17:28
@commy2
Copy link
Contributor

commy2 commented Feb 2, 2020

with some combinations I was able to achieve green cross icon, not sure why

lol

@veteran29 veteran29 marked this pull request as ready for review February 2, 2020 18:46
@veteran29
Copy link
Member Author

Ready for review

Elgin675
Elgin675 reviewed Feb 2, 2020
View reviewed changes
Copy link
Contributor

@Elgin675 Elgin675 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

French translation ;) !

addons/settings/stringtable.xml Outdated Show resolved Hide resolved
Elgin675
Elgin675 suggested changes Feb 2, 2020
View reviewed changes
Copy link
Contributor

@Elgin675 Elgin675 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Translated French again ;).

addons/settings/stringtable.xml Outdated Show resolved Hide resolved
addons/settings/stringtable.xml Show resolved Hide resolved
addons/settings/stringtable.xml Show resolved Hide resolved
@commy2
Copy link
Contributor

commy2 commented Feb 3, 2020

Looks very clean, so the settings stuff can't be written all that bad, right??

@veteran29
Copy link
Member Author

Never said it was, it just feels little bit different from other more CBA Event based stuff. But it's fairly easy to work on it after you learn what is where ;P

@commy2
Copy link
Contributor

commy2 commented Feb 3, 2020

Sadly events don't really work outside of missions, and this stuff is also meant for the editor and main menu.

@veteran29
Copy link
Member Author

Applied changes from suggestions

@commy2 commy2 added this to the 3.13.1 milestone Feb 7, 2020
@commy2 commy2 self-assigned this Feb 7, 2020
@commy2 commy2 merged commit ad470c0 into CBATeam:master Feb 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Elgin675 Elgin675 Elgin675 requested changes

@commy2 commy2 commy2 approved these changes

Assignees

@commy2 commy2

Labels
Enhancement
Projects
None yet
Milestone
3.14
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@veteran29 @commy2 @Elgin675