65219 Commits

Author SHA1 Message Date
ln-zookeeper
4d39da6d2d Commented out the trap event for now
I didn't remove it completely yet, simply for the sake of preserving the string in case I come up with a better version of the trap.
2016-08-12 11:21:34 +03:00
Charles Dang
6441165187 Logging: use radio buttons 2016-08-12 18:33:12 +11:00
Charles Dang
9598d30f5d MP Create: progress and disabled test for now 2016-08-12 18:16:34 +11:00
Ignacio R. Morelle
69332b14ec Fix warnings about uninitialized struct members with GCC 6 2016-08-12 02:41:34 -04:00
Charles Dang
cf4f4883ab ttree_view: added a clear() function 2016-08-12 13:34:17 +11:00
Charles Dang
7cf6df5910 MP Create: fixed some layout issues on smaller resolutions 2016-08-12 13:21:24 +11:00
Charles Dang
62a299d1eb Mp Create: further progress, including adding a page for custom Options 2016-08-12 12:22:24 +11:00
Celtic Minstrel
d83acc004a Merge pull request #742 from GregoryLundberg/GL_cave_seed_to_info
Use info level
2016-08-11 18:11:43 -04:00
Jyrki Vesterinen
8d1cb23f82 MP create: fix UB if filter excludes all campaigns/scenarios/maps 2016-08-11 22:41:54 +03:00
Jyrki Vesterinen
3d8c29bc29 Fix a stray ; character appearing in the command console
The GUI1 textbox widget had a mechanism to reject input until it has
received an SDL_KEYDOWN event, but it didn't do any good. I suspect this
regressed in commit 61ccf2fc, which changed the type of the event handler
container from std::vector to std::list. Apparently, starting from that
commit, an event (say, an SDL_KEYDOWN event) will also be delivered to
any event listeners which are registered by existing event handlers.

In other words:
1. the player presses ;
2. SDL generates an SDL_KEYDOWN event
3. a handler for that event creates the command console
4. the command console registers a handler for SDL events
5. the original keypress event is delivered to the command console
6. the console starts listening for input as a result of that event
7. SDL generates an SDL_TEXTINPUT event, still for the same keypress
8. the console inserts the ; character

I made the textbox loop through all the keys in construction, and store a
set of all pressed keys. The box will ignore all input until all the keys
which were down at the time it was created have been released. The fix
stops the stray ; character from appearing.
2016-08-11 22:17:29 +03:00
ln-zookeeper
087a2822d1 Fixed broken bandits code 2016-08-11 18:21:21 +03:00
Charles Dang
8651dabfe9 MP Create: major progress on layout of GUI2 MP Create dialog 2016-08-11 18:10:52 +11:00
Gregory A Lundberg
db7d3b7646 Use info level
The cave map generator displays the seed on stderr. Move it to the logging system at 'info' level.
2016-08-10 18:33:01 -05:00
Charles Dang
6235e18bbd Replace resources::teams with resources::gameboard->teams() 2016-08-11 07:27:48 +11:00
gfgtdf
65a8c44495 Merge pull request #741 from GregoryLundberg/GL_snub_infinite_loop
Reverse commit 18d7736
2016-08-10 22:15:42 +02:00
Gregory A Lundberg
200b2da538 Reverse commit 18d7736
Commit 18d7736 caused an infinite loop.

In HttT S14 we have a sighted event which includes [teleport] tags. This commit causes the sighted event to run to completion, then re-fire, in an infinite loop. Removing the [teleport] tags stopped the loop. Reversing this commit does, as well.
2016-08-10 15:09:55 -05:00
Celtic Minstrel
9c64028dd2 Update XCode project 2016-08-10 15:36:39 -04:00
Celtic Minstrel
f40925beab Neaten the list of test-excluded dialogs 2016-08-10 14:54:25 -04:00
Celtic Minstrel
1a5ce49bf6 Re-enable unit map and recall list tests 2016-08-10 14:54:25 -04:00
Charles Dang
89246cd473 MP Create: minor progress, mostly bringing the existing content to a semi-proper layout 2016-08-11 05:48:31 +11:00
Charles Dang
e04be90254 Updated CB projectfile 2016-08-11 05:47:16 +11:00
Jyrki Vesterinen
8259e160d0 Update Visual Studio project 2016-08-10 19:25:46 +03:00
gfgtdf
869d5a1b78 fix travis build
don't know why the previous code compiled on msvc but not on travis.
2016-08-10 17:21:38 +02:00
gfgtdf
16d5221934 fixup a20f221e83 and improve advance_unit() interface 2016-08-10 16:57:54 +02:00
gfgtdf
a20f221e83 remove dialogs.cpp
And move its code in other files where it fits better.

