72544 Commits

Author SHA1 Message Date
Martin Hrubý (hrubymar10)
d3d3e19275 Fix Xcode project after 458dd284b8342b33e6a6359aefbbbdb386b28875
(cherry-picked from commit dc6d5850f552bbccc2b21ea3d7e6d8b4539e1915)
2018-10-07 03:23:07 +00:00
Charles Dang
a72b344029 Updated VS projectfile
[ci skip]

(cherry-picked from commit 162b9de330322edf9723ef2cbed02978b7a38571)
2018-10-07 03:23:07 +00:00
Charles Dang
c6e9efde9c GUI2: removed 2010 experimental listbox
This was never finished, is not maintained, suffers from a lack of features the "old" listbox
class now has, and seems (according to the logs) to be have been superceded by the pane widget.
At the very least, the pane widget seems to be what mordante was working with in his early
prototype of a new addon manager, and not this 2010 list class.

(cherry-picked from commit 458dd284b8342b33e6a6359aefbbbdb386b28875)
2018-10-07 03:23:07 +00:00
Severin Glöckner
398165631c copied German translation to maser
primary reason is rather to have less problems if
someone uses the master files when translating for 1.14

[ci skip]

(cherry-picked from commit 9a37fe3a072ecd15ba8e196adcfac7e6a12e5444)
2018-10-07 03:23:06 +00:00
Nils Kneuper
19f83246d2 updated Chinese (Traditional) translation
(cherry-picked from commit 478df79f3135a282aa0d4c156d202e5ce2c6030e)
2018-10-07 03:23:06 +00:00
newfrenchy83
f551e5ca8e Enable C++17 in Code::Blocks
(cherry-picked from commit 882eeb52ab38547004f2ba7249913323596188d7)
2018-10-07 03:23:05 +00:00
Jyrki Vesterinen
591494627d Fix build
(cherry-picked from commit d8eada856aa5323e451551c86ec9c1ef15337ee0)
2018-10-07 03:23:05 +00:00
Jyrki Vesterinen
58dae34823 Remove unnecessary heap allocation
(cherry-picked from commit 3a5c2df0a15448c753e1eb19419d4b05b07e475c)
2018-10-07 03:23:05 +00:00
Charles Dang
130bd95e27 MP Join Game: cleaned up implementation of the recent players-choose-factions changes
(cherry-picked from commit fa01fb14d24f9f2830c7411cbabae88fd8a2d228)
2018-10-07 03:23:05 +00:00
gfgtdf
c112f49041 fix code dublication of mp_join_game::show_flg_select
this also fixes a bug where the side number in the initial flg dialog would be off by one.

This is also a slight behviour change where not finding [era] in mp_join_game::fetch_game_config no longer throws config::error but just returns false (=cannot join game)

(cherry-picked from commit a2a4dff050713e96b0b14612486d82cf3f93fa3d)
2018-10-07 03:23:04 +00:00
gfgtdf
6ad9977886 add a comment
(cherry-picked from commit 0296b6068cad37db4034b1edcc33025e3be82987)
2018-10-07 03:23:04 +00:00
gfgtdf
dd1960d988 mp join: fix crash when the dialog is updated while the flg dialog is open.
we cannnot call show_flg_select from inside the select_leader_buttons callback because that select_leader_buttons might be deleted/recreated while that dialog is open whihc leads to crashes, so what we do is executing the show_flg_select
 in a seperate callstack by using a 0 ms non-repeating timer

(cherry-picked from commit c55512755237dc818abc3b6bce4c3d31dbd2449b)
2018-10-07 03:23:04 +00:00
gfgtdf
745abef62d cancel faction_select when the game starts
or when the hosts assigned  control of  that side to another player.

(cherry-picked from commit 2dd65574498a9731b501e18da04c01f959ab6654)
2018-10-07 03:23:04 +00:00
gfgtdf
45fd7c9011 make flg manager not store confg& side_
in the non-host case the clients might get updates that change the [side] config while the flg dialog is open which might result in invalid pointers,  note that flg_manager::default_leader_cfg_ is still there but this is no problm because that is never dereferenced it's only compared to other pointers.

