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.

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

feat: Text display of param values #924

Merged
merged 4 commits into from
Aug 1, 2023

Conversation

UberWaffe
Copy link
Collaborator

Future PR for displaying actions and conditions as strings in the event edit window will follow on this.
This is only for displaying parameter values as text in the action and condition edit windows.

@UberWaffe UberWaffe mentioned this pull request Aug 1, 2023
Copy link
Collaborator

@crudelios crudelios left a comment

Choose a reason for hiding this comment

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

Some small changes.

src/core/lang.c Outdated Show resolved Hide resolved
src/scenario/scenario_events_parameter_data.c Show resolved Hide resolved
src/translation/english.c Outdated Show resolved Hide resolved
src/translation/translation.h Outdated Show resolved Hide resolved
src/window/editor/scenario_action_edit.c Outdated Show resolved Hide resolved
src/window/editor/scenario_condition_edit.c Outdated Show resolved Hide resolved
@UberWaffe
Copy link
Collaborator Author

@crudelios Changes made.

@crudelios
Copy link
Collaborator

@UberWaffe I don't think you pushed the changes to github.

@UberWaffe
Copy link
Collaborator Author

@crudelios I swear I am a proper software engineer.
Pushed now.

Copy link
Collaborator

@crudelios crudelios left a comment

Choose a reason for hiding this comment

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

A very small nitpick.

src/core/lang.c Outdated Show resolved Hide resolved
@UberWaffe
Copy link
Collaborator Author

Oh, I see there are conflicts now.
If you are happy with the change, then I'll do a rebase.

@crudelios
Copy link
Collaborator

Ah, you need to fix the merge conflicts now @UberWaffe

@UberWaffe
Copy link
Collaborator Author

@crudelios Allright, rebased and conflicts fixed.

@crudelios crudelios merged commit dd08d4d into Keriew:master Aug 1, 2023
14 checks passed
@UberWaffe UberWaffe deleted the chore/action_cleanups branch August 1, 2023 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants