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

Jump to bottom

Show the turn dialog before updating the GUI for the incoming player. #4188

Merged
merged 1 commit into from Aug 10, 2019
Merged

Show the turn dialog before updating the GUI for the incoming player. #4188

merged 1 commit into from Aug 10, 2019

Conversation

jostephd
Copy link
Member

In hotseat games, the main map and minimap were updated and healing was animated
before blacking out the display for the turn dialog.

Fixes #4187.

@jostephd
Show the turn dialog before updating the GUI for the incoming player.
3da11ba 
In hotseat games, the main map and minimap were updated and healing was animated
before blacking out the display for the turn dialog.

Fixes wesnoth#4187.
@jostephd jostephd added this to the 1.14.9 milestone Jul 21, 2019
@jostephd jostephd self-assigned this Jul 21, 2019
@jostephd jostephd mentioned this pull request Jul 21, 2019
Open
@jostephd
Copy link
Member Author

Forgot to post the patch I tested this with:

patch for testing 
diff --git a/data/multiplayer/scenarios/2p_The_Freelands.cfg b/data/multiplayer/scenarios/2p_The_Freelands.cfg
index ed03d36a7cf..c4076992a2a 100644
--- a/data/multiplayer/scenarios/2p_The_Freelands.cfg
+++ b/data/multiplayer/scenarios/2p_The_Freelands.cfg
@@ -36,5 +36,10 @@
             x=26
             y=22
         [/village]
+        {NOTRAIT_UNIT 2 (Mage of Light) 20 20}
+        {NOTRAIT_UNIT 2 (Armageddon Drake) 20 19}
+        [+unit]
+            hitpoints=1
+        [/unit]
     [/side]
 [/multiplayer]

@jostephd jostephd merged commit 21ec796 into wesnoth:master Aug 10, 2019
This was referenced Aug 14, 2019
Merged
Closed
Closed
Closed
jostephd added a commit that referenced this pull request Aug 16, 2019
@jostephd
Revert #4188 and its fixup #4230
612a913 
Fixes #4238 (which called for this revert)
Fixes #4240 (regression in #4188)
Reopens #4187

* Revert "fixup! Show the turn dialog before updating the GUI for the incoming player."

This reverts commit 511553d.

* Revert "changelog: Add #4187"

This reverts commit dada4e1.

* Revert "Show the turn dialog before updating the GUI for the incoming player."

This reverts commit 21ec796.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jostephd jostephd

Labels
None yet
Projects
None yet
Milestone
1.14.9
Development

Successfully merging this pull request may close these issues.

Main map, minimap, auras and floating text (healing) visible during turn dialog during hotseat MP games
1 participant
@jostephd