we also make a copy of all [multiplayer_side] on the non hosts side for the same reason.

(cherry-picked from commit c805897797d7ff22f3ea4fd1ce9c0fb126baefea)
2018-10-07 03:23:03 +00:00
gfgtdf
5a39a62118 allow non hosts to change factions later.
previously players had to leave an rejoin the game to change their faction.
this was most annoying in coop games where you want might want to choose
your faction in consultation with the other players. Also you previously could
not even checkout the different available factions again after you joined
the game.

(cherry-picked from commit 5ba389111eaa5d08f55d60c1b437c250a329bc58)
2018-10-07 03:23:03 +00:00
gfgtdf
2709456d2f disallow attacking with disabled attacks via [do_command]
this fixes some rare cheats in mp.

(cherry-picked from commit 26b5ca55e40176f338265b162178df7342ec2882)
2018-10-07 03:23:03 +00:00
pentarctagon
27ea9ccd24 Remove unused images from Dead Water.
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.

(cherry-picked from commit 649fdc9a6204cc4e2019aac41a79910b493b7d5a)
2018-10-07 03:23:02 +00:00
Charles Dang
39edd7c0c6 Preferences: added a mention of the in-game accelerated speed toggle
[ci skip]

(cherry-picked from commit 98ddc311fc1cfec3c95c2c24cc1e3e48603643a8)
2018-10-07 03:23:02 +00:00
Charles Dang
ff7f3c06a0 Preferences: shifted the Skip AI Moves button around
[ci skip]

Makes it clear it's not intrinsically tied to the Accelerated Speed factor.

(cherry-picked from commit 10e663ed6ce49974e22d4dab5211716210ead6e9)
2018-10-07 03:23:02 +00:00
Charles Dang
4c8788f62a Preferences Dialog: drop characters_per_line from hotkey list
[ci skip]

For some reason, this made the entire page stack thinner than it should be. I have
no idea why, and I'm not sure wrap= here instead does anything (namely, wrap if it
gets too long), but it's better than what was happening before.

(cherry-picked from commit cb7a6791421511f4251f2d1cb31a894fa8de90cf)
2018-10-07 03:23:02 +00:00
Gunter Labes
6cb6edde7b Fix line endings
[ci skip]

(cherry-picked from commit 51b5549bd2161e703efccb137c53bf9f0e567817)
2018-10-07 03:23:01 +00:00
Charles Dang
0d37a0f116 Editor: don't make unit type copies in the editor palette
(cherry-picked from commit 9e29c2f1d1f838b299dd6a7fcc4d9b6d17f1440a)
2018-10-07 03:23:01 +00:00
Iris Morelle
6d4d48e540 wmllint: Exit with non-zero status after failing to read any directories
[ci skip]

(cherry-picked from commit ceca46c5537807db723450ca35bc5b4d43a0c011)
2018-10-07 03:23:01 +00:00
Iris Morelle
54a3546f1e wmllint: Skip inexistent paths passed in the command line
Fixes issue #3286.

[ci skip]

(cherry-picked from commit fbc9ac5a52100c12d2cfb8d9e89afbf101d3a566)
2018-10-07 03:23:01 +00:00
Jyrki Vesterinen
2e3652f43f Fix insufficient struct initialization in init_mouse_location()
See pull request #3252. This is the fix @Vultraz prefers to the PR.

(cherry-picked from commit 7fc6a23643adcd3041a6a17dee7c2a3a5ddec31a)
2018-10-07 03:23:00 +00:00
Charles Dang
106d66009b MP Lobby: escape any game name formatting *after* receiving it from server
This avoids an issue where people could still apply formatting by using an older client.
Granted, any formatting would still appear in-lobby to anyone using an older client, but
this at least prevents the possibility of formatting appearing indefinitely if a game host
happens to never update their own client.

