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

Fix broken dialog choices. #99

Merged
merged 1 commit into from
Mar 26, 2018

Conversation

StraToN
Copy link
Collaborator

@StraToN StraToN commented Mar 26, 2018

No description provided.

@StraToN StraToN requested a review from fleskesvor March 26, 2018 11:46
@StraToN StraToN force-pushed the fix-86-dialogs-broken branch from 50a079a to 1b0bec2 Compare March 26, 2018 11:53
@fleskesvor
Copy link
Collaborator

Great job, @StraToN! 😄I just cherry picked this commit into my Daïza branch and tested, and it works like a charm.

I can also confirm that the *.translation files are auto-generated, so they should be removed from the commit and added to .gitignore.

Copy link
Collaborator

@fleskesvor fleskesvor left a comment

Choose a reason for hiding this comment

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

If you collapse those expanded sections in demo/ui/dd_default.tscn, remove the translation files and add *.translation to .gitignore, I think this is good to be merged. 🙂

custom_constants/separation = 10
alignment = 0
_sections_unfolded = [ "Size Flags" ]
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think that maybe we should make a habit of closing sections before staging scene files for commits, and maybe add this to the contributing guidelines as well, since it adds noise to the diff. Not really a problem in this case though, since there are already the other diffs, like the node indices that Godot 3.0 insists on adding.

@@ -198,6 +206,7 @@ toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
_sections_unfolded = [ "Anchor" ]
Copy link
Collaborator

Choose a reason for hiding this comment

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

This one should be collapsed too.

autowrap = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Mouse", "Rect", "custom_colors", "custom_fonts" ]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Here's another one.

@StraToN StraToN force-pushed the fix-86-dialogs-broken branch from 1b0bec2 to bede12e Compare March 26, 2018 20:54
@StraToN StraToN force-pushed the fix-86-dialogs-broken branch 2 times, most recently from 9464383 to 6b5c647 Compare March 26, 2018 21:02
@StraToN
Copy link
Collaborator Author

StraToN commented Mar 26, 2018

@fleskesvor All your remarks were fixed :)

@fleskesvor fleskesvor merged commit fba9b23 into godot-escoria:master Mar 26, 2018
@StraToN StraToN deleted the fix-86-dialogs-broken branch January 23, 2019 15:42
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