[Commits] [wesnoth/wesnoth] 56e685: fixup server controller tweaks, dont tweak host
GitHub
noreply at github.com
Mon Oct 26 06:00:32 UTC 2015
Branch: refs/heads/sdl2
Home: https://github.com/wesnoth/wesnoth
Commit: 56e685b7e0560a275ee63eef5930a5022b44da9a
https://github.com/wesnoth/wesnoth/commit/56e685b7e0560a275ee63eef5930a5022b44da9a
Author: Chris Beck <render787 at gmail.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
fixup server controller tweaks, dont tweak host
In 1.11.x cycle, we moved all "client-side controller tweaks" to
be effected by the server, so that clients won't on their own
change the data they find in a level config at game start. This
had some benefits:
- Only host and server are ever modifying the level data
- Easier to keep observers and clients synced correctly
- Easier to change client behavior with server side patches
The server-sided tweaks happened at the following point in time:
1. Host clicks start game button, a [start] signal is sent to
server.
2. Server now checks the level config and tries to make sense of
it, making sure every side has an owner and such. Then it issues
controller change commands to all clients, making sure they match
its picture of what is going on.
3. Server passes the [start] signal on to the other clients.
This introduced some bad behaviors, however, because the host
does not wait to recieve [start] and instead goes right into the
game.
- When host gets controller change signals for AIs it controls, it
would overwrite the names of their leaders with the host names.
(bug #23021)
- It would cause some GUI flashing at game start for the host
(bug #21156)
In this commit, we make sure not to send controller tweak messages
to the host about sides that it controls.
We still may send messages to the host about sides it doesn't
control. If there is the possibility that a game may start and
an AI side is assigned to someone other than the host, then this
commit won't fix the resulting renaming problems. (However afaik
that cannot happen at this revision.)
Conflicts:
src/server/game.cpp
Commit: 528780717b2c5d75c32194cb1f200131a3f85aba
https://github.com/wesnoth/wesnoth/commit/528780717b2c5d75c32194cb1f200131a3f85aba
Author: tranceitionalMynd <tyler.k.cardon at gmail.com>
Date: 2015-10-15 (Thu, 15 Oct 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
Log Message:
-----------
Revert "Added Death of Galtrid to losing conditions for the Human Alliance."
Commit: cd4d5ffa59bd113872362ec168d6dea866fea1e0
https://github.com/wesnoth/wesnoth/commit/cd4d5ffa59bd113872362ec168d6dea866fea1e0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M data/gui/default/window/game_load.cfg
Log Message:
-----------
Game Load: specified max height
Commit: 8d5fc6e449aea20fe540d031e6348e8c336eb81b
https://github.com/wesnoth/wesnoth/commit/8d5fc6e449aea20fe540d031e6348e8c336eb81b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M data/gui/default/window/game_load.cfg
Log Message:
-----------
Game Load: cleaned up layout a little
Commit: 829d51792f1897f18c51141ea7d9fea0edcb6708
https://github.com/wesnoth/wesnoth/commit/829d51792f1897f18c51141ea7d9fea0edcb6708
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M src/gui/dialogs/game_load.cpp
Log Message:
-----------
tload_game: don't invalidate layout on selection
Commit: bc4f2efe7016b2f21f7b97043275e473ad78dc5e
https://github.com/wesnoth/wesnoth/commit/bc4f2efe7016b2f21f7b97043275e473ad78dc5e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M src/dialogs.cpp
M src/dialogs.hpp
M src/savegame.cpp
Log Message:
-----------
Activate GUI2 Load Game dialog
Commit: 0d3c749abc6e21701cc240f8c2345ee81d414f11
https://github.com/wesnoth/wesnoth/commit/0d3c749abc6e21701cc240f8c2345ee81d414f11
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M src/savegame.cpp
M src/savegame.hpp
Log Message:
-----------
Removed unused parameters from savegame::load_game()
Commit: d87a5fc0c5153794e0d9872d442aa68fa090d94f
https://github.com/wesnoth/wesnoth/commit/d87a5fc0c5153794e0d9872d442aa68fa090d94f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M data/gui/default/window/unit_create.cfg
Log Message:
-----------
Unit Create: specified max height
Commit: 497a82d7cc8cd40082fb1bcadfabba32ab51ee1f
https://github.com/wesnoth/wesnoth/commit/497a82d7cc8cd40082fb1bcadfabba32ab51ee1f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M data/gui/default/window/unit_create.cfg
Log Message:
-----------
Unit Create: move gender selection below listbox
Commit: 83a3d3680bda170e7d0569c3cd1bb28830d84d66
https://github.com/wesnoth/wesnoth/commit/83a3d3680bda170e7d0569c3cd1bb28830d84d66
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M data/gui/default/window/game_load.cfg
Log Message:
-----------
Game Load: removed unnecessary instruction text
Commit: a8fdbeda107541bdcd142abe0df1c5be4576dcb7
https://github.com/wesnoth/wesnoth/commit/a8fdbeda107541bdcd142abe0df1c5be4576dcb7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M data/gui/default/window/game_load.cfg
Log Message:
-----------
Game Load: move Delete button into same row as first checkbox
Commit: cb9d8739551a33d099405b9e406f087b0f94ebb2
https://github.com/wesnoth/wesnoth/commit/cb9d8739551a33d099405b9e406f087b0f94ebb2
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M data/gui/default/widget/toggle_button_listbox_header.cfg
Log Message:
-----------
gui2/ttoggle_button: Add hover/selection bg color to listbox header variant
Copied from GUI1.
Commit: cdf68f17e7a9c49d6eda5b966ea8187adca9bef7
https://github.com/wesnoth/wesnoth/commit/cdf68f17e7a9c49d6eda5b966ea8187adca9bef7
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M src/gui/widgets/generator.cpp
Log Message:
-----------
fix selected item after deletion in a ordered list
Commit: df3c4df5e84682828f402401e96850c2371fe9a2
https://github.com/wesnoth/wesnoth/commit/df3c4df5e84682828f402401e96850c2371fe9a2
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M src/gui/widgets/generator.cpp
Log Message:
-----------
Merge pull request #531 from wesnoth/gfgtdf-patch-1
fix selected item after deletion in a ordered list
Commit: 88faaac46e26627b88ff7e5f0ebc387871581dc5
https://github.com/wesnoth/wesnoth/commit/88faaac46e26627b88ff7e5f0ebc387871581dc5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M data/gui/default/widget/listbox_default.cfg
Log Message:
-----------
Experimental fix for GUI2 listbox headers outside vertical scroll area
Commit: 6280229562c3c37101bc6e25ee6b24c3ff2b50f5
https://github.com/wesnoth/wesnoth/commit/6280229562c3c37101bc6e25ee6b24c3ff2b50f5
Author: neverEnough <amba at inbox.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M src/display_chat_manager.cpp
M src/display_chat_manager.hpp
M src/play_controller.cpp
Log Message:
-----------
Tab-completion added for in-game whispers.
In the game lobby you can tab-complete ANY nick, both from the lobby or from a match running. While playing you can only tab-complete ingame players and observers.
This patch works in the match, it helps answering whispers from people in lobby or in other games.
The nick will be added to a string (in the same way as observers already work) and get recalled with TAB key.
Commit: 58c78e2c5eaf7ec6840edf1c8022b480d487c94c
https://github.com/wesnoth/wesnoth/commit/58c78e2c5eaf7ec6840edf1c8022b480d487c94c
Author: neverEnough <amba at inbox.com>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M changelog
M data/core/about.cfg
M players_changelog
Log Message:
-----------
updated data/core/about.cfg; /changelog; /players_changelog
Commit: 4346856ed28bb7852a31c3722932909a8aae8d73
https://github.com/wesnoth/wesnoth/commit/4346856ed28bb7852a31c3722932909a8aae8d73
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-17 (Sat, 17 Oct 2015)
Changed paths:
M changelog
M data/core/about.cfg
M players_changelog
M src/display_chat_manager.cpp
M src/display_chat_manager.hpp
M src/play_controller.cpp
Log Message:
-----------
Merge pull request #529 from niegenug/master
Tab-completion added for in-game whispers
Commit: 2f88db8b9f4a79889fe7819ed64d52261a7cb11a
https://github.com/wesnoth/wesnoth/commit/2f88db8b9f4a79889fe7819ed64d52261a7cb11a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M src/gui/widgets/list.cpp
Log Message:
-----------
tlist: remove ancient foreach.hpp include and use BOOST_FOREACH instead
Commit: 6f83bdebb47394b21563f8ee9dc04083861b40be
https://github.com/wesnoth/wesnoth/commit/6f83bdebb47394b21563f8ee9dc04083861b40be
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M src/gui/widgets/list.cpp
Log Message:
-----------
tlist: add missing includes for find_widget and REGISTER_WIDGET
Commit: c2f469ee8572fc6938561155c7ca2f1c7b9ad454
https://github.com/wesnoth/wesnoth/commit/c2f469ee8572fc6938561155c7ca2f1c7b9ad454
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M src/gui/widgets/list.cpp
Log Message:
-----------
tlist: update calls to set_dirty to set_is_dirty
The function name was changed in 060ff60c003684bcf00456cf48d02d6522a052cc
Commit: 741b23300701dad726a49690f010aaa8c2786205
https://github.com/wesnoth/wesnoth/commit/741b23300701dad726a49690f010aaa8c2786205
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M src/gui/dialogs/campaign_settings.cpp
M src/gui/dialogs/depcheck_select_new.cpp
M src/gui/dialogs/label_settings.cpp
Log Message:
-----------
Use experimental listbox when defined in all cases
Commit: a137a62170aaad2b39ad809fe6d7de1d37fd1166
https://github.com/wesnoth/wesnoth/commit/a137a62170aaad2b39ad809fe6d7de1d37fd1166
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M src/gui/dialogs/game_version.hpp
Log Message:
-----------
tgame_version: use tlist class when experimental listbox is enabled
This prevents class declaration clashes
Commit: a599a3338e8ef0c96ca32c5ec361ac4c512ed738
https://github.com/wesnoth/wesnoth/commit/a599a3338e8ef0c96ca32c5ec361ac4c512ed738
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M data/gui/default/widget/listbox_default.cfg
Log Message:
-----------
Revert "Experimental fix for GUI2 listbox headers outside vertical scroll area"
This reverts commit 88faaac46e26627b88ff7e5f0ebc387871581dc5.
Commit: 3a5f25b999cfb5aa187b41fded9ecac7a75e0857
https://github.com/wesnoth/wesnoth/commit/3a5f25b999cfb5aa187b41fded9ecac7a75e0857
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M changelog
M data/campaigns/Dead_Water/units/Kraken.cfg
A data/core/sounds/ink-miss.ogg
A data/core/sounds/ink.ogg
M data/core/units/monsters/Cuttle_Fish.cfg
M players_changelog
Log Message:
-----------
New ink sounds
Commit: 2de99cad74072e43bf52d12ddd215254a9a461a3
https://github.com/wesnoth/wesnoth/commit/2de99cad74072e43bf52d12ddd215254a9a461a3
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M data/gui/default/window/unit_create.cfg
M src/gui/dialogs/unit_create.cpp
M src/gui/dialogs/unit_create.hpp
Log Message:
-----------
tunit_create: add sort functionality
Commit: 4deeef797d58e60fa7b3a218a559573f0222da41
https://github.com/wesnoth/wesnoth/commit/4deeef797d58e60fa7b3a218a559573f0222da41
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M changelog
M data/campaigns/Under_the_Burning_Suns/units/monsters/Small_Mudcrawler.cfg
A data/core/sounds/mud-fist-miss.ogg
A data/core/sounds/mud-fist.ogg
A data/core/sounds/mud-glob-miss.ogg
A data/core/sounds/mud-glob.ogg
M data/core/units/monsters/Giant_Mudcrawler.cfg
M data/core/units/monsters/Mudcrawler.cfg
M players_changelog
Log Message:
-----------
New attack sounds for mudcrawlers
Commit: 019d829b4145fa3b02f69015290154df54065075
https://github.com/wesnoth/wesnoth/commit/019d829b4145fa3b02f69015290154df54065075
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-18 (Sun, 18 Oct 2015)
Changed paths:
M changelog
M src/gui/dialogs/gamestate_inspector.cpp
Log Message:
-----------
gui2/tgamestate_inspector: Don't skip pages with empty contents
Those are sometimes relevant (for example, empty WML variables or
containers/arrays). We don't want to conceal the truth here because this
is supposed to be a debugging aid.
Commit: 701229d69da7925d844ad7630922faa1060745fa
https://github.com/wesnoth/wesnoth/commit/701229d69da7925d844ad7630922faa1060745fa
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
A images/icons/alignments/alignment_chaotic_30.png
A images/icons/alignments/alignment_lawful_30.png
A images/icons/alignments/alignment_liminal_30.png
A images/icons/alignments/alignment_neutral_30.png
Log Message:
-----------
Added a set of Alignment icons
Designed by me based off and using pieces of previous icons by LordBob
Commit: 21391f9039136a81311bf1e8fdaca1a7dba02aac
https://github.com/wesnoth/wesnoth/commit/21391f9039136a81311bf1e8fdaca1a7dba02aac
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M data/gui/default/window/unit_create.cfg
M src/gui/dialogs/unit_create.cpp
M src/gui/dialogs/unit_create.hpp
Log Message:
-----------
tunit_create: added minimal unit preview section and filter box (non-functional)
Commit: 62e84fa24055401acf59d697de1dcd399ffc436f
https://github.com/wesnoth/wesnoth/commit/62e84fa24055401acf59d697de1dcd399ffc436f
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M src/minimap.cpp
M src/terrain_builder.cpp
Log Message:
-----------
Avoid loading terrain minimap images when not specified by WML
Otherwise we build a bogus "terrain/.png" file path and produce spurious
`error display: could not open image 'terrain/.png'` messages in stderr.
Although this is primarily an issue found with certain special overlay
terrains such as ^Xo (Impassable Overlay), this fix covers base terrains
as well.
Commit: e056f1a688aabe8db8dc655d538cc113910b5921
https://github.com/wesnoth/wesnoth/commit/e056f1a688aabe8db8dc655d538cc113910b5921
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M changelog
Log Message:
-----------
Update changelog for previous minimap fix commit
Commit: 03a85fde5679e14a1556a0d25162a2dc41fbf27e
https://github.com/wesnoth/wesnoth/commit/03a85fde5679e14a1556a0d25162a2dc41fbf27e
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M CMakeLists.txt
Log Message:
-----------
cmake: Tests and tools also need Boost.Filesystem + Boost.Locale
Fixes linker errors found when building after configuring with
`-DENABLE_TOOLS=ON -DENABLE_GAME=OFF -DENABLE_SERVER=OFF
-DENABLE_NLS=OFF`.
Commit: 9fd59b503f42d06759bb0e59f4ada1cc51f01355
https://github.com/wesnoth/wesnoth/commit/9fd59b503f42d06759bb0e59f4ada1cc51f01355
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
cmake: Use Boost.Filesystem FS API for tools
Otherwise we get configure-time errors due to CMake looking for the
legacy implementation, filesystem.cpp.
Commit: 49e3d20e7bfece7d7139a53a97e2ee2efe394e8c
https://github.com/wesnoth/wesnoth/commit/49e3d20e7bfece7d7139a53a97e2ee2efe394e8c
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
gui2/tunit_create: Prevent null pointer dereferences
One code path in particular assumed that resources::controller is never
a null pointer, thus breaking unit tests.
Commit: e9cfef3b72138131395375dd975ece6a2a5bd062
https://github.com/wesnoth/wesnoth/commit/e9cfef3b72138131395375dd975ece6a2a5bd062
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-10-19 (Mon, 19 Oct 2015)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
Lua API: Fix unit:vision() and unit:jamming() returning movement cost
Commit: 0e45d64a718195ce0de9c5820980b9d22f9b6450
https://github.com/wesnoth/wesnoth/commit/0e45d64a718195ce0de9c5820980b9d22f9b6450
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
M src/gui/dialogs/unit_create.hpp
Log Message:
-----------
tunit_crteate: Port Filter functionality from Load Game dialog
Commit: 013acd316f12f226ac3e32cbd97de5baaed61017
https://github.com/wesnoth/wesnoth/commit/013acd316f12f226ac3e32cbd97de5baaed61017
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/menu_events.cpp
Log Message:
-----------
Switch to GUI2 Create Unit dialog
Commit: 6b3baa2a2b86fdaeb0d090fc20f75fa918c88944
https://github.com/wesnoth/wesnoth/commit/6b3baa2a2b86fdaeb0d090fc20f75fa918c88944
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
tunit_create: use type image icon if available
Commit: 675738e635275deef676ac8e50f2738cd7fec9c4
https://github.com/wesnoth/wesnoth/commit/675738e635275deef676ac8e50f2738cd7fec9c4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
tunit_create: use type id for return value and help dialog
Commit: 01daea8f759b3beae44511b49fc8068ab8c5f4fb
https://github.com/wesnoth/wesnoth/commit/01daea8f759b3beae44511b49fc8068ab8c5f4fb
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/game_initialization/multiplayer_create.cpp
Log Message:
-----------
Enable Cancel Orders in Load MP Game
Resolving bug #22133, stating Cancel Orders does not work when loading a MP game.
Commit: 33bfaf5ffc24f9436b7c43ef62c4b07ea82a1dfd
https://github.com/wesnoth/wesnoth/commit/33bfaf5ffc24f9436b7c43ef62c4b07ea82a1dfd
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
tunit_create: cleanup, mostly removing static_casts
Commit: 1a0d04d7b2ea296c341f8d624e06a82d7338c50d
https://github.com/wesnoth/wesnoth/commit/1a0d04d7b2ea296c341f8d624e06a82d7338c50d
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M data/tools/GUI.pyw
Log Message:
-----------
GUI.pyw: fixed a bug that caused the output to not be printed on Windows
Commit: 42ac2e0fe713a1182d302330b257a5e6a1a7a766
https://github.com/wesnoth/wesnoth/commit/42ac2e0fe713a1182d302330b257a5e6a1a7a766
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: upgrade from optparse to argparse
This has two advantages: first, it enforces a help style which is consistent across the various tools; second, it makes easier adding new command line options.
Another interesting fact is that those options requiring additional parameters do not need the equal sign any more; that is, writing --foo=bar is now the same as writing --foo bar.
Commit: 2d4ef7a42d0e4306b4fda3460ff0cbc876dc4a55
https://github.com/wesnoth/wesnoth/commit/2d4ef7a42d0e4306b4fda3460ff0cbc876dc4a55
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M data/tools/wmlscope
Log Message:
-----------
wmlscope: upgrade from optparse to argparse
Commit: 491ba7924f40126837a64b6f6f7b69aba986306a
https://github.com/wesnoth/wesnoth/commit/491ba7924f40126837a64b6f6f7b69aba986306a
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M data/tools/wmlindent
Log Message:
-----------
wmlindent: upgrade from optparse to argparse
Commit: e07de1bf48f31ebed8d994c3c066b7c28d24aaf1
https://github.com/wesnoth/wesnoth/commit/e07de1bf48f31ebed8d994c3c066b7c28d24aaf1
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M data/tools/GUI.pyw
Log Message:
-----------
GUI.pyw: fixed regexps not being handled correctly on non Windows systems
This fix relies on the fact that argparse doesn't require the equal sign any more.
Commit: cd9c23fea0dce685aefd68c6139222b6178a7e30
https://github.com/wesnoth/wesnoth/commit/cd9c23fea0dce685aefd68c6139222b6178a7e30
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M data/gui/default/window/unit_create.cfg
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
tunit_create: more minimal display of level
Commit: d3e04c65d6c30198435a429b0a4b2307934edac1
https://github.com/wesnoth/wesnoth/commit/d3e04c65d6c30198435a429b0a4b2307934edac1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
tunit_create: add attack details to type summary
Commit: b8937db177e78595e17fd8b51dc19cec83dc7a83
https://github.com/wesnoth/wesnoth/commit/b8937db177e78595e17fd8b51dc19cec83dc7a83
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
tunit_create: rearranged HP/XP/MP stats
Commit: f8ca1e96bc7ca710cbd98ed35f4151f29d6762a6
https://github.com/wesnoth/wesnoth/commit/f8ca1e96bc7ca710cbd98ed35f4151f29d6762a6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
tunit_create: add trait and ability info
Commit: 1fe5134e73cdc7c31d2f65854d6a781daf74cbc8
https://github.com/wesnoth/wesnoth/commit/1fe5134e73cdc7c31d2f65854d6a781daf74cbc8
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
fs: Clean up Windows-specific code in set_user_data_dir()
No functional changes. Probably. More about this in the next commit.
Commit: 795dd8c4200c7ef581b9e7bf77aa03c3228723df
https://github.com/wesnoth/wesnoth/commit/795dd8c4200c7ef581b9e7bf77aa03c3228723df
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
fs: Default to Documents for user config/data on Windows
Use Documents\My Games\WesnothX.Y for user config data on Windows like
we currently do when using --config-dir there with a relative path. The
behavior of --config-dir when passed a relative path remains unchanged
with this commit, making the new out-of-the-box default equivalent to
passing --config-dir WesnothX.Y, except this is now enforced by Wesnoth
rather than a finicky installer option.
See bug #23753 for the rationale behind this change.
People who really can't live without the old CWD\userdata layout should
either use --config-dir with an absolute path to their existing userdata
dir, or wait for the next commit (which will help with "portable"
installs to removable devices, for example).
Commit: bc22ec91760d93c23dfa6475d5f8405c4870e40c
https://github.com/wesnoth/wesnoth/commit/bc22ec91760d93c23dfa6475d5f8405c4870e40c
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
fs: Treat . and .. in userdata/config paths relative to cwd on Windows
This allows asking Wesnoth to store user files in a directory relative
to the install dir if wanted on Windows (e.g. for portable installs to
removable media where the absolute path to the install dir is not
constant or under the user's control).
Commit: 8f8fde43bad8089c1735a37001e4a44e91f212b5
https://github.com/wesnoth/wesnoth/commit/8f8fde43bad8089c1735a37001e4a44e91f212b5
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
fs: Use SHGetFolderPath() instead of SHGetSpecialFolderPath()
The former has been "unsupported" since Windows XP, while the latter is
still supported in Vista and later as a wrapper around a newer API.
Most importantly, used this as an excuse to rewrite the code to take
advantage of the fact that we already link to SHELL32.DLL at runtime
(it implements ShellExecute() and Shell_NotifyIcon(), used elsewhere in
our code), only run on versions of Windows guarantee to provide the
SHGetFolderPath symbol, and thus don't need all the LoadLibrary mumbo
jumbo that made the code considerably uglier and denser.
Commit: 80af2f7cdd2dca1f89a9c6cf044c25d79536cbed
https://github.com/wesnoth/wesnoth/commit/80af2f7cdd2dca1f89a9c6cf044c25d79536cbed
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M RELEASE_NOTES
M changelog
M players_changelog
Log Message:
-----------
Update changelogs and release notes for bug #23573
Commit: 2aab35bcf7e281e15b5bc587ea401cb8af3c49a5
https://github.com/wesnoth/wesnoth/commit/2aab35bcf7e281e15b5bc587ea401cb8af3c49a5
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-10-20 (Tue, 20 Oct 2015)
Changed paths:
M RELEASE_NOTES
M changelog
M players_changelog
M src/filesystem_boost.cpp
Log Message:
-----------
Merge branch 'bug/23753'
Commit: c7aa47443d203fe7646fd88462e11d8c03e76540
https://github.com/wesnoth/wesnoth/commit/c7aa47443d203fe7646fd88462e11d8c03e76540
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
CB Project: replaced DWINVER with _WIN32_IE
The former doesn't appear to do anything and was probably a typo
Commit: e22555a107fb55721275ec97563985b15efd7f45
https://github.com/wesnoth/wesnoth/commit/e22555a107fb55721275ec97563985b15efd7f45
Author: aquileia <sk.aquileia at gmail.com>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M packaging/windows/Wesnoth.nsi.in
Log Message:
-----------
Windows Installer: Remove --config-dir from shortcuts
Flag was superseded by 795dd8c42
Commit: b8a9017aaa478c0bb69d4e14f047917dece95d56
https://github.com/wesnoth/wesnoth/commit/b8a9017aaa478c0bb69d4e14f047917dece95d56
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-22 (Thu, 22 Oct 2015)
Changed paths:
M src/editor/map/context_manager.cpp
M src/editor/map/context_manager.hpp
Log Message:
-----------
Move map name to beginning of title and restored version number
Also includes minor cleanup
Commit: 251aec1f9b1ee4fc4b6f3aa9414bd98089231f3f
https://github.com/wesnoth/wesnoth/commit/251aec1f9b1ee4fc4b6f3aa9414bd98089231f3f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-22 (Thu, 22 Oct 2015)
Changed paths:
M src/unit_types.cpp
M src/unit_types.hpp
Log Message:
-----------
Switch a var name from camelCase to underscore case
Commit: 5bd7c03c66c663b7ddcad6871450aab741de3916
https://github.com/wesnoth/wesnoth/commit/5bd7c03c66c663b7ddcad6871450aab741de3916
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-10-22 (Thu, 22 Oct 2015)
Changed paths:
M src/play_controller.cpp
Log Message:
-----------
remove if that is always true
we already access *gui_ in 'gui_->write(cfg.add_child("display"));' above so this 'if' is useless.
Commit: b7cb89209217d44ec427ef08736466ee2207fceb
https://github.com/wesnoth/wesnoth/commit/b7cb89209217d44ec427ef08736466ee2207fceb
Author: aquileia <sk.aquileia at gmail.com>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
R images/misc/l10n/en at shaw/logo.png
R images/misc/l10n/es/logo.png
R images/misc/l10n/fr/logo.png
R images/misc/l10n/gd/logo.png
R images/misc/l10n/gl/logo.png
R images/misc/l10n/hu/logo.png
R images/misc/l10n/la/logo.png
R images/misc/l10n/lt/logo.png
R images/misc/l10n/nl/logo.png
R images/misc/l10n/pt/logo.png
R images/misc/l10n/sr/logo.png
R images/misc/l10n/sr at latin/logo.png
R images/misc/l10n/vi/logo.png
R images/misc/l10n/zh_CN/logo.png
M l10n-track
Log Message:
-----------
Update l10n-track for new logo
Fixes displayed logo for translations.
Commit: 9ad56b8d88802d30ac011c363e85f9fac8d63871
https://github.com/wesnoth/wesnoth/commit/9ad56b8d88802d30ac011c363e85f9fac8d63871
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-10-24 (Sat, 24 Oct 2015)
Changed paths:
M src/game_initialization/multiplayer_create.cpp
Log Message:
-----------
Merge pull request #534 from Wedge009/bug_22133_fix
Resolve Bug #22133
Commit: 8c4febad76a3e56286b3c029a36974068ee2b87c
https://github.com/wesnoth/wesnoth/commit/8c4febad76a3e56286b3c029a36974068ee2b87c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
Merge pull request #380 from cbeck88/fixup_server_controller_tweaks
fixup server controller tweaks, dont tweak host
Commit: 121d97e6d93b3c3cb7fc68e1ad84845a46a1ff78
https://github.com/wesnoth/wesnoth/commit/121d97e6d93b3c3cb7fc68e1ad84845a46a1ff78
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
Log Message:
-----------
Merge pull request #528 from tranceitionalMynd/revert-526-pull-request-tmynd
Revert "Added Death of Galtrid to losing conditions for the Human All…
Commit: 61b3a9037b40f4fffbd2f367cfb7eab40d6bf43b
https://github.com/wesnoth/wesnoth/commit/61b3a9037b40f4fffbd2f367cfb7eab40d6bf43b
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M data/core/terrain.cfg
Log Message:
-----------
Correct Desert Sands / Oasis Help Entry
Reported in Bug #23023.
Commit: ee812a8bd591d4444b66ded95006f939fa55d774
https://github.com/wesnoth/wesnoth/commit/ee812a8bd591d4444b66ded95006f939fa55d774
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M data/core/terrain.cfg
Log Message:
-----------
Merge pull request #537 from Wedge009/bug_23023_fix
Resolve Bug #23023
Commit: 4d8bcf6a5841f856b2023104eb84ec8372412e9f
https://github.com/wesnoth/wesnoth/commit/4d8bcf6a5841f856b2023104eb84ec8372412e9f
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M src/hotkey/hotkey_command.cpp
Log Message:
-----------
Enable Load Game hot-key in main menu
Apparently a regression from 1.10. Reported in bug #23215.
Commit: 175ace649047bc22452be81c185bc7b890a0d6c4
https://github.com/wesnoth/wesnoth/commit/175ace649047bc22452be81c185bc7b890a0d6c4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M src/hotkey/hotkey_command.cpp
Log Message:
-----------
Merge pull request #538 from Wedge009/bug_23215_fix
Resolve Bug #23215
Commit: 3781e7839f29915292a2452c37b08a1e1fce9841
https://github.com/wesnoth/wesnoth/commit/3781e7839f29915292a2452c37b08a1e1fce9841
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M src/ai/formula/function_table.cpp
M src/ai/testing/ca_global_fallback.cpp
M src/display.cpp
M src/display.hpp
M src/display_context.cpp
M src/editor/action/action_label.cpp
M src/editor/action/action_label.hpp
M src/editor/action/mouse/mouse_action_map_label.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/map_context.cpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_display.cpp
M src/game_display.hpp
M src/game_initialization/connect_engine.cpp
M src/game_initialization/connect_engine.hpp
M src/game_initialization/create_engine.cpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/multiplayer_wait.cpp
M src/gui/dialogs/editor/editor_edit_label.cpp
M src/gui/dialogs/editor/editor_edit_side.cpp
M src/gui/dialogs/editor/editor_edit_side.hpp
M src/gui/dialogs/label_settings.cpp
M src/leader_scroll_dialog.cpp
M src/map_label.cpp
M src/map_label.hpp
M src/menu_events.cpp
M src/overlay.hpp
M src/replay.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_team.cpp
M src/server/game.cpp
M src/server/game.hpp
M src/side_filter.cpp
M src/team.cpp
M src/team.hpp
M src/tests/test_team.cpp
Log Message:
-----------
Rename team_name/user_team_name to team_id/team_name (old syntax still valid)
Commit: 11664f4024cb760de7db5fec54661cd14fc05ac8
https://github.com/wesnoth/wesnoth/commit/11664f4024cb760de7db5fec54661cd14fc05ac8
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M src/side_filter.cpp
Log Message:
-----------
Add backwards compatibility for side id SSF key name
Commit: 74c1b6fadea6815df652517e680972d12d4f5d4a
https://github.com/wesnoth/wesnoth/commit/74c1b6fadea6815df652517e680972d12d4f5d4a
Author: aquileia <sk.aquileia at gmail.com>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M projectfiles/VC9/WindowsTimeout.vcproj
M projectfiles/VC9/liblua.vcproj
M projectfiles/VC9/schema_generator.vcproj
M projectfiles/VC9/wesnoth.vcproj
M projectfiles/VC9/wesnothd.vcproj
M projectfiles/VC9/wesnothlib.vcproj
Log Message:
-----------
vcproj: Remove unneeded tools
The Proxy Generaor Tool is obsolete since VC10, we don't use the IDL compiler.
Commit: 1215f65eb875cc3070e8d087ce699c0a2ff8d8b0
https://github.com/wesnoth/wesnoth/commit/1215f65eb875cc3070e8d087ce699c0a2ff8d8b0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M src/team.cpp
Log Message:
-----------
Fixed team_id/team_name not being set correctly in new format
Commit: 545253ec2b117b413e7ef40e06e65d358ce20f77
https://github.com/wesnoth/wesnoth/commit/545253ec2b117b413e7ef40e06e65d358ce20f77
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M src/team.cpp
Log Message:
-----------
Don't warn that user_team_name is unrecognized (yet)
Commit: e948df3424657c5843b1fb65a1319449bb6311bc
https://github.com/wesnoth/wesnoth/commit/e948df3424657c5843b1fb65a1319449bb6311bc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M data/test/maps/pathfind_1.cfg
M data/test/scenarios/filter_vision.cfg
M data/test/scenarios/has_ally.cfg
M data/test/scenarios/move_skip_sighted.cfg
M data/test/scenarios/test_check_victory.cfg
M data/test/scenarios/test_move.cfg
Log Message:
-----------
Updated unit tests to use new team id/name syntax
Commit: 1890e948e455376562e6191856af34059936af3e
https://github.com/wesnoth/wesnoth/commit/1890e948e455376562e6191856af34059936af3e
Author: Andreas Löf <andreas at alternating.net>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M CMakeLists.txt
M RELEASE_NOTES
M changelog
M data/campaigns/Dead_Water/units/Kraken.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
M data/campaigns/Under_the_Burning_Suns/units/monsters/Small_Mudcrawler.cfg
M data/core/about.cfg
A data/core/sounds/ink-miss.ogg
A data/core/sounds/ink.ogg
A data/core/sounds/mud-fist-miss.ogg
A data/core/sounds/mud-fist.ogg
A data/core/sounds/mud-glob-miss.ogg
A data/core/sounds/mud-glob.ogg
M data/core/terrain.cfg
M data/core/units/monsters/Cuttle_Fish.cfg
M data/core/units/monsters/Giant_Mudcrawler.cfg
M data/core/units/monsters/Mudcrawler.cfg
M data/gui/default/widget/toggle_button_listbox_header.cfg
M data/gui/default/window/game_load.cfg
M data/gui/default/window/unit_create.cfg
M data/test/maps/pathfind_1.cfg
M data/test/scenarios/filter_vision.cfg
M data/test/scenarios/has_ally.cfg
M data/test/scenarios/move_skip_sighted.cfg
M data/test/scenarios/test_check_victory.cfg
M data/test/scenarios/test_move.cfg
M data/tools/GUI.pyw
M data/tools/wmlindent
M data/tools/wmllint
M data/tools/wmlscope
A images/icons/alignments/alignment_chaotic_30.png
A images/icons/alignments/alignment_lawful_30.png
A images/icons/alignments/alignment_liminal_30.png
A images/icons/alignments/alignment_neutral_30.png
R images/misc/l10n/en at shaw/logo.png
R images/misc/l10n/es/logo.png
R images/misc/l10n/fr/logo.png
R images/misc/l10n/gd/logo.png
R images/misc/l10n/gl/logo.png
R images/misc/l10n/hu/logo.png
R images/misc/l10n/la/logo.png
R images/misc/l10n/lt/logo.png
R images/misc/l10n/nl/logo.png
R images/misc/l10n/pt/logo.png
R images/misc/l10n/sr/logo.png
R images/misc/l10n/sr at latin/logo.png
R images/misc/l10n/vi/logo.png
R images/misc/l10n/zh_CN/logo.png
M l10n-track
M packaging/windows/Wesnoth.nsi.in
M players_changelog
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/VC9/WindowsTimeout.vcproj
M projectfiles/VC9/liblua.vcproj
M projectfiles/VC9/schema_generator.vcproj
M projectfiles/VC9/wesnoth.vcproj
M projectfiles/VC9/wesnothd.vcproj
M projectfiles/VC9/wesnothlib.vcproj
M src/CMakeLists.txt
M src/ai/formula/function_table.cpp
M src/ai/testing/ca_global_fallback.cpp
M src/dialogs.cpp
M src/dialogs.hpp
M src/display.cpp
M src/display.hpp
M src/display_chat_manager.cpp
M src/display_chat_manager.hpp
M src/display_context.cpp
M src/editor/action/action_label.cpp
M src/editor/action/action_label.hpp
M src/editor/action/mouse/mouse_action_map_label.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/context_manager.hpp
M src/editor/map/map_context.cpp
M src/filesystem_boost.cpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_display.cpp
M src/game_display.hpp
M src/game_initialization/connect_engine.cpp
M src/game_initialization/connect_engine.hpp
M src/game_initialization/create_engine.cpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/multiplayer_create.cpp
M src/game_initialization/multiplayer_wait.cpp
M src/gui/dialogs/campaign_settings.cpp
M src/gui/dialogs/depcheck_select_new.cpp
M src/gui/dialogs/editor/editor_edit_label.cpp
M src/gui/dialogs/editor/editor_edit_side.cpp
M src/gui/dialogs/editor/editor_edit_side.hpp
M src/gui/dialogs/game_load.cpp
M src/gui/dialogs/game_version.hpp
M src/gui/dialogs/gamestate_inspector.cpp
M src/gui/dialogs/label_settings.cpp
M src/gui/dialogs/unit_create.cpp
M src/gui/dialogs/unit_create.hpp
M src/gui/widgets/generator.cpp
M src/gui/widgets/list.cpp
M src/hotkey/hotkey_command.cpp
M src/leader_scroll_dialog.cpp
M src/map_label.cpp
M src/map_label.hpp
M src/menu_events.cpp
M src/minimap.cpp
M src/overlay.hpp
M src/play_controller.cpp
M src/replay.cpp
M src/savegame.cpp
M src/savegame.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_team.cpp
M src/server/game.cpp
M src/server/game.hpp
M src/side_filter.cpp
M src/team.cpp
M src/team.hpp
M src/terrain_builder.cpp
M src/tests/test_team.cpp
M src/unit_types.cpp
M src/unit_types.hpp
Log Message:
-----------
Merge branch 'master' into sdl2
Compare: https://github.com/wesnoth/wesnoth/compare/ae1d36431813...1890e948e455
More information about the Commits
mailing list