[Commits] [wesnoth/wesnoth] 296c21: scons: change sdl check so it sets up pkg-config a...
GitHub
noreply at github.com
Tue Dec 1 09:34:45 UTC 2015
Branch: refs/heads/sdl2
Home: https://github.com/wesnoth/wesnoth
Commit: 296c217e5d69aae8f00561b790305fcc8238a007
https://github.com/wesnoth/wesnoth/commit/296c217e5d69aae8f00561b790305fcc8238a007
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M scons/sdl.py
Log Message:
-----------
scons: change sdl check so it sets up pkg-config and PATH if passed non-empty sdldir
Needed for specifying local installs of sdl on non-windows platforms.
Commit: 9ce59881d2472ee4e8b9a2bffa15922984913113
https://github.com/wesnoth/wesnoth/commit/9ce59881d2472ee4e8b9a2bffa15922984913113
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
fix wesnothd::game::send_data_sides
Commit: 8e78def64d1724a88e0c13d6349397fc9831424e
https://github.com/wesnoth/wesnoth/commit/8e78def64d1724a88e0c13d6349397fc9831424e
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M src/whiteboard/recruit.cpp
Log Message:
-----------
Add a comment
Commit: 729d17a78357d449ce6a769ce715786aed728e27
https://github.com/wesnoth/wesnoth/commit/729d17a78357d449ce6a769ce715786aed728e27
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M src/game_initialization/multiplayer.cpp
Log Message:
-----------
remove outcommented code
Commit: a7bb6b1fa57fe736115820fbdbdff56a50acaf0a
https://github.com/wesnoth/wesnoth/commit/a7bb6b1fa57fe736115820fbdbdff56a50acaf0a
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/variable_info.cpp
Log Message:
-----------
fix crash in set_variables
http://gna.org/bugs/?24100
This only changes the vit == vit_const case.
Commit: aae8e70c7aff84117f48271dedbd1f2189fd7509
https://github.com/wesnoth/wesnoth/commit/aae8e70c7aff84117f48271dedbd1f2189fd7509
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/CodeBlocks/wesnothd.cbp
M src/CMakeLists.txt
M src/SConscript
M src/filesystem_boost.cpp
A src/libc_error.hpp
A src/log_windows.cpp
A src/log_windows.hpp
M src/wesnoth.cpp
Log Message:
-----------
log/windows: Add our own stdout/stderr redirection on Windows
This replaces SDL 1.2's built-in stdout/stderr redirection, which writes
the log file to the process working directory (usually an
admin-restricted location) instead of a more accessible user-writable
location.
My approach combines stdout and stderr into a single log file which
includes the process id and timestamp in its filename in order to
accomodate multiple instances and (coming later) log rotation. The log
file is created in the user's temporary directory defined by Windows,
and then relocated to the game user data dir as soon as it is set-up the
first time, placed in the Windows-specific logs/ subdir.
The most pressing issues this solves are the lack of built-in
stdout/stderr redirection in SDL 2's SDL2main.lib entry point, and
Unicode path issues with SDL 1.2 (bug #22897). Additionally, it allows
us to not have to rely on UAC virtualization anymore; this is arguably
far more important because it has been known to break on occasion (e.g.
<http://r.wesnoth.org/t42970>), and starting with version 1.13.2 we want
to declare Windows Vista - 10 compatibility in our side-by-side manifest
(see commit e119f4071f047c6d740ebec4636985fdf39349bc).
Currently missing features coming later:
* Log rotation (otherwise the logs/ dir may grow forever)
* wesnothd support (although the code is already required to be linked
into wesnothd due to it being required by the FS API)
* Integration with the version info dialog
Commit: 900dc5b07017bfcf6ea08fc06a09a5f1cfb712db
https://github.com/wesnoth/wesnoth/commit/900dc5b07017bfcf6ea08fc06a09a5f1cfb712db
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/log_windows.cpp
Log Message:
-----------
log/windows: Implement log file rotation
A maximum of 8 previous log files are kept around in the logs directory.
Older files are automatically deleted during initialization.
I could've achieved this with stat calls, really, but the log filenames
are simpler and faster to process.
Commit: bc9fb0c1110027b7fddaf7860cd0fded652e91a2
https://github.com/wesnoth/wesnoth/commit/bc9fb0c1110027b7fddaf7860cd0fded652e91a2
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/log_windows.cpp
Log Message:
-----------
log/windows: Close stdout and stderr on destruction if redirected
No real reason to do this since these resources should be automatically
released on process exit anyway, but, better safe than sorry I guess.
Commit: 53ed94da251b231a41e399bcee634be3fa813343
https://github.com/wesnoth/wesnoth/commit/53ed94da251b231a41e399bcee634be3fa813343
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
M src/CMakeLists.txt
M src/SConscript
R src/desktop/windows_console.cpp
R src/desktop/windows_console.hpp
M src/gui/dialogs/game_version.cpp
M src/log_windows.cpp
M src/log_windows.hpp
M src/wesnoth.cpp
Log Message:
-----------
log/windows: Integrate implementation of --wconsole
This makes it so we no longer try to steal the console back to a log
file when using --wconsole with the new redirection code. Now the
--wconsole switch triggers a special mode of the log file manager that
uses a native console instead of log files.
As a necessary bonus to appease compilers, the GUI2 version info dialog
now uses the correct log file path when not started with the --wconsole
switch. Yay!
Commit: baae0bd708d3b61ff0440a4b4d22519c230a0c32
https://github.com/wesnoth/wesnoth/commit/baae0bd708d3b61ff0440a4b4d22519c230a0c32
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/log_windows.cpp
Log Message:
-----------
log/windows: Auto-disable log file if a console is attached at startup
This change only actually concerns binaries built with the console
subsystem flag, which isn't the case with our official project files or
SCons recipe.
Commit: 758f929a7bca73c9272746292b1367b4945654c2
https://github.com/wesnoth/wesnoth/commit/758f929a7bca73c9272746292b1367b4945654c2
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M RELEASE_NOTES
M changelog
Log Message:
-----------
Update changelog and RELEASE_NOTES
Commit: 71009d939f37e5ea3900c1aa23affc404c30ffa1
https://github.com/wesnoth/wesnoth/commit/71009d939f37e5ea3900c1aa23affc404c30ffa1
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M RELEASE_NOTES
M changelog
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/CodeBlocks/wesnothd.cbp
M src/CMakeLists.txt
M src/SConscript
R src/desktop/windows_console.cpp
R src/desktop/windows_console.hpp
M src/filesystem_boost.cpp
M src/gui/dialogs/game_version.cpp
A src/libc_error.hpp
A src/log_windows.cpp
A src/log_windows.hpp
M src/wesnoth.cpp
Log Message:
-----------
Merge branch 'feature/win32-stdio-redir'
Commit: 3f37e4a51d0737cab9648b823eeb5567167fab6f
https://github.com/wesnoth/wesnoth/commit/3f37e4a51d0737cab9648b823eeb5567167fab6f
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/variable_info.cpp
Log Message:
-----------
Revert "fix crash in set_variables"
This reverts commit a7bb6b1fa57fe736115820fbdbdff56a50acaf0a.
This didn't really fix it, it just made the code more complicated.
Commit: b7f9775872b6b45b4694ee2f563c3771d9142831
https://github.com/wesnoth/wesnoth/commit/b7f9775872b6b45b4694ee2f563c3771d9142831
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/variable_info.cpp
Log Message:
-----------
fix crash in [set_variables]
http://gna.org/bugs/?24100
Commit: da9a3c4b6ee959db755aa99d583742354c77261c
https://github.com/wesnoth/wesnoth/commit/da9a3c4b6ee959db755aa99d583742354c77261c
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/libc_error.hpp
Log Message:
-----------
Make libc_error a subclass of std::exception
Commit: 03648f7f9e6fe8e3ac61a3c7739e1968c68336e0
https://github.com/wesnoth/wesnoth/commit/03648f7f9e6fe8e3ac61a3c7739e1968c68336e0
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M src/wesnoth.cpp
Log Message:
-----------
Remove a few superfluous includes
Commit: 5d825d4aca3011c40365c358573882f928c4aa7b
https://github.com/wesnoth/wesnoth/commit/5d825d4aca3011c40365c358573882f928c4aa7b
Author: aquileia <sk.aquileia at gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M projectfiles/VC9/wesnoth.vcproj
M projectfiles/VC9/wesnothlib.vcproj
Log Message:
-----------
vcproj: Update for 53ed94d & aae8e70
[skip ci]
Commit: edb8be4bceffcd04963bde57144a6eb75647ba77
https://github.com/wesnoth/wesnoth/commit/edb8be4bceffcd04963bde57144a6eb75647ba77
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M src/log_windows.cpp
Log Message:
-----------
log/windows: Leave Windows version unspecified
If this breaks compilation for MSVC++ users, make sure MSVC++ passes
-D_WIN32_WINNT=0x0501 to the compiler, or revert this commit. CB and SCons
already do that, so...
Commit: bb87a306e98540983b2812d9df03fcc6f9384fe7
https://github.com/wesnoth/wesnoth/commit/bb87a306e98540983b2812d9df03fcc6f9384fe7
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M src/log_windows.cpp
Log Message:
-----------
log/windows: Drop test code that was never meant to be pushed upstream
Commit: 8a04442ce29dc46860f1e13f0a59213f349855e0
https://github.com/wesnoth/wesnoth/commit/8a04442ce29dc46860f1e13f0a59213f349855e0
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
Log Message:
-----------
Fix Low Carryover
http://gna.org/bugs/?23674
We don't want to use the units and gold stored in the global variables if we already get them from normal carryover becasue that results in having them twice.
Commit: 9d85887ed10add0fa28960f17e72f558695065a7
https://github.com/wesnoth/wesnoth/commit/9d85887ed10add0fa28960f17e72f558695065a7
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M changelog
M data/lua/wml-tags.lua
Log Message:
-----------
Add [remove_time_area] and allow [time_area] remove=yes to take an id list
[remove_time_area] is syntatic sugar but it's used to implement
[time_area] remove=yes now, just like [remove_event]/[event].
Commit: de44790d7d96262d470d8ca5adc2e2ca6964e4b1
https://github.com/wesnoth/wesnoth/commit/de44790d7d96262d470d8ca5adc2e2ca6964e4b1
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M changelog
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
Make [*time_area] Lua API functions take a single time area id
This means the Lua code implementing the WML tags are now solely
responsible for parsing the comma-separated id list. It just so happens
that I added code for that without realizing that I was duplicating
existing functionality on the C++ side.
As a result:
* wesnoth.add_time_area and wesnoth.remove_time_area can operate on
time area ids that contain commas (if someone feels this is needed
for some weird reason)
* [time_area] no longer warns about adding time areas with commas in
their ids (actually adding the first id of the list instead)
* [time_area] remove=yes and [remove_time_area] still handle
comma-separated lists of ids, in the Lua side instead of C++.
This makes the Lua API for this consistent with [event]/[remove_event].
Since the Lua API functions in question are undocumented at this moment,
it's unlikely this impacts anyone, really.
Commit: be68ebc0a70ad22dd92febff6de9f8b096bbe81e
https://github.com/wesnoth/wesnoth/commit/be68ebc0a70ad22dd92febff6de9f8b096bbe81e
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
M data/campaigns/Legend_of_Wesmere/maps/02_Hostile_Mountains.map
M data/campaigns/Legend_of_Wesmere/maps/04_The_Elvish_Treasury.map
M data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
M data/campaigns/Legend_of_Wesmere/maps/09_Bounty_Hunters.map
M data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
M data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_Book.map
M data/campaigns/Legend_of_Wesmere/maps/14_Human_Alliance.map
M data/campaigns/Legend_of_Wesmere/maps/16_The_Chief_Must_Die.map
M data/campaigns/Legend_of_Wesmere/maps/23_End_of_War.map
M data/campaigns/Legend_of_Wesmere/maps/Kalian.map
M data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg
M data/campaigns/Legend_of_Wesmere/maps/Lintanir.map
M data/campaigns/Legend_of_Wesmere/maps/North_Elves.map
M data/campaigns/Legend_of_Wesmere/maps/Saurgrath.map
M data/campaigns/Legend_of_Wesmere/masks/01_The_Uprooting.mask
M data/campaigns/Legend_of_Wesmere/masks/03_Kalian_under_Attack.mask
M data/campaigns/Legend_of_Wesmere/masks/05_The_Saurian_Treasury.mask
M data/campaigns/Legend_of_Wesmere/masks/07_Elves_Last_Stand.mask
M data/campaigns/Legend_of_Wesmere/masks/17_Breaking_the_Siege.mask
M data/campaigns/Legend_of_Wesmere/masks/19_Costly_Revenge.mask
M data/campaigns/Legend_of_Wesmere/masks/21_Elvish_Assassins.mask
M data/campaigns/Legend_of_Wesmere/masks/22_Northern_Battle.mask
A data/campaigns/Legend_of_Wesmere/scenarios/North_elves_utils.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
A data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand_utils.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
A data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die_utils.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
M data/campaigns/Legend_of_Wesmere/utils/bigmap.cfg
M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
A data/campaigns/Legend_of_Wesmere/utils/debug.cfg
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
M data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg
Log Message:
-----------
merge LoW from 1.12 into master
This commit manually merges all LoW commits from the 1.12 branch into
master.
This might revert some 1.13 commits which i wasn't able to merge
correctly.
Commit: 59233ce90328499755ed108b48773ed1aaf5797d
https://github.com/wesnoth/wesnoth/commit/59233ce90328499755ed108b48773ed1aaf5797d
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M data/lua/wml/message.lua
Log Message:
-----------
attempt to fix bug in [message]
previously this bug http://i.imgur.com/9B7bquA.png happend in LoW scenario3.
Commit: 6d47bd07805516872612fce2b6bd64d418c1d9eb
https://github.com/wesnoth/wesnoth/commit/6d47bd07805516872612fce2b6bd64d418c1d9eb
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
Log Message:
-----------
LoW cleanups
removed attributes that were already defined by the {PLAYABLE} macro.
Commit: fe3adedcf6a836cefd13989780ed1c8c0a08fed1
https://github.com/wesnoth/wesnoth/commit/fe3adedcf6a836cefd13989780ed1c8c0a08fed1
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
Log Message:
-----------
more LoW cleanups
Commit: 498a79060e8a9c07bbe021469abe779b00af5f45
https://github.com/wesnoth/wesnoth/commit/498a79060e8a9c07bbe021469abe779b00af5f45
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
R data/campaigns/Legend_of_Wesmere/scenarios/North_elves_utils.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
Log Message:
-----------
LoW: moved North Elves common village setup into a file
Commit: 1e45c14e6825cdd2e2390dc739a0a85cbcab6c19
https://github.com/wesnoth/wesnoth/commit/1e45c14e6825cdd2e2390dc739a0a85cbcab6c19
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
R data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand_utils.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
R data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die_utils.cfg
Log Message:
-----------
Manually reapply d6c67db110b6ed37
Commit: adb894dd21a036b617ccb6cf935323f62d3c0140
https://github.com/wesnoth/wesnoth/commit/adb894dd21a036b617ccb6cf935323f62d3c0140
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
M data/campaigns/Legend_of_Wesmere/utils/bigmap.cfg
M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
Log Message:
-----------
wmlindent pass
Commit: 9f8b7028281342ab30b251fa5380aca13cf02307
https://github.com/wesnoth/wesnoth/commit/9f8b7028281342ab30b251fa5380aca13cf02307
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/maps/02_Hostile_Mountains.map
M data/campaigns/Legend_of_Wesmere/maps/04_The_Elvish_Treasury.map
M data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
M data/campaigns/Legend_of_Wesmere/maps/09_Bounty_Hunters.map
M data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
M data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_Book.map
M data/campaigns/Legend_of_Wesmere/maps/14_Human_Alliance.map
M data/campaigns/Legend_of_Wesmere/maps/16_The_Chief_Must_Die.map
M data/campaigns/Legend_of_Wesmere/maps/23_End_of_War.map
M data/campaigns/Legend_of_Wesmere/maps/Kalian.map
M data/campaigns/Legend_of_Wesmere/maps/Lintanir.map
M data/campaigns/Legend_of_Wesmere/maps/North_Elves.map
M data/campaigns/Legend_of_Wesmere/maps/Saurgrath.map
Log Message:
-----------
Manually reapply 376ffc16efd1c36
Commit: 691c4c4ae4d6c198bd7913cd6f2cbb4d1fda6db3
https://github.com/wesnoth/wesnoth/commit/691c4c4ae4d6c198bd7913cd6f2cbb4d1fda6db3
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/masks/01_The_Uprooting.mask
M data/campaigns/Legend_of_Wesmere/masks/03_Kalian_under_Attack.mask
M data/campaigns/Legend_of_Wesmere/masks/05_The_Saurian_Treasury.mask
M data/campaigns/Legend_of_Wesmere/masks/07_Elves_Last_Stand.mask
M data/campaigns/Legend_of_Wesmere/masks/17_Breaking_the_Siege.mask
M data/campaigns/Legend_of_Wesmere/masks/19_Costly_Revenge.mask
M data/campaigns/Legend_of_Wesmere/masks/21_Elvish_Assassins.mask
M data/campaigns/Legend_of_Wesmere/masks/22_Northern_Battle.mask
Log Message:
-----------
Manually reapply a1e66d6f2a4ca
Commit: f751739aeab3bd142ee6e5c59945aaa778fb45ba
https://github.com/wesnoth/wesnoth/commit/f751739aeab3bd142ee6e5c59945aaa778fb45ba
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
Log Message:
-----------
Manually reapply 730453cf01c242b
Commit: 816df4d7063057217a0aa91404847d5e01d0ad12
https://github.com/wesnoth/wesnoth/commit/816df4d7063057217a0aa91404847d5e01d0ad12
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
Log Message:
-----------
more LoW cleanups
Commit: 889d6edb4a249d557d7237777e7f5e1503d94834
https://github.com/wesnoth/wesnoth/commit/889d6edb4a249d557d7237777e7f5e1503d94834
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M src/game_initialization/connect_engine.cpp
Log Message:
-----------
attempt to fix an assertion failue in mp connect engine.
Commit: f3003cf83aa61f22f7e7bf295696a0b244343558
https://github.com/wesnoth/wesnoth/commit/f3003cf83aa61f22f7e7bf295696a0b244343558
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
Log Message:
-----------
LoW: small fixup to 1e45c14e6825
Commit: 7caf603d20ca3f9f3bf733a9b3879cc8e74152bb
https://github.com/wesnoth/wesnoth/commit/7caf603d20ca3f9f3bf733a9b3879cc8e74152bb
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Add download path string fixes for the 1.12.5 release
Commit: a3bc17a9fe73210d11bbd16182dc69acc4843930
https://github.com/wesnoth/wesnoth/commit/a3bc17a9fe73210d11bbd16182dc69acc4843930
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
Log Message:
-----------
more LoW cleanups
Commit: da163512f9d0cd5eafdfa2a3264a2c7f5c64f91c
https://github.com/wesnoth/wesnoth/commit/da163512f9d0cd5eafdfa2a3264a2c7f5c64f91c
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
Log Message:
-----------
fix mp connect beeing shown before LoW scenario8
Commit: 44179a2cbb50f3ba2a22b885aeedc4f36e607896
https://github.com/wesnoth/wesnoth/commit/44179a2cbb50f3ba2a22b885aeedc4f36e607896
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M src/scripting/lua_team.cpp
Log Message:
-----------
add lua getter for side save_id
Commit: d8c679c5db1b48cad7afc5225f6ff0b45b02a42a
https://github.com/wesnoth/wesnoth/commit/d8c679c5db1b48cad7afc5225f6ff0b45b02a42a
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
M data/campaigns/Legend_of_Wesmere/maps/09_Bounty_Hunters.map
M data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
M data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_Book.map
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
Log Message:
-----------
make allied human side sides 2,3,4 in scenario 6,9,10,11 in LoW
this was already done in the other scenarios.
Commit: 9bc839e6b1169fe490b22e2c1ea89d2964eae1f0
https://github.com/wesnoth/wesnoth/commit/9bc839e6b1169fe490b22e2c1ea89d2964eae1f0
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
Log Message:
-----------
more LoW clenaups
Commit: 554547beacb51eac65f5812bec2476d3c0275f36
https://github.com/wesnoth/wesnoth/commit/554547beacb51eac65f5812bec2476d3c0275f36
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
Log Message:
-----------
more LoW cleanups
Commit: 91943451c7320c308d5b53638bb438e778a165f7
https://github.com/wesnoth/wesnoth/commit/91943451c7320c308d5b53638bb438e778a165f7
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M data/lua/wml-tags.lua
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_team.cpp
Log Message:
-----------
move most of [endlevel] implementation to lua
as a side effect we get read/write fields
side.carryover_bonus/carryover_add/carryover_percentage in lua sides.
Commit: 15df645d02cc894e9accdc3fb72c6a8a5e9e87f3
https://github.com/wesnoth/wesnoth/commit/15df645d02cc894e9accdc3fb72c6a8a5e9e87f3
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
Log Message:
-----------
More LoW cleanups
Commit: d755d3b820259394637012d10639bce8582cbb70
https://github.com/wesnoth/wesnoth/commit/d755d3b820259394637012d10639bce8582cbb70
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M data/lua/wml-tags.lua
M src/game_initialization/playcampaign.cpp
M src/scripting/lua_team.cpp
M src/team.cpp
M src/team.hpp
Log Message:
-----------
add [endlevel] bonus=number
instead of bonus=yes/no you can also pass a number, so bonus=0.5 will
give you only half of the bonus gold.
Commit: 76da10bd44da491a8bbef647d559c026ab417503
https://github.com/wesnoth/wesnoth/commit/76da10bd44da491a8bbef647d559c026ab417503
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
Log Message:
-----------
split early finishing bonus between players in LoW
Commit: d966b68d64d9b527168177f0fa573ce2a0a0a9e0
https://github.com/wesnoth/wesnoth/commit/d966b68d64d9b527168177f0fa573ce2a0a0a9e0
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
cmake: Fix unclosed if block
Introduced in commit aae8e70c7aff84117f48271dedbd1f2189fd7509. Oops.
Commit: 81480d1d774d8c63899cea0a48be6dd716604ffa
https://github.com/wesnoth/wesnoth/commit/81480d1d774d8c63899cea0a48be6dd716604ffa
Author: Andreas Löf <andreas at alternating.net>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M RELEASE_NOTES
M changelog
M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
M data/campaigns/Legend_of_Wesmere/maps/02_Hostile_Mountains.map
M data/campaigns/Legend_of_Wesmere/maps/04_The_Elvish_Treasury.map
M data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
M data/campaigns/Legend_of_Wesmere/maps/09_Bounty_Hunters.map
M data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
M data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_Book.map
M data/campaigns/Legend_of_Wesmere/maps/14_Human_Alliance.map
M data/campaigns/Legend_of_Wesmere/maps/Kalian.map
M data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg
M data/campaigns/Legend_of_Wesmere/maps/Lintanir.map
M data/campaigns/Legend_of_Wesmere/maps/Saurgrath.map
M data/campaigns/Legend_of_Wesmere/masks/03_Kalian_under_Attack.mask
M data/campaigns/Legend_of_Wesmere/masks/05_The_Saurian_Treasury.mask
M data/campaigns/Legend_of_Wesmere/masks/07_Elves_Last_Stand.mask
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
M data/campaigns/Legend_of_Wesmere/utils/bigmap.cfg
M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
A data/campaigns/Legend_of_Wesmere/utils/debug.cfg
M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
M data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg
M data/lua/wml-tags.lua
M data/lua/wml/message.lua
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/CodeBlocks/wesnothd.cbp
M projectfiles/VC9/wesnoth.vcproj
M projectfiles/VC9/wesnothlib.vcproj
M scons/sdl.py
M src/CMakeLists.txt
M src/SConscript
R src/desktop/windows_console.cpp
R src/desktop/windows_console.hpp
M src/filesystem_boost.cpp
M src/game_initialization/connect_engine.cpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/playcampaign.cpp
M src/gui/dialogs/game_version.cpp
A src/libc_error.hpp
A src/log_windows.cpp
A src/log_windows.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_team.cpp
M src/server/game.cpp
M src/team.cpp
M src/team.hpp
M src/variable_info.cpp
M src/wesnoth.cpp
M src/whiteboard/recruit.cpp
M utils/pofix.py
Log Message:
-----------
Merge branch 'master' into sdl2
Compare: https://github.com/wesnoth/wesnoth/compare/3036b4ee49ef...81480d1d774d
More information about the Commits
mailing list