This also moves some code from actions.cpp to the new file
advancements.cpp

This also removed a parameter from show_objectives and
menu_handler::objectives that was always gui_->viewing_side()
2016-08-10 16:06:54 +02:00
Charles Dang
c3f07f1f73 tunit_attack: simplify damage calc callback by calling gui::show_dialog directly
As opposed to manually "clicking" the button.
2016-08-10 22:28:43 +11:00
Charles Dang
34d6df9e43 Exclude Unit Advance from tests 2016-08-10 21:23:15 +11:00
Charles Dang
11162e02e7 Game Stats: fixed handling and display of leaderless, non-hidden sides 2016-08-10 19:46:25 +11:00
Charles Dang
fc0235d675 Removed GUI1 unit preview pane code (finally!) 2016-08-10 18:11:45 +11:00
Celtic Minstrel
50c0c56fdf Minor cleanup 2016-08-10 03:09:31 -04:00
Celtic Minstrel
41f3547fe4 Update scons and CMake 2016-08-10 03:07:34 -04:00
Celtic Minstrel
5a5ecc98c2 Unit tests: make global fixture a bit more readable 2016-08-10 03:07:32 -04:00
Celtic Minstrel
8c54a37350 XCode: Fix runpaths for unit tests 2016-08-10 03:07:32 -04:00
Celtic Minstrel
75cde5ee02 XCode: Fix unit tests build 2016-08-10 03:07:31 -04:00
Charles Dang
650f0c0912 Unit List: removed a duplicate border definition 2016-08-10 17:59:53 +11:00
Charles Dang
ce5cb51c57 Language Selection: use a proper toggle panel list instead of toggle buttons 2016-08-10 17:52:35 +11:00
Charles Dang
bf734e3289 Use std::map::emplace in all dialogs when applicable 2016-08-10 17:36:52 +11:00
Charles Dang
b5ec03c81b Cleaned up some unnecessary make_pair calls in recent dialogs 2016-08-10 16:57:15 +11:00
Charles Dang
c099376749 Removed some more unused code
Orphaned in 105fbe6bc6677
2016-08-10 14:50:25 +11:00
Charles Dang
55b81f6264 Removed unused parameter from status_table()
Orphaned in 79de5a8ae81e
2016-08-10 14:45:46 +11:00
Charles Dang
09b116c6a7 Removed some unused GUI1 code 2016-08-10 14:35:52 +11:00
Charles Dang
ba6486eef4 tgame_stats: fixed a few issues with displaying unknown sides
Previously, if a side wasn't know and you weren't in debug mode, the 'Unknown' rows
weren't being added to the list. In addition, continuing to the next team meant the
scenario settings list didn't get filled in with the unknown sides either.
2016-08-10 14:01:33 +11:00
Charles Dang
5398980ac0 Unit Advance: some layout improvements, code cleanup and clarification, and a minor issue fix
The fix is disabling ESC-closing of the dialog.
2016-08-10 13:40:06 +11:00
Charles Dang
ebf90fbd94 Update CB projectfile 2016-08-10 13:18:48 +11:00
Celtic Minstrel
fbf87ca797 Update XCode project 2016-08-09 22:04:04 -04:00
Charles Dang
79de5a8ae8 Convert Scenario Status/Settings dialog pair to GUI2 2016-08-09 22:01:14 -04:00
Celtic Minstrel
8a9a466a29 Revert "Convert Scenario Status/Settings dialog pair to GUI2"
This reverts commit bb49be8428d4226b7a6fa7343f0d45af4558c3ed.
2016-08-09 21:58:48 -04:00
Charles Dang
bb49be8428 Convert Scenario Status/Settings dialog pair to GUI2 2016-08-10 12:52:26 +11:00
Celtic Minstrel
febb34cfbb Convert unit advancement dialog to GUI2 2016-08-09 20:49:48 -04:00
Celtic Minstrel
a8477e3ce0 Use references instead of pointers in unit_preview_pane 2016-08-09 20:49:48 -04:00