Commit graph

66063 commits

Author SHA1 Message Date
mattsc
f7d9d747c0 New Micro AI: Assassin Squad AI 2016-09-01 14:41:17 -07:00
Celtic Minstrel
e0834cf58b Minor fix to SUF type_tree 2016-09-01 17:31:43 -04:00
Celtic Minstrel
6bd2e67f26 Update XCode project 2016-09-01 17:15:51 -04:00
Charles Dang
0498934b38 MP Create: move options config getter to mp_options_helper 2016-09-02 03:35:57 +11:00
Charles Dang
725df26dd2 MP Create: split options handling into a helper class
This is so the same code can be used for an option-only configure dialog in SP.
2016-09-02 03:23:04 +11:00
Charles Dang
c3a89396fc Cleaned up SP game initialization code 2016-09-02 01:03:20 +11:00
Charles Dang
b1e97e68e2 Game Stats: use list_data for tab bar 2016-09-02 00:14:48 +11:00
Charles Dang
75d60ca184 Game Load: ensure game list toggle panel grows to fill space horizontally
This matches the behavior of all other toggle_panel-based listbox usecases.
2016-09-01 22:46:12 +11:00
Charles Dang
aef6248d34 New map size icon by myself 2016-09-01 21:53:01 +11:00
Charles Dang
92b0b5d337 MP Load Game: don't set gamestate before verifying integrity of save (bug #24512)
The gamestate was being set even though the function returned false if the save was not a
multiplayer one, leading to an incorrect gamestate when a game was subsequently created.
2016-09-01 19:59:31 +11:00
Wedge009
3f10cc72ad Possible fix for bad iterator in config object (bug #25026).
Possibly introduced in 116ff67c. Confirmation on correctness of fix is pending.
Feel free to revert if this change is wrong.
2016-09-01 18:20:00 +10:00
Charles Dang
db2381806d MP Lobby: enable game list horizontal scrollbar for now
Until we figure out what to do about the list of mods possibly being too long,
this prevents window scrollbars.
2016-09-01 15:16:49 +11:00
mattsc
dedb51d2f2 Another Xcode project update 2016-08-31 20:14:25 -07:00
mattsc
c296a67990 Update Xcode project 2016-08-31 19:38:10 -07:00
Charles Dang
f3e63ebc96 MP Lobby: added Replay Options combobox to small resolution layout 2016-09-01 13:12:16 +11:00
Celtic Minstrel
742b4b0be3 Fix an issue with translatable strings that included a possible plural 2016-08-31 21:01:17 -04:00
Celtic Minstrel
43bad8cc13 Some error message improvements 2016-08-31 21:00:00 -04:00
Celtic Minstrel
f24ba1da50 Use reference instead of pointer for pathfinding cost calculator, since it cannot be null 2016-08-31 20:59:59 -04:00
Celtic Minstrel
3f7db7f878 Give error on missing role= in [role] without [auto_recall] 2016-08-31 20:59:58 -04:00
Celtic Minstrel
3ff03cc66b Fix matrix placement policy (mostly) 2016-08-31 20:59:57 -04:00
Celtic Minstrel
8b839e88ad Fix MP Create on smaller resolutions 2016-08-31 20:59:57 -04:00
Celtic Minstrel
3ddb497b13 Fix typo 2016-08-31 20:59:56 -04:00
Celtic Minstrel
d9111620bd Update XCode project 2016-08-31 20:59:38 -04:00
Charles Dang
019f9ab757 Merge pull request #762 from GregoryLundberg/GL_no_map_error_for_UMC_tiles
Errors during Load if the save file has non-standard terrain
2016-09-01 11:36:34 +11:00
Charles Dang
0249780056 Fixup tests 2016-09-01 11:06:39 +11:00
ln-zookeeper
991e72aaef Lowered the volume of the night and morning sounds 2016-09-01 02:21:53 +03:00
Gregory A Lundberg
0a131f873c Fix bug: No need to say it twice
If the exception will be caught and handled, we don't need to say it at all. That's up to the exception handler.
2016-08-31 18:18:49 -05:00
Charles Dang
c4e3838d56 Cleaned up unused variables 2016-09-01 07:56:08 +11:00
Jyrki Vesterinen
6016bdf2f2 Fix two bugs causing multiplayer tests to fail
After finding a game, in some circumstances the join script got the
leader select dialog after only yielding once. Because the loop that
checks when the dialog appears was a repeat-until loop and not a while
loop, it was always run at least once, making the script yield even when
the dialog was already shown. That caused the dialog to close with a
"not shown" status that resulted in exiting the game.

MP tests run two games, not one. A MP wait screen is shown between the
games to the joining player (but not to the host, see
src/game_initialization/playcampaign.cpp:352 ). The join script ended up
quitting between the games. Fixed by simply duplicating code to make the
join script play two games.
2016-08-31 23:45:26 +03:00
Jyrki Vesterinen
446de553bd Fix UB in the playturn_network_adapter class
Comparing iterators from distinct containers is undefined behavior.
2016-08-31 23:45:26 +03:00
Jyrki Vesterinen
88ca728080 Skip the GUI2 FLG dialog in the automatic multiplayer test 2016-08-31 23:45:26 +03:00
Charles Dang
2f90512856 MP Lobby: fixup add_tooltip_data
Was constructing a new map member and not editing an existing one
2016-09-01 07:32:51 +11:00
Charles Dang
4308baac80 MP Create: hide Mods header if none are available 2016-09-01 07:11:28 +11:00
Charles Dang
c08c55b704 MP Lobby: cleanup and improvements to game data 2016-09-01 06:58:03 +11:00
Charles Dang
312a80e55e Campaign Difficulty: split constructor code into an out-of-class function
This allows other areas of the code to cleanly parse the legacy difficulties format.
2016-09-01 06:55:25 +11:00
Charles Dang
8c68d2a253 MP Lobby: few subtle layout improvements 2016-09-01 05:38:24 +11:00
Charles Dang
d64842930e Changed Color Cursors default to Yes, to match the program behavior 2016-09-01 05:38:23 +11:00
Charles Dang
a7bb98a4c8 Merge pull request #761 from GregoryLundberg/GL_role_missing_role
Fix bug [role] missing role=
2016-09-01 05:23:05 +11:00
Gregory A Lundberg
fcbb72d8d0 Fix bug [role] missing role=
Missing role for [role] caused runtime errors. Do NOT report an error on this; using an empty string is intentional. It allows type-prioritized recalls!

"I want to recall the two highest-level bowmen and, if needed, will recruit them. They don't have a role, and won't need one later."

        [repeat]
            times=2
            [do]
                [role]
                    search_recall_list=only
                    type=Master Bowman,Longbowman,Bowman
                    [auto_recall][/auto_recall]
                    [else]
                        [unit]
                            placement=leader
                            side=1
                            type=Bowman
                        [/unit]
                    [/else]
                [/role]
            [/do]
        [/repeat]
2016-08-31 12:51:00 -05:00
ln-zookeeper
0c945f87ab Fix column misalignment in netstats report 2016-08-31 20:16:16 +03:00
Charles Dang
8e5c16dbf6 Specify all members in aggregate initialization 2016-09-01 01:46:26 +11:00
Charles Dang
4654f245f1 Fixed some dialogs not undrawing properly in the addons manage workflow 2016-09-01 01:31:39 +11:00
Charles Dang
b726e9fe1d MP Lobby: improved game row layout
This includes adding a section for active Modifications as the GUI1 lobby does
2016-09-01 00:41:31 +11:00
Charles Dang
8b15851d3d MP Lobby: add correct display formatting and version validation for Campaigns 2016-08-31 20:59:41 +11:00
Charles Dang
3c3f2d71d1 Save addon info for campaigns too 2016-08-31 20:56:36 +11:00
Charles Dang
9ee737454f MP Lobby: some cleanup to addon requirement interface 2016-08-31 13:25:47 +11:00
Charles Dang
7ec92eb754 Create Engine: if only one difficulty is defined, use it without a dialog prompt 2016-08-31 10:35:02 +11:00
Charles Dang
8905b9e84c MP Create: provide defaults to prevent crashes if an empty pref field was passed to string_to_enum 2016-08-31 10:30:00 +11:00
Charles Dang
432fac588e MP Lobby: port 'missing addon requirements' interface from GUI1 lobby
Still could use some polish, perhaps.
2016-08-31 10:28:09 +11:00
Celtic Minstrel
b24fdbcbe1 Merge pull request #759 from GregoryLundberg/GL_modify_unit_mode
Add mode=replace to [modify_unit]
2016-08-30 12:31:23 -04:00