70899 Commits

Author SHA1 Message Date
Matthias Krüger
dc33cf7ceb pofix: add fixes of previous commits. 2018-02-06 23:03:06 +11:00
Matthias Krüger
1a09ba1c75 doc: fix some typos 2018-02-06 23:03:06 +11:00
Matthias Krüger
b11d3fdcbe fix a bunch of typos found by codespell in data directory.
https://github.com/lucasdemarchi/codespell
2018-02-06 23:03:06 +11:00
Charles Dang
d1dd0013d8 MP Join Game: don't show "null" as gender tooltip
The gender handling needs some refactoring, but this is a quick fix to the immediately
noticeable issue. Fixes last item in #2040.
2018-02-06 22:59:13 +11:00
Charles Dang
c795b316c7 Fixed user_team_name displaying incorrectly after leaving and rejoining a game
Fixes part of #2040.
2018-02-06 22:11:12 +11:00
Jyrki Vesterinen
eb974afa15 Fix signed/unsigned comparisons in text serialization unit tests
Comparing signed and unsigned numbers can result in a negative number
matching a positive one, which is why compilers emit a warning about it.

See boostorg/test#129. I originally missed that the issue was in our code.
2018-02-06 10:49:40 +02:00
Charles Dang
4e42be184c Re-implement tiling options in the storyscreen (fixes #1027)
FINALLY. @celticminstrel
2018-02-06 19:29:01 +11:00
Celtic Minstrel
4b58a52140
Shouldn't have the same __metatable for two metatables 2018-02-06 00:15:22 -05:00
Charles Dang
5134033e30 Name __metatable for wml.variables
[ci skip]
2018-02-06 16:10:29 +11:00
Charles Dang
40706a8837 Added confirmation when clearing map labels (fixes #2371) 2018-02-06 12:46:19 +11:00
Charles Dang
bd9e423a69 Fixed regression where variables with leading _ were considered invalid (fixes #2418)
Accidental regression from fbb0e0229cf4c870fef69e0b6729e9a1ea69b6fe. The variable validation
code was changed to use config::valid_tag instead of config::valid_attribute, which was the
new name of config::valid_id.
2018-02-06 12:32:39 +11:00
Charles Dang
35ae5c4ec8 Synced User Choice: fixed side= not being adjusted in unsynced contexts (fixes #2415)
side=0 is supposed to default to the current playing side, but that was never set if
the context was unscyned.
2018-02-06 12:02:04 +11:00
Severin Glöckner
4c8b3edd6d MP: 2p Silverhead Crossing - minor adjustments
- after the change to the tentacle, adjust HP to match 500 again
- let the teamname more sound like an easter egg
- apply the same lock settings as to similar scenarios

[ci skip]
2018-02-05 21:26:30 +01:00
Severin Glöckner
1ff652a1fe MP 6p Team Survival: lock teams in standard gameplay
Because there are just two, and nobody should join the AI team
When playing without default settings all kind of team combinations are possible

[ci skip]
2018-02-05 20:32:26 +01:00
Severin Glöckner
ae17a8d38e MP: add alot of xxx_lock setting
In these cases they have only in limited situations an effect:
In normal play the sides are hidden, if not using map settings they are ignored,
so this mostly only has an effect if starting the game in debug mode an using map
settings.

Other ones revert acidental changes caused by force_lock_settings.
fore_lock_settings does not only disallow the player to modify the settings,
but does also serve as default value for all the other lock settings.
2018-02-05 20:32:26 +01:00
Charles Dang
2dc4352845 Rebuild image cache when reloading changed game config (fixes #2424)
The above issue was caused by the fact that image::flush_cache() wasn't called after
reload_changed_game_config() when the addons manager was exited. Using F5 at the tilescreen
caused the image to appear since that callback *did* include image::flush_cache();

reload_changed_game_config() was called in 5 places, 2 of which were followed by flush_cache.
I figured it's safest to just include the latter in the former, since the other three usecases
(multiplayer installed addons before joining a game, a new core was selected, and the addons
manager was exited) all seem like places where flushing the image cache would be appropriate.
2018-02-06 05:32:24 +11:00
newfrenchy83
7f55296c7d Update wesnoth.cbp 2018-02-05 18:55:28 +02:00
Charles Dang
6eb7e700ee Editor: handle transition update values with an enum
Instead of this weird fake enum.
2018-02-06 03:21:19 +11:00
Charles Dang
574fd0ec4b Call display method instead of game_display if latter doesn't override
The proliferation of game_display::get_singleton() was due to 786233d5c95913889d6f061f3749f80a5efd61c1
where I replaced resources::screen (itself a game_display* pointer) with the game_display singleton.

Using the game_display pointer has already caused one case of UB (issue #2447), so I figured it best to
call the base class pointer in all cases where a game_display-specific function or override was not used.
2018-02-06 03:06:17 +11:00
Charles Dang
b04bc7d7b0 Minimap: fixed UB when accessing display singleton (fixes #2447)
Was UB when drawing the minimap in the editor since the display object was an editor_disply
not game_display. No reason to access game_display anyway, since is_blindfolded() is defined
in display.

Cropped up in 786233d5c95913889d6f061f3749f80a5efd61c1.
2018-02-06 01:10:36 +11:00
Sofartin
d9d67f0b95 Update Xcode project 2018-02-05 13:55:01 +02:00
Charles Dang
c2ead6e56b Addons Manager: updated dialog title
[ci skip]
2018-02-05 22:47:12 +11:00
Charles Dang
ca81e9cc17 Double length of autogenerated addon passphrase 2018-02-05 22:03:35 +11:00
Charles Dang
70aec1d298 MP: fixed infinite loop on connecting to redirected server (fixes #2441)
Regression from 50c9b52, found by @Soliton-. I didn't get a new handshake after
connecting to the new server.
2018-02-05 21:08:09 +11:00
Charles Dang
9f0df10e29 Updated VS projectfile
[ci skip]
2018-02-05 17:12:47 +11:00
Charles Dang
4f68df28ff ANL: added team and enemy leader names (fixes #2442)
[ci skip]

Also made side 9 hidden. Sevu/shiki's nicknames used with permission.
2018-02-05 16:44:55 +11:00
Charles Dang
4c2cddaa9e Surrender Quit: clearer button/message text
[ci skip]
2018-02-05 16:35:02 +11:00
Severin Glöckner
12039f3bfc MP: added some keys to scenarios with AI sides
Namely disallow_observers and user_team_name which is displayed in debug mode

The prisoners in ANL are now allied with the player

[ci skip]
2018-02-05 00:57:28 +01:00
Celtic Minstrel
d106dfb750
Add a very basic race description for the dunefolk
Eventually this will be expanded into a more proper description
2018-02-04 18:38:27 -05:00
Gunter Labes
72e19851ab Add minimal unit test for surrender_quit dialog 2018-02-05 00:35:35 +01:00
kallaballa
78dff47bd3 Implemented dropout to observer on surrender 2018-02-05 00:35:35 +01:00
kallaballa
4f1a7a9faa Introduce surrender hotkey 2018-02-05 00:35:35 +01:00
kallaballa
024b2e7e9b Implement a surrender dialog
This records a surrender command in replays and quits the game.
2018-02-05 00:35:35 +01:00
Severin Glöckner
9cdd0242d5 ANL: disallow observers for AI sides
[ci skip]
2018-02-05 00:05:22 +01:00
Severin Glöckner
e260fe9543 6p Team Survival: fix terrain mask
This one has been overlooked in an earlier change

(closes #2440)

[ci skip]
2018-02-04 23:02:30 +01:00
Sofartin
4f798e8121 Downgrade Xcode project back to C++11 (#2439)
Downgrading Xcode project to C++11 until 1.14 release
2018-02-04 15:30:31 -05:00
ln-zookeeper
c7bbb809b8 Changed resistances and hitpoints for Tentacle of the Deep
Based on forum discussion: https://forums.wesnoth.org/viewtopic.php?t=46922
2018-02-04 21:30:16 +02:00
Sofartin
09bc22bac8 Upgrade Info.plist 2018-02-04 19:05:16 +02:00
Sofartin
2935b6a186 Fix and Upgrade Xcode project 2018-02-04 19:05:16 +02:00
Charles Dang
36bd8dba8a Multiplayer: wmlindent run
[ci skip]
2018-02-05 04:00:09 +11:00
Charles Dang
1b79cb65f2 ANL: removed a bunch of duplicate allow_player= keys
[ci skip]
2018-02-05 04:00:08 +11:00
loonycyborg
240d9d995d pot-update and regenerate doc files 2018-02-04 19:46:58 +03:00
loonycyborg
83c5b5c5b3 Fix incorrect port of os.path.walk to os.walk 2018-02-04 19:46:45 +03:00
loonycyborg
aa294390ca Revert "pot-update and regenerate doc files"
This reverts commit e00ed07a658ebd0c8a7bf2d6bcaf0dac29a2a362.
2018-02-04 19:46:45 +03:00
Severin Glöckner
02c79cf176 Dark Forecast: lock team selection
[ci skip]
2018-02-04 16:27:17 +01:00
Charles Dang
22087f47d3 Connect Engine: make team_ unsigned since it's never less than 0
Should fix Travis build.
2018-02-05 01:32:49 +11:00
Charles Dang
77a06e2812 MP Staging: fixed team setting issue when some sides were hidden (fixes #2436)
This was caused by the same bug I added a workaround for in a02c568b785f9d30373aef806507da60000ff1c9.
Essentially, the differing size of player_teams_ and team_names_ could cause an index mismatch if
some sides had allow_player=no and debug mode wasn't on. I didn't notice this before since I always
work with debug mode on.

I've reworked the connect_engine handling of team data. Now, the team_name, user_team_name, and an
is-player-allowed-to-be-on-this-team flag are all handled by a data pod. I've completely removed the
player_teams stuff and instead generate an applicable list of teams for the team menu_button to
display at runtime.

To get around the index disparity issue, I save any displayed team option's index (relative to
connect_engine::team_data) in that option's config (the one then passed to the menu_button). This
allows me to get an appropriate value to pass to connect_engine::set_team without any fancy find-
and-adjust calculations.
2018-02-04 23:59:11 +11:00
Charles Dang
39069c1afa GUI2/Menu Button: added getter for selected row config 2018-02-04 23:59:10 +11:00
Charles Dang
ae48811ba4 Cleaned up cases of ;;
[ci skip]
2018-02-04 23:59:09 +11:00
loonycyborg
e00ed07a65 pot-update and regenerate doc files 2018-02-04 15:46:30 +03:00