(cherry-picked from commit 9c311e2ca5db1f2b53570ae5bc0681f574c66f9d)
2018-10-07 03:23:00 +00:00
Charles Dang
06dd8d421d Updated a credits entry regarding the Dunefolk
[ci skip]

(cherry-picked from commit 0cbbed2832fc34f73927e38bf0141b4b7c636346)
2018-10-07 03:23:00 +00:00
Charles Dang
5a4cb1d471 Revert "MP Create Game: escape any formatting applied to game name"
This reverts commit 58a2e23a0c78078844f7fc2d684f04f448081f8b.

(cherry-picked from commit 87fcacbd28981933b3f3f190d1bfc9e7c18126fb)
2018-10-07 03:22:59 +00:00
Charles Dang
0b22ffbacf MP Create Game: escape any formatting applied to game name
This is a good point since it ensures any place that might use the title before the lobby
(don't think there's any such places right now) won't inadvertently get formatted.

Also might be worth looking into a way to just strip formatting completely.

(cherry-picked from commit 58a2e23a0c78078844f7fc2d684f04f448081f8b)
2018-10-07 03:22:59 +00:00
Iris Morelle
fb409b5db4 wmllint: Leave gzipped binary files alone, they're not safe for consumption
Fixes wmllint crashing like this upon encountering a gzip tarball in an
add-on:

  Traceback (most recent call last):
    File "/home/shadowm/bin/wmllint-1.14", line 3188, in <module>
      for fn in allcfgfiles(directory):
    File "/home/shadowm/bin/wmllint-1.14", line 2944, in allcfgfiles
      if interesting(os.path.join(root, name)):
    File "/home/shadowm/bin/wmllint-1.14", line 2927, in interesting
      return fn.endswith(".cfg") or is_map(fn) or issave(fn)
    File "/home/shadowm/src/wesnoth-1.14/data/tools/wesnoth/wmltools3.py", line 270, in issave
      return firstline.startswith("label=")
  TypeError: startswith first arg must be bytes or a tuple of bytes, not str

[ci skip]

(cherry-picked from commit c92e167a14229ed0d9b6f16f1d1ca31cacd292cd)
2018-10-07 03:22:59 +00:00
gfgtdf
81bd61ae14 wb: fix wrong simulated movement points when planning to capture a village.
(cherry-picked from commit ff82a007d5330baa89c0f9063e71f221db527f00)
2018-10-07 03:22:59 +00:00
gfgtdf
bd97d0c471 wb: remove outcommented code
(cherry-picked from commit 17a91649045415179f77342053cb784124f98e58)
2018-10-07 03:22:58 +00:00
gfgtdf
5c43c70cba wb: don't remove invalid actions from other players
this would bring the whiteboard data of the differnt clients out of sync  which could be a problem since the wb network protocoll identifies the actions to be removed ot replaced by index.

(cherry-picked from commit 3a28c3a3460aaff0d59826f401623dad8ecadb3f)
2018-10-07 03:22:58 +00:00
gfgtdf
7e32681b46 wb: dont send delete of actions of other sides
(cherry-picked from commit ee00b88427ac229ee9ff68e706782c049ca781ee)
2018-10-07 03:22:58 +00:00
Jyrki Vesterinen
cdbb8cc491 Fixed saving a map as a scenario not enabling scenario editor tools
(cherry-picked from commit 4bda3e7311c7b54742fbd29cb725dc0b292de633)
2018-10-07 03:22:57 +00:00
Andras Szell
a2a22ae10b Fix: add redraw to narrator's message so village count is refreshed
Fixes: https://forums.wesnoth.org/viewtopic.php?f=21&t=48370

In the tutorial when we occupy the first village the message tells us the
village count got incremented, but in the old version it was incremented
only afterwards. Non-narrator messages were updated properly. By adding the
redraw, narrator messages triggered by capture event produce the same
result as other speakers.

(cherry-picked from commit 1ea4149a4456ab8713dde4fbfcdd446b5762adcf)
2018-10-07 03:22:57 +00:00
DisherProject
826a76a939 Fix weapon specials marked as inactive
(cherry-picked from commit 902cf6dcfb6fd1d25e403acc8a57c8e16a61535b)
2018-10-07 03:22:57 +00:00
Charles Dang
0e5eb5067e Revert "Swapped the first watch and second watch ToD graphics"
[ci skip]

