upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 15:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,789 Commits 52 Branches 374 Tags
Commit Graph

65789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lari Nieminen
8121eef2a0 Merge pull request #755 from GregoryLundberg/GL_AToTB_S02_improve_ai 
AToTB S02 Improve AI
 2016-08-30 19:27:31 +03:00
ln-zookeeper
90b0d66433 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2016-08-30 18:56:28 +03:00
ln-zookeeper
c0c696a8d0 New Tentacle of the Deep sprite with animated ripples, by Blarumyrran 
Old animation frames left in for compatibility.
 2016-08-30 18:55:44 +03:00
Charles Dang
ce2f274f04 Yet another attempt to satisfy travis 2016-08-31 02:38:36 +11:00
Charles Dang
40d9f73306 Attempt to satisfy travis 2016-08-30 21:47:54 +11:00
Charles Dang
14c44d0ea9 Load Game: fixed game list being empty with long filenames on small resolutions 
For some reason, without horizontal_scrollbar_mode = "never", the game didn't utilize the
window scrollbar and instead simply failed to place the listbox content grid. This resolves that,
as well as reducing the the filename truncate size so names fit fine on 800x600 without said
window scrollbar. Also, it ensures a horizontal scrollbar won't appear in the leaders list.
 2016-08-30 21:43:35 +11:00
Charles Dang
9608e92209 Removed unnecessary empty era 2016-08-30 19:44:59 +11:00
Charles Dang
3cb8878b9a Fix duplicate loading of eras in mp 
This fixes warnings about the era macros being redefined without being #undef-ed when
loading MP.
 2016-08-30 19:39:00 +11:00