Merge lp:~thenifker13-deactivatedaccount/widelands/trunk into lp:widelands
Proposed by
Antonino Siena
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~thenifker13-deactivatedaccount/widelands/trunk | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
265 lines (+90/-2) 15 files modified
src/editor/editorinteractive.cc (+3/-1) src/editor/ui_menus/main_menu.cc (+16/-0) src/editor/ui_menus/main_menu.h (+2/-0) src/ui_basic/window.cc (+20/-0) src/ui_basic/window.h (+1/-0) src/ui_fsmenu/campaign_select.cc (+2/-0) src/ui_fsmenu/loadgame.cc (+2/-0) src/ui_fsmenu/mapselect.cc (+2/-0) src/ui_fsmenu/scenario_select.cc (+2/-0) src/wui/game_message_menu.cc (+4/-0) src/wui/game_options_menu.cc (+22/-0) src/wui/game_options_menu.h (+5/-0) src/wui/interactive_player.cc (+3/-1) src/wui/login_box.cc (+3/-0) src/wui/story_message_box.cc (+3/-0) |
||||
To merge this branch: | bzr merge lp:~thenifker13-deactivatedaccount/widelands/trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Toni Förster | Approve | ||
Widelands Developers | Pending | ||
Review via email: mp+368235@code.launchpad.net |
Description of the change
Window closing, opening OptionsMenu and exiting using the keyboard.
To post a comment you must log in.
Unmerged revisions
- 9131. By Antonino Siena
-
Merged trunk here
- 9130. By Antonino Siena
-
Proper ESCAPE handling
- 9129. By Antonino Siena
-
Removed unnecessary else-case
- 9128. By Antonino Siena
-
Added ESCAPE -> back functionality for main menu menues
- 9127. By Antonino Siena
-
Open and Close Editor menu using ESCAPE and exit from from Editor using ENTER
- 9126. By Antonino Siena
-
Allow ESCAPE to close story_message_box
- 9125. By Antonino Siena
-
When closing a window using ESCAPE will cause the next open window to gain focus
- 9124. By Antonino Siena
-
Added space to comment
- 9123. By Antonino Siena
-
Instant exit using CTRL+ENTER
- 9122. By Antonino Siena
-
Removed empty line and changed special ESCAPE handling a bit
Continuous integration builds have changed state:
Travis build 5130. State: failed. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 540341469. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ thenifker13_ widelands_ trunk-4912.
Appveyor build 4912. State: failed. Details: https:/