This reverts commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8.

(cherry-picked from commit 0aa60a7b4cc3492f9d84c765f6218f00aee8830e)
2018-10-07 03:22:57 +00:00
Charles Dang
92b95d7a44 Unit Advance: left-align header
[ci skip]

(cherry-picked from commit 893860321a8da181164782b13a931b6c61f5febd)
2018-10-07 03:22:56 +00:00
Charles Dang
e8c65ebece Fixup 862b086
(cherry-picked from commit 3147be87718d5685dc41dd73256692268c41b6e6)
2018-10-07 03:22:56 +00:00
Charles Dang
81083e5cea Fixup tests for 4eee386
(cherry-picked from commit 862b086ba9d43edb87362bbf4b7f75355eb50955)
2018-10-07 03:22:56 +00:00
Charles Dang
e98ec7e846 Cleaned up a few game_config_manager.hpp includes
(cherry-picked from commit feb99c384a3da58380697bfcf9ad18bc57df950f)
2018-10-07 03:22:56 +00:00
Charles Dang
f46e217454 Stop passing a milion game_config refs around during game initializaton
There are only 3 places where it's actually really needed. Used the game_config_manager
singleton to retrieve a reference in those cases.

(cherry-picked from commit 4eee386664b66e801bd4498e8730c017af03f0aa)
2018-10-07 03:22:55 +00:00
Charles Dang
2420e61d14 Swapped the first watch and second watch ToD graphics
[ci skip]

See #1905.

(cherry-picked from commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8)
2018-10-07 03:22:55 +00:00
Charles Dang
611bacf3b6 Cleaned up addon loading process
This makes it so addon metadata (title, version) will be fetched from _server.pbl if
present and _info.cfg if not (see #3278).

This also eliminates the temporary addon_source struct and unifies the metadata parsing
and actual loading stages. They used to be separate since single-file addons were a
thing, but those were removed in 3f640b8e718e4c45d8f73798d839bfea0b413fab.

Also a bunch of minor code cleanup.

(cherry-picked from commit cd3c13aca223e8a8c681556fe8020915d98058e0)
2018-10-07 03:22:55 +00:00
josteph
9e9e1e800f Replay: Don't disable the "Point of view" button after reset
Fixes #3107

(cherry-picked from commit fb88f40b61eb541f227e2ed62b148ba33c042e44)
2018-10-07 03:22:55 +00:00
Iris Morelle
bf2d7d53e6 campaignd: Detect .po files in add-ons and add them to the list of locales
(cherry-picked from commit 1db6fb393ea468a3657e0f7e1053b48c947c05a9)
2018-10-07 03:22:54 +00:00
Iris Morelle
8763e2f2b1 sound: Halt sound sources that go inaudible instead of fading them out
Fixes #3280.

(cherry-picked from commit e46c05162fdab578d172cf06e7b35792b045223a)
2018-10-07 03:22:54 +00:00
josteph
2b2b08431e Revert "Excluded data/test/ from tarball"
This reverts commit c93482560779c0e137d9598b9e7185338afe2b82.

Keep data/test/ in 'scons dist' tarballs to match official tarballs.

(cherry-picked from commit bad6897cbc75225624814b66c9226cf6233e95cf)
2018-10-07 03:22:54 +00:00
josteph
0b633badc5 Fix 'scons dist'
This makes 'scons dist' work, although the resulting tarballs are not
yet identical to cmake tarballs.

Remove awk usage made obsolete by the git transition
(7f85fa000c836c27cfe9d829db3b0e8aaeb49821).

Update src/revision.hpp reference to use src/revision.h.  The former
name is unused since at least 7625b1e079b470119d72ea67ce955104f464e4b8.

(cherry-picked from commit 0ee485415710288d27f7b766e48fe7451b03c9a4)
2018-10-07 03:22:53 +00:00