[Commits] [wesnoth/wesnoth] 5e4df2: Add a SDL2 compatibility wrapper.
GitHub
noreply at github.com
Mon Mar 17 11:58:59 UTC 2014
Branch: refs/heads/1.12
Home: https://github.com/wesnoth/wesnoth
Commit: 5e4df21fc649ccaf3319d2b10581de7f12d8fb65
https://github.com/wesnoth/wesnoth/commit/5e4df21fc649ccaf3319d2b10581de7f12d8fb65
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-02-22 (Sat, 22 Feb 2014)
Changed paths:
M src/gui/auxiliary/event/dispatcher.hpp
A src/sdl/compat.hpp
M src/sdl_utils.hpp
M src/tests/utils/fake_event_source.hpp
Log Message:
-----------
Add a SDL2 compatibility wrapper.
This wrapper takes care of the renaming of some types done in SDL2. This
allows better compatibility between SDL 1.2 and 2.0 code.
Commit: 255170017062f3772319661a5d0157e69b23721e
https://github.com/wesnoth/wesnoth/commit/255170017062f3772319661a5d0157e69b23721e
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-02-22 (Sat, 22 Feb 2014)
Changed paths:
M src/sdl_utils.cpp
M src/sdl_utils.hpp
Log Message:
-----------
Rename a function parameter unused -> alpha.
The new name is more appropriate.
Commit: 3d6b6b4945937b2963ca585b3f612892e3d44fe9
https://github.com/wesnoth/wesnoth/commit/3d6b6b4945937b2963ca585b3f612892e3d44fe9
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-02-22 (Sat, 22 Feb 2014)
Changed paths:
M src/font.hpp
M src/image_modifications.cpp
M src/map_label.cpp
M src/sdl_utils.cpp
M src/tests/test_image_modifications.cpp
Log Message:
-----------
Add a fix for the renamed field in SDL2.
The unused field in SDL_Color has been renamed to a.
Commit: 2628c62122c1c29859c659f771dfdf18187f681a
https://github.com/wesnoth/wesnoth/commit/2628c62122c1c29859c659f771dfdf18187f681a
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-02-23 (Sun, 23 Feb 2014)
Changed paths:
M src/sdl_utils.cpp
Log Message:
-----------
Port sdl_keysym_from_name for SDL2 usage.
Use the SDL2 function SDL_GetKeyFromName.
Commit: 131327d7edc47f083925004acb5a89bcee3033c0
https://github.com/wesnoth/wesnoth/commit/131327d7edc47f083925004acb5a89bcee3033c0
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-02-23 (Sun, 23 Feb 2014)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/about.cpp
M src/attack_prediction_display.cpp
M src/editor/palette/tristate_button.cpp
M src/font.cpp
M src/image_modifications.cpp
A src/sdl/alpha.cpp
A src/sdl/alpha.hpp
M src/sdl_utils.cpp
Log Message:
-----------
Add a wrapper for SDL_SetAlpha when using SDL2.
The code is only compile-tested. Since there are more compilation issues
the code has not been tested at run-time.
Commit: fd55e62c3e3b7dd48bf82b96be084d8949c1f746
https://github.com/wesnoth/wesnoth/commit/fd55e62c3e3b7dd48bf82b96be084d8949c1f746
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-02-23 (Sun, 23 Feb 2014)
Changed paths:
M src/events.cpp
M src/gui/auxiliary/event/handler.cpp
M src/loadscreen.cpp
Log Message:
-----------
Fix a several event handling loops.
Several events which were normal events in SDL1.2 have been moved as
subevents of the SDL_WINDOWEVENT in SDL2.0.
Commit: b3c9db388ac925da04d5131a72fbfad981e933d4
https://github.com/wesnoth/wesnoth/commit/b3c9db388ac925da04d5131a72fbfad981e933d4
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/sdl_utils.cpp
Log Message:
-----------
Port SDL_SetPalette for SDL2 usage.
Commit: e9475a351089c672fa10b7bff7854e6decb71627
https://github.com/wesnoth/wesnoth/commit/e9475a351089c672fa10b7bff7854e6decb71627
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/key.cpp
M src/sdl/compat.hpp
Log Message:
-----------
Port SDL_GetKeyState for SDL2 usage.
Commit: b400cc812fa7beee00f8cabb63e2858dfb835258
https://github.com/wesnoth/wesnoth/commit/b400cc812fa7beee00f8cabb63e2858dfb835258
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
Log Message:
-----------
Fix linker issues with SDL2.
The compatiblity file sdl/alpha.cpp is now linked properly in CMake,
Scons has not been tested yet.
Commit: 818656008479d3914d2c1f4b4587b3b461027259
https://github.com/wesnoth/wesnoth/commit/818656008479d3914d2c1f4b4587b3b461027259
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/events.cpp
Log Message:
-----------
Disable UNICODE setting for SDL2.
The calls for setting UNICODE are no longer used in SDL2.
Commit: 687c186ac944b71ee07f612043e48f4afd2a22b7
https://github.com/wesnoth/wesnoth/commit/687c186ac944b71ee07f612043e48f4afd2a22b7
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/events.cpp
Log Message:
-----------
Remove the SDL_EnableKeyRepeat call for SDL2.
The function is no longer available.
Commit: adac10f47736d5497fe0c1ec137e5d1f825fd604
https://github.com/wesnoth/wesnoth/commit/adac10f47736d5497fe0c1ec137e5d1f825fd604
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/key.hpp
Log Message:
-----------
Change a type to be SDL2 compatible.
Commit: 9d8201e224a7cded0255ec63acf1057cff7fe66d
https://github.com/wesnoth/wesnoth/commit/9d8201e224a7cded0255ec63acf1057cff7fe66d
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/gui/auxiliary/event/handler.cpp
M src/hotkey/hotkey_item.cpp
M src/hotkey/hotkey_preferences_display.cpp
M src/tests/utils/fake_event_source.cpp
Log Message:
-----------
Avoid using the unicode field in SDL2.
The unicode field in the SDL_keysym no longer exists in SDL2. Use the
scancode field instead. This needs to be evaluated later.
Commit: c2c3029bb41ecf98faeef2353f9214434d72b656
https://github.com/wesnoth/wesnoth/commit/c2c3029bb41ecf98faeef2353f9214434d72b656
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/sdl/compat.hpp
Log Message:
-----------
Add a work-around for the META rename in SDL2.
Several foo_META constants have been renamed to foo_GUI in SDL2.
Commit: 0bff213becdd0c55518a28edcf9962aef71c0b6f
https://github.com/wesnoth/wesnoth/commit/0bff213becdd0c55518a28edcf9962aef71c0b6f
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-01 (Sat, 01 Mar 2014)
Changed paths:
M src/sdl/compat.hpp
Log Message:
-----------
Add a SDL_FULLSCREEN work-around for SDL2.
Commit: 8a079ba48838bd2314e056714345171db0e0ce0c
https://github.com/wesnoth/wesnoth/commit/8a079ba48838bd2314e056714345171db0e0ce0c
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/sdl/compat.hpp
Log Message:
-----------
Add a work-around for SDL_EVENTMASK in SDL2.
Commit: 57432e805fa97d7173cb60054c4e660013c8b31c
https://github.com/wesnoth/wesnoth/commit/57432e805fa97d7173cb60054c4e660013c8b31c
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/sdl/compat.hpp
M src/video.cpp
M src/video.hpp
Log Message:
-----------
Add a work-around for SDL_GetAppState in SDL2.
The code only compiles, but never return a sensible value. This should
be done later.
Commit: 49b2a04e3825d2827789c3b51fc141f61dd19b1f
https://github.com/wesnoth/wesnoth/commit/49b2a04e3825d2827789c3b51fc141f61dd19b1f
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/controller_base.cpp
Log Message:
-----------
Disable some code for SDL2.
The code doesn't compile for SDL2 and it seems a work-around for an
issue in SDL, so maybe it is no longer required with SDL2. This needs to
be tested later.
Commit: 04eea89636af328ddb6362621964ef734ee4c790
https://github.com/wesnoth/wesnoth/commit/04eea89636af328ddb6362621964ef734ee4c790
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/preferences_display.cpp
M src/video.cpp
M src/video.hpp
Log Message:
-----------
Refactor show_video_mode_dialog.
Separated the dialog code from the resolution gathering code. This makes
it easier to port the code to SDL2.
This also changes the sorting of the resolutions, first width then
height instead of based on the area. Before a part of the list looked
like:
1280 x 720
1152 x 864
1280 x 960
1440 x 900
1282 x 1024
These now look like:
1152 x 864
1280 x 720
1280 x 960
1280 x 1024
1440 x 900
The new sorting makes more sense to me.
Commit: d64e5fb98e211d7baff5054d0c6bf323ceb31bf1
https://github.com/wesnoth/wesnoth/commit/d64e5fb98e211d7baff5054d0c6bf323ceb31bf1
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/events.cpp
Log Message:
-----------
Fix another SDL_ACTIVEEVENT usage for SDL2.
Not sure whether this code is a work-around for somthing SDL1.2 specific
or is also required for SDL2.
Commit: e2e029b6e065d59b23972fbb4c339eb311fe9c18
https://github.com/wesnoth/wesnoth/commit/e2e029b6e065d59b23972fbb4c339eb311fe9c18
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/hotkey/hotkey_preferences_display.cpp
Log Message:
-----------
Fix a typo in a previous SDL2 related commit.
The error avoided the code to be compiled, somehow got lost between all
the other compilation errors still around.
Commit: a5ebded0cbb89741e75f164b6aba284c75fd169f
https://github.com/wesnoth/wesnoth/commit/a5ebded0cbb89741e75f164b6aba284c75fd169f
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/preferences_display.cpp
Log Message:
-----------
Disable code for SDL2 in detect_video_settings.
This part of the code probably needs to be rewritten for SDL2, so add a
small band-aid for now.
Commit: a87046bff7e1e79ad352a06594fb0611fc1f5f7a
https://github.com/wesnoth/wesnoth/commit/a87046bff7e1e79ad352a06594fb0611fc1f5f7a
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/gui/dialogs/lobby_main.cpp
M src/gui/dialogs/title_screen.cpp
Log Message:
-----------
Fix the fullscreen functions for SDL2.
Commit: 07c8ae4d121ab8de5ae6bb4a85be16f7d774c292
https://github.com/wesnoth/wesnoth/commit/07c8ae4d121ab8de5ae6bb4a85be16f7d774c292
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/font.hpp
Log Message:
-----------
Make a subtle include order change for SDL2.
Instead of compiling Wesnoth cleanly with a lot of linker errors I run
again in a new set of compilation errors. (Well I still consider this
progress ;-))
Commit: a65a86f71476985137e3ca2962c94fa6b764fd97
https://github.com/wesnoth/wesnoth/commit/a65a86f71476985137e3ca2962c94fa6b764fd97
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/widgets/textbox.cpp
Log Message:
-----------
Add an include for SDL_SetAlpha when using SDL2.
Commit: c28579e1f120e6bf6afeceee9f45e649ac16da95
https://github.com/wesnoth/wesnoth/commit/c28579e1f120e6bf6afeceee9f45e649ac16da95
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/game_controller.cpp
M src/video.cpp
M src/video.hpp
Log Message:
-----------
Add a work-around for SDL_WM_SetCaption in SDL2.
The code compiles, but doesn't do anything useful at the moment.
Commit: 08e717e4cd3bcdb5fcc5f13364aac216422fc6d3
https://github.com/wesnoth/wesnoth/commit/08e717e4cd3bcdb5fcc5f13364aac216422fc6d3
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/game_controller.cpp
M src/video.cpp
M src/video.hpp
Log Message:
-----------
Add a work-around for SDL_WM_SetIcon in SDL2.
The code compiles, but doesn't do anything useful at the moment.
Commit: e3a2dcdaf6b2a6a0a061498da317678733f008a4
https://github.com/wesnoth/wesnoth/commit/e3a2dcdaf6b2a6a0a061498da317678733f008a4
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/sdl/compat.hpp
Log Message:
-----------
Add define for SDL_keysym when using SDL2.
Commit: 41b316d071af26d38c1c7c712fcbef94ad4ae67f
https://github.com/wesnoth/wesnoth/commit/41b316d071af26d38c1c7c712fcbef94ad4ae67f
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/video.cpp
Log Message:
-----------
Make get_flags compile with SDL2.
Not entirely sure which hardware flags need to be used, so only handle
the resizeable flag.
Commit: 80636afd0e7b0697e149611a975fa67cd4e7dde1
https://github.com/wesnoth/wesnoth/commit/80636afd0e7b0697e149611a975fa67cd4e7dde1
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/font.cpp
M src/video.cpp
Log Message:
-----------
Add a work-around for SDL_GetVideoSurface in SDL2.
For now simply assume the surface returned is NULL and everything
compiles nicely.
Commit: adf46e650df50b12077049eaf5ba2aa095a35bda
https://github.com/wesnoth/wesnoth/commit/adf46e650df50b12077049eaf5ba2aa095a35bda
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/widgets/textbox.cpp
Log Message:
-----------
Another SDL2 unicode to scancode conversion.
Commit: 4d52cb9728e25b7e3f73e14ebf66ba2a03a44d4f
https://github.com/wesnoth/wesnoth/commit/4d52cb9728e25b7e3f73e14ebf66ba2a03a44d4f
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/video.cpp
Log Message:
-----------
Disable CVideo::flip in SDL2.
This function needs to be rewritten for SDL2, so disable it so
compilation doesn't fail.
Commit: f8b01d3211b197328932c24cf02c94a6edc9f6fc
https://github.com/wesnoth/wesnoth/commit/f8b01d3211b197328932c24cf02c94a6edc9f6fc
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/video.cpp
Log Message:
-----------
Disable CVideo::modePossible in SDL2.
This function needs to be rewritten for SDL2, so disable it so
compilation doesn't fail.
Commit: 1ad881dac3a1ed6380a51641b9b48b948b5c49a3
https://github.com/wesnoth/wesnoth/commit/1ad881dac3a1ed6380a51641b9b48b948b5c49a3
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/video.cpp
Log Message:
-----------
Disable CVideo::setMode in SDL2.
This function needs to be rewritten for SDL2, so disable it so
compilation doesn't fail.
Commit: 1857ba5449847c6f9c919955b86e5869e4a54cac
https://github.com/wesnoth/wesnoth/commit/1857ba5449847c6f9c919955b86e5869e4a54cac
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/video.cpp
Log Message:
-----------
Port CVideo::get_available_resolutions to SDL2.
The code is only compiled, but probably also works.
Commit: d03b9beb6a3988e369ccd2e45cc0f613d3a0f8fb
https://github.com/wesnoth/wesnoth/commit/d03b9beb6a3988e369ccd2e45cc0f613d3a0f8fb
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/game.cpp
Log Message:
-----------
Replace SDL_putenv with SDL_setenv for SDL2.
SDL_putenv no longer exists in SDL2, and SDL_setenv has been added as
its replacement.
Commit: 857bf5a64a03b9e15bca374048e60509d5ab6bed
https://github.com/wesnoth/wesnoth/commit/857bf5a64a03b9e15bca374048e60509d5ab6bed
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-02 (Sun, 02 Mar 2014)
Changed paths:
M src/tests/gui/test_save_dialog.cpp
M src/tests/utils/fake_event_source.cpp
M src/tests/utils/fake_event_source.hpp
M src/tests/utils/play_scenario.cpp
M src/tests/utils/play_scenario.hpp
Log Message:
-----------
Disable several unit tests for SDL2.
The code will change enough to invalidate the tests, so don't bother to
get them working now.
With this commit Wesnoth compiles with SDL2 as long as strict
compilation is disabled. Running Wesnoth does not work at the moment.
Commit: 006ba9f5c89006e2a63e5df4c61e28413e874477
https://github.com/wesnoth/wesnoth/commit/006ba9f5c89006e2a63e5df4c61e28413e874477
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2014-03-07 (Fri, 07 Mar 2014)
Changed paths:
M Doxyfile
M changelog
M players_changelog
M src/wesconfig.h
Log Message:
-----------
bump version numbers of master to 1.12.0+dev
1.12 branch is split off, so the new name is somehow valid...
Commit: 13308d887e5a2bf80e8ad6aafefaf039694f01f7
https://github.com/wesnoth/wesnoth/commit/13308d887e5a2bf80e8ad6aafefaf039694f01f7
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-07 (Fri, 07 Mar 2014)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/about.cpp
M src/attack_prediction_display.cpp
M src/controller_base.cpp
M src/editor/palette/tristate_button.cpp
M src/events.cpp
M src/font.cpp
M src/font.hpp
M src/game.cpp
M src/game_controller.cpp
M src/gui/auxiliary/event/dispatcher.hpp
M src/gui/auxiliary/event/handler.cpp
M src/gui/dialogs/lobby_main.cpp
M src/gui/dialogs/title_screen.cpp
M src/hotkey/hotkey_item.cpp
M src/hotkey/hotkey_preferences_display.cpp
M src/image_modifications.cpp
M src/key.cpp
M src/key.hpp
M src/loadscreen.cpp
M src/map_label.cpp
M src/preferences_display.cpp
A src/sdl/alpha.cpp
A src/sdl/alpha.hpp
A src/sdl/compat.hpp
M src/sdl_utils.cpp
M src/sdl_utils.hpp
M src/tests/gui/test_save_dialog.cpp
M src/tests/test_image_modifications.cpp
M src/tests/utils/fake_event_source.cpp
M src/tests/utils/fake_event_source.hpp
M src/tests/utils/play_scenario.cpp
M src/tests/utils/play_scenario.hpp
M src/video.cpp
M src/video.hpp
M src/widgets/textbox.cpp
Log Message:
-----------
Merge branch 'SDL2_compilation_fixes'
This branch makes it possible to compile Wesnoth using SDL2. Running the
resulting binary will not work however, that will be worked upon later.
Note compilation with strict compilation fails and will for the near
future since some struct members changed signedness.
Commit: 8b6c921ea5bfaff76fc39ed9ff26078b5292bc7f
https://github.com/wesnoth/wesnoth/commit/8b6c921ea5bfaff76fc39ed9ff26078b5292bc7f
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-07 (Fri, 07 Mar 2014)
Changed paths:
M Doxyfile
M changelog
M players_changelog
M src/wesconfig.h
Log Message:
-----------
Bump version to 1.13.0-dev
The version between 1.12.0 and 1.12.1 is 1.12.0+dev, and 1.12.0 hasn't
happened yet.
Commit: 2147bb3c54f9390de79fa19657874701585fa029
https://github.com/wesnoth/wesnoth/commit/2147bb3c54f9390de79fa19657874701585fa029
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-07 (Fri, 07 Mar 2014)
Changed paths:
M changelog
M src/image_modifications.cpp
Log Message:
-----------
Use blit_surface() instead of SDL_BlitSurface() in the ~BG() implementation
For some reason, ~BG() used SDL_BlitSurface() directly instead of using
the alternate blit_surface() implementation, unlike every other image
path function type in existence that needs to do blitting.
This works the first time when scaling or cropping an image (say,
"misc/blank-hex.png~BG()~CROP(0,0,34,34)"), but the second time it's
used with different scaling/cropping parameters, it yields the result it
would without ~BG() in the pipeline. This is somehow remedied by this
change, and I don't see any potential issues arising from it anyway
(save for a negligible performance impact on ~BG(), maybe).
Commit: 778955501ae409d11a6c2dcfe34124c28f4c263a
https://github.com/wesnoth/wesnoth/commit/778955501ae409d11a6c2dcfe34124c28f4c263a
Author: mattsc <mattsc000 at gmail.com>
Date: 2014-03-07 (Fri, 07 Mar 2014)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Update OS X user data directory to Library/Application\ Support/Wesnoth_1.13
Commit: 690fb03aac04d72e44842c9569e99fbd904a2df1
https://github.com/wesnoth/wesnoth/commit/690fb03aac04d72e44842c9569e99fbd904a2df1
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
Fix using an uninitialised value.
While using valgrind to investigate bug #20876 it warned about this
issue.
Ported from a6eeac04e5dc863013fa3e5e0b723825ddc4fc08
Commit: e65120075ea292252a016bb19027bfb8ea1d39cc
https://github.com/wesnoth/wesnoth/commit/e65120075ea292252a016bb19027bfb8ea1d39cc
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M src/image_modifications.cpp
Log Message:
-----------
Make sure cut_surface gets a neutral surface.
Also change its return to an optimised surface. Fixes bug #20876.
>From the comment added to the source:
Unlike other image functions cut_surface does not convert the input
surface to a neutral surface, nor does it convert its return surface
to an optimised surface.
Since it seems to work for most cases, rather change this caller instead
of the function signature. (The issue was discovered in bug #20876).
Commit: 65a97dc5255a32184c7a4db836ffdb17d1157bca
https://github.com/wesnoth/wesnoth/commit/65a97dc5255a32184c7a4db836ffdb17d1157bca
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M changelog
Log Message:
-----------
Update changelog.
Commit: 2ab7d78cdfa696382b8ecf9b8aae45773b38417a
https://github.com/wesnoth/wesnoth/commit/2ab7d78cdfa696382b8ecf9b8aae45773b38417a
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M src/filesystem.cpp
M src/game.cpp
M src/game_config.cpp
M src/language.cpp
M src/network_worker.cpp
M src/serialization/string_utils.cpp
M src/video.cpp
M src/widgets/file_menu.cpp
Log Message:
-----------
Remove AmigaOS support.
It is unknown whether the platform still works with the current Wesnoth
code. To ease the SDL 2.0 transition support is removed. If a maintainer
steps up support can be added again.
Commit: 11001bc8dda8b17636a8386f0fa983759574a95b
https://github.com/wesnoth/wesnoth/commit/11001bc8dda8b17636a8386f0fa983759574a95b
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M src/clipboard.cpp
M src/filesystem.cpp
M src/language.cpp
M src/network.cpp
M src/network_ana.cpp
M src/network_worker.cpp
M src/thread.cpp
Log Message:
-----------
Remove BeOS support.
It is unknown whether the platform still works with the current Wesnoth
code. To ease the SDL 2.0 transition support is removed. If a maintaine
steps up support can be added again.
Commit: 8a0c80d83f8d53165ac56aa06b1eeed17e3ed92a
https://github.com/wesnoth/wesnoth/commit/8a0c80d83f8d53165ac56aa06b1eeed17e3ed92a
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M src/game.cpp
Log Message:
-----------
Remove OS/2 support.
It is unknown whether the platform still works with the current Wesnoth
code. To ease the SDL 2.0 transition support is removed. If a maintainer
steps up support can be added again.
Commit: 63488838b2c5acc4a381d35b3b061dd0eb44a3ea
https://github.com/wesnoth/wesnoth/commit/63488838b2c5acc4a381d35b3b061dd0eb44a3ea
Author: anonymissimus <anonymissimus at arcor.de>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
cb project update (sdl2 files)
Commit: 824896679ca1345d7d34a6090e3092b2dfb37029
https://github.com/wesnoth/wesnoth/commit/824896679ca1345d7d34a6090e3092b2dfb37029
Author: anonymissimus <anonymissimus at arcor.de>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M projectfiles/VC9/wesnoth.vcproj
Log Message:
-----------
vc project update (maintenance, cherry-pick from 1.12)
Commit: a701caa36e9ca785375f474404f15163e35d0641
https://github.com/wesnoth/wesnoth/commit/a701caa36e9ca785375f474404f15163e35d0641
Author: anonymissimus <anonymissimus at arcor.de>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M projectfiles/VC9/wesnoth.vcproj
Log Message:
-----------
vc project update (sdl2 files)
Commit: c84782713c62a8298d81fcdddbb8fe26ced61313
https://github.com/wesnoth/wesnoth/commit/c84782713c62a8298d81fcdddbb8fe26ced61313
Author: Chusslove Illich (Часлав Илић) <caslav.ilic at gmx.net>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M l10n-track
Log Message:
-----------
Unfuzzied images fuzzied due to conversion and optimization.
Commit: cb4c16749b940a0c59c97e7e93dbc53bd7fc67bd
https://github.com/wesnoth/wesnoth/commit/cb4c16749b940a0c59c97e7e93dbc53bd7fc67bd
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M changelog
M src/clipboard.cpp
M src/filesystem.cpp
M src/game.cpp
M src/game_config.cpp
M src/language.cpp
M src/network.cpp
M src/network_ana.cpp
M src/network_worker.cpp
M src/serialization/string_utils.cpp
M src/thread.cpp
M src/video.cpp
M src/widgets/file_menu.cpp
Log Message:
-----------
Merge branch 'remove_old_platforms'
Removes support to ease the transition to SDL2.
Commit: ff3588c99b7c422614fa3c44fd1a0d51ee293177
https://github.com/wesnoth/wesnoth/commit/ff3588c99b7c422614fa3c44fd1a0d51ee293177
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
A src/sdl/window.cpp
A src/sdl/window.hpp
M src/video.cpp
Log Message:
-----------
Add the initial SDL_Window wrapper code.
With this wrapper in place, Wesnoth shows a main window, all black and a
lot of errors on the console.
Commit: 7b6c125ffdbb3c1f64ca40ca7cbfd446b2c28c2c
https://github.com/wesnoth/wesnoth/commit/7b6c125ffdbb3c1f64ca40ca7cbfd446b2c28c2c
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M SConstruct
M scons/sdl.py
Log Message:
-----------
Add an sdl2 option to SCons.
It allows building Wesnoth with SDL2. False by default. The SDL2 versions of
SDL_image, SDL_mixer, SDL_net and SDL_ttf are required, too.
Commit: b474ebace4f80677abcfb3618368ebb40596ecad
https://github.com/wesnoth/wesnoth/commit/b474ebace4f80677abcfb3618368ebb40596ecad
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M src/.gitignore
Log Message:
-----------
Add libwesnoth-sdl.a to .gitignore.
Commit: 4c6cad1327c18a63632d2a7aa5ca86e1386a6bd5
https://github.com/wesnoth/wesnoth/commit/4c6cad1327c18a63632d2a7aa5ca86e1386a6bd5
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/about.cpp
Log Message:
-----------
Don't use uninitialized data member for variable initialization.
Fixes an MSVC warning. Spotted by Anonymissimus.
Commit: 26aad8b7abe45158eefa0a15270073d2a50b5207
https://github.com/wesnoth/wesnoth/commit/26aad8b7abe45158eefa0a15270073d2a50b5207
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/sdl/window.cpp
M src/sdl/window.hpp
M src/video.cpp
Log Message:
-----------
Implement rendering with SDL 2.
The game now starts and can be played. There are a lot of visual
glitches, but visual it is playable.
The text input is completely broken, due to the changes in the
SDL 2 API and the band-aid compile fixes.
Commit: 632710bdadec31728ef675213c8e5405a3c944a0
https://github.com/wesnoth/wesnoth/commit/632710bdadec31728ef675213c8e5405a3c944a0
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/game_controller.cpp
Log Message:
-----------
Move window caption initialisation code.
The code is moved from game_controller::init_language to
game_controller::init_video. This makes porting the code to SDL 2
easier. In SDL 2 the caption must be set after the main window exists.
It could be set in the constructor of the Window, but that can be done
once we drop SDL 1.2 support.
Commit: 7a0873f0aabd17601c93fd888835728b7944eba6
https://github.com/wesnoth/wesnoth/commit/7a0873f0aabd17601c93fd888835728b7944eba6
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/sdl/window.cpp
M src/sdl/window.hpp
M src/video.cpp
Log Message:
-----------
Show the window caption with SDL 2.
Commit: 546ba048c2a7552fa745add77a6ec093018dd390
https://github.com/wesnoth/wesnoth/commit/546ba048c2a7552fa745add77a6ec093018dd390
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/game_controller.cpp
M src/sdl/window.cpp
M src/sdl/window.hpp
M src/video.cpp
Log Message:
-----------
Show the window icon with SDL 2.
Commit: 6817aa33b762e5bce635a8d3e12c37272acda32b
https://github.com/wesnoth/wesnoth/commit/6817aa33b762e5bce635a8d3e12c37272acda32b
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/video.cpp
Log Message:
-----------
Let CVideo::window_state use main_window.
Commit: 385885fea0a09ecc7638c2e1345c36f73733639e
https://github.com/wesnoth/wesnoth/commit/385885fea0a09ecc7638c2e1345c36f73733639e
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/video.cpp
Log Message:
-----------
Rename main_window to window.
With the last commit the duplicate variable name window is gone, so
rename the main_window to the preferred name window.
Commit: 9de59be3a7d58d366bfabeb161897cfd71fbb378
https://github.com/wesnoth/wesnoth/commit/9de59be3a7d58d366bfabeb161897cfd71fbb378
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/video.hpp
Log Message:
-----------
Update the Doxygen comments.
Commit: eb27fcc489273424b1fe44f476b9e555750aacdb
https://github.com/wesnoth/wesnoth/commit/eb27fcc489273424b1fe44f476b9e555750aacdb
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/game_controller.cpp
A src/sdl/window.cpp
A src/sdl/window.hpp
M src/video.cpp
M src/video.hpp
Log Message:
-----------
Merge branch 'SDL_Window'
Add a wrapper for the SDL_Window. This merge makes Wesnoth 'playable'
with SDL2. It still has a lot of glitches and bugs to be solved.
Commit: f909a9310771114017d3127d197035732e2d90e5
https://github.com/wesnoth/wesnoth/commit/f909a9310771114017d3127d197035732e2d90e5
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/SConscript
Log Message:
-----------
Fix linking order in SCons.
Commit: 5d0c8e581f5e1063762ee19af8f9b35b2bce9fa1
https://github.com/wesnoth/wesnoth/commit/5d0c8e581f5e1063762ee19af8f9b35b2bce9fa1
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/sdl/window.cpp
Log Message:
-----------
Add missing spaces in text output.
Commit: 7f5006ed45adec6d55bbe1cf208c7653af6f7403
https://github.com/wesnoth/wesnoth/commit/7f5006ed45adec6d55bbe1cf208c7653af6f7403
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths:
M src/sdl/window.cpp
Log Message:
-----------
Include the proper header.
Don't use a header that indirectly includes the wanted header. The bug
was caused by some early development testing code.
Commit: b6ce79e634ca1f7336b1869aabe4c4694063fd0b
https://github.com/wesnoth/wesnoth/commit/b6ce79e634ca1f7336b1869aabe4c4694063fd0b
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-10 (Mon, 10 Mar 2014)
Changed paths:
M utils/mp-server/update_server
Log Message:
-----------
update_server: The 1.12 branch now exists
Commit: 426721f03f46b9a74387498df065ba1d1687e65e
https://github.com/wesnoth/wesnoth/commit/426721f03f46b9a74387498df065ba1d1687e65e
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)
Changed paths:
M src/tests/test_unit_map.cpp
M src/unit.cpp
Log Message:
-----------
repair unit_map unit tests
in an earlier commit these tests were disabled because they were segfaulting
and blocking the test suite from running. the cause was obscure: the tests
were based on making a dummy unit type and inserting / reinserting it
into the unit_map. however, it turns out that in the current code, a freshly
constructed unit_type is not safe to be used to construct a unit. the reason
is that then it does not have any genders defined, so when the unit is built
it will not find any genders and fail with segfault, or even more bizarrely,
a division by zero error. i found that even running with gdb did not give
an actual line number, and simply said that the failure occurred in the
unit constructor, a function whose initalizer list spans several pages.
the correct fix is to invoke "unit_types.build_unit_type" on the unit type
before using it. this permits the unit tests to run.
additionally i added an assert to the generate_genders function in unit.cpp,
which surely should have been there in the first place.
Commit: ae0265fabf9574b36c0de024eda78f5d6fc05367
https://github.com/wesnoth/wesnoth/commit/ae0265fabf9574b36c0de024eda78f5d6fc05367
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)
Changed paths:
M utils/mp-server/update_server
Log Message:
-----------
Merge branch 'master' of https://github.com/wesnoth/wesnoth
Commit: f9bf98293b2b01919ae4776a7f41571a4d126fa8
https://github.com/wesnoth/wesnoth/commit/f9bf98293b2b01919ae4776a7f41571a4d126fa8
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)
Changed paths:
M utils/mp-server/update_server
Log Message:
-----------
Merge branch 'master' of https://github.com/wesnoth/wesnoth
Commit: 6e6766663cd51e658097876826b4fdb57f5e69d6
https://github.com/wesnoth/wesnoth/commit/6e6766663cd51e658097876826b4fdb57f5e69d6
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)
Changed paths:
M src/tests/test_unit_map.cpp
Log Message:
-----------
fix whitespace
Commit: ba8d643a3c02f1dbfdfd7fc1e16d8a0287989d33
https://github.com/wesnoth/wesnoth/commit/ba8d643a3c02f1dbfdfd7fc1e16d8a0287989d33
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)
Log Message:
-----------
Merge branch 'master' of https://github.com/wesnoth/wesnoth
Commit: 9fc587d56d200fe38d44bc62d28e71c741fc066e
https://github.com/wesnoth/wesnoth/commit/9fc587d56d200fe38d44bc62d28e71c741fc066e
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-12 (Wed, 12 Mar 2014)
Changed paths:
M src/serialization/preprocessor.cpp
Log Message:
-----------
preprocessor: Capitalize first word of two error messages
Like all WML preprocessor diagnostics, these aren't translatable
strings, so this is a valid candidate for 1.12.
Commit: 21a1937a5f1f787f70ebdb15d73e73c3c8974a7a
https://github.com/wesnoth/wesnoth/commit/21a1937a5f1f787f70ebdb15d73e73c3c8974a7a
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-12 (Wed, 12 Mar 2014)
Changed paths:
M src/serialization/preprocessor.cpp
Log Message:
-----------
preprocessor: 'any argument' -> 'any arguments'
Like all WML preprocessor diagnostics, these aren't translatable
strings, so this is a valid candidate for 1.12.
Commit: 25483d40244d089892aa9bf856c18d5196453d17
https://github.com/wesnoth/wesnoth/commit/25483d40244d089892aa9bf856c18d5196453d17
Author: fendrin <fabianmueller5 at gmx.de>
Date: 2014-03-12 (Wed, 12 Mar 2014)
Changed paths:
A data/campaigns/Legend_of_Wesmere/images/units/monsters/great-ogre.png
A data/campaigns/Legend_of_Wesmere/units/Great_Ogre.cfg
Log Message:
-----------
Great Ogre unit for use in LoW.
Commit: 8e12b18891d683d756d6f668f703ec3f7d0e2cdb
https://github.com/wesnoth/wesnoth/commit/8e12b18891d683d756d6f668f703ec3f7d0e2cdb
Author: fendrin <fabianmueller5 at gmx.de>
Date: 2014-03-12 (Wed, 12 Mar 2014)
Changed paths:
A data/core/editor/help.cfg
Log Message:
-----------
First topic of an editor help section.
Commit: b9b199f4f19a414813c28db68e903b9bb5306101
https://github.com/wesnoth/wesnoth/commit/b9b199f4f19a414813c28db68e903b9bb5306101
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M data/gui/default/window/message.cfg
Log Message:
-----------
gui2/tmessage: Add missing standard padding around image cell
Commit: 037ec6af8b307c20de860d670744deab309f7b23
https://github.com/wesnoth/wesnoth/commit/037ec6af8b307c20de860d670744deab309f7b23
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M data/gui/default/window/transient_message.cfg
Log Message:
-----------
gui2/ttransient_message: Add missing standard padding around image cell
Commit: 4968a4b242e05952416cd0b425823081d43a7ce9
https://github.com/wesnoth/wesnoth/commit/4968a4b242e05952416cd0b425823081d43a7ce9
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M src/gui/dialogs/transient_message.cpp
M src/gui/dialogs/transient_message.hpp
Log Message:
-----------
gui2/ttransient_message: Hide title and image widgets when unused
When the title or image widget labels are left empty, the widgets
continue to take up space in the grid, which is particularly conspicuous
with our current border,border_size=all,5 convention.
Commit 037ec6af8b307c20de860d670744deab309f7b23 exposes the underlying
problem quite clearly in most dialogs because the image widget's cell
takes up extra space to the left of the dialog while empty -- see the
Objectives popup for an example.
Hiding the relevant widgets when missing label values is trivial to do,
even if it requires additional boilerplate in the
gui2::ttransient_message case (no existing pre_show() method override),
so it should be a good solution as any until cell borders gain the
ability to become null when the contained widget is otherwise unused.
NOTE: I had to move the inclusion of gettext.hpp around a bit in order
to avoid name collisions with Boost headers introduced along with the
two new GUI2 inclusions in transient_message.cpp. The _ gettext
shorthand macro is truly a PITA to have near some of the most
complicated Boost libraries.
Commit: 849878612133880d356157dedb5eba00bb9694b7
https://github.com/wesnoth/wesnoth/commit/849878612133880d356157dedb5eba00bb9694b7
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M src/gui/dialogs/message.cpp
Log Message:
-----------
gui2/tmessage: Hide title and image widgets when unused
When the title or image widget labels are left empty, the widgets
continue to take up space in the grid, which is particularly conspicuous
with our current border,border_size=all,5 convention.
Commit b9b199f4f19a414813c28db68e903b9bb5306101 exposes the underlying
problem quite clearly in most dialogs because the image widget's cell
takes up extra space to the left of the dialog while empty -- see the
"you have not started your turn yet, do you really want to end your
turn" prompt for an example.
Hiding the relevant widgets when missing label values is trivial to do.
In the gui2::tmessage case it required a minor internal refactoring to
keep a find_widget<>() reference around for a second method call for
each widget. This should be a good solution as any until cell borders
gain the ability to become null when the contained widget is otherwise
unused.
Commit: da7a03a83304d3c2272e8a2a7f55d2f6a9e066c0
https://github.com/wesnoth/wesnoth/commit/da7a03a83304d3c2272e8a2a7f55d2f6a9e066c0
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M po/wesnoth-dw/sk.po
M po/wesnoth-help/sk.po
Log Message:
-----------
updated Slovak translation
Commit: 175ae9c899cf0cbaa4f2d9dc747188136633eda2
https://github.com/wesnoth/wesnoth/commit/175ae9c899cf0cbaa4f2d9dc747188136633eda2
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M po/wesnoth-dw/de.po
Log Message:
-----------
updated German translation
Commit: 821b009948d40bed844a8a3e2f3d174e4c24bf7c
https://github.com/wesnoth/wesnoth/commit/821b009948d40bed844a8a3e2f3d174e4c24bf7c
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/controller_base.cpp
M src/mouse_handler_base.cpp
M src/mouse_handler_base.hpp
Log Message:
-----------
Support SDL2's mouse wheel event in mouse_handler_base.
Allows to scroll the map with the wheel.
Commit: 2d54ec7acadd69716aaed3044860111611518fab
https://github.com/wesnoth/wesnoth/commit/2d54ec7acadd69716aaed3044860111611518fab
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/mouse_handler_base.cpp
Log Message:
-----------
Wrap old SDL code in a preproc directive.
Commit: ec2af1d30d7338b5d799d9662e483bee3dd283ee
https://github.com/wesnoth/wesnoth/commit/ec2af1d30d7338b5d799d9662e483bee3dd283ee
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/widgets/slider.cpp
M src/widgets/slider.hpp
Log Message:
-----------
Support for SDL2's mouse wheel event in the GUI1 slider.
Commit: 60945558a98c0bc180177727af0b583d11e1944a
https://github.com/wesnoth/wesnoth/commit/60945558a98c0bc180177727af0b583d11e1944a
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/widgets/slider.cpp
Log Message:
-----------
Wrap old SDL code in a preproc directive.
Commit: 85e8c45273000dca61fb90b7a21d7e40e86e3801
https://github.com/wesnoth/wesnoth/commit/85e8c45273000dca61fb90b7a21d7e40e86e3801
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/widgets/scrollarea.cpp
Log Message:
-----------
Support for SDL2's mouse wheel event in the GUI1 scrollarea.
Commit: 5e96c47d2e25414d0f2a182791ff049dd9393f7f
https://github.com/wesnoth/wesnoth/commit/5e96c47d2e25414d0f2a182791ff049dd9393f7f
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/widgets/scrollbar.cpp
Log Message:
-----------
Support for SDL2's mouse wheel event in the GUI1 scrollbar.
Commit: 133218ff7b0ae6d3da54d0363dfb892f006245c6
https://github.com/wesnoth/wesnoth/commit/133218ff7b0ae6d3da54d0363dfb892f006245c6
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/widgets/scrollbar.cpp
Log Message:
-----------
Wrap old SDL code in a preproc directive.
Commit: ea3bd5655500a7e3bf63499b6a892f99906ac871
https://github.com/wesnoth/wesnoth/commit/ea3bd5655500a7e3bf63499b6a892f99906ac871
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/mouse_handler_base.cpp
Log Message:
-----------
Switch vertical scrolling directions.
Commit: 8556d7a24ec5b7ca6388b3dcfc260a488daa1d3b
https://github.com/wesnoth/wesnoth/commit/8556d7a24ec5b7ca6388b3dcfc260a488daa1d3b
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/editor/palette/palette_manager.cpp
Log Message:
-----------
Support for SDL2's mousw wheel event in the palette manager.
Commit: 331813707771aa0b31d4bdaee07189d469598c82
https://github.com/wesnoth/wesnoth/commit/331813707771aa0b31d4bdaee07189d469598c82
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/editor/palette/palette_manager.cpp
Log Message:
-----------
Wrap old SDL code in a preproc directive.
Commit: d26ac31b288ee60b5721a16671819396921f67b8
https://github.com/wesnoth/wesnoth/commit/d26ac31b288ee60b5721a16671819396921f67b8
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/editor/palette/palette_manager.cpp
Log Message:
-----------
Make a constant variable a reference.
Commit: 8c3c1dfb5cccd6ad625d7295957ca9524e0ab186
https://github.com/wesnoth/wesnoth/commit/8c3c1dfb5cccd6ad625d7295957ca9524e0ab186
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/gui/auxiliary/event/handler.cpp
Log Message:
-----------
Support for SDL2's mouse wheel event in GUI2.
Commit: 37c71008fe4f499967462e66d745466faec5066d
https://github.com/wesnoth/wesnoth/commit/37c71008fe4f499967462e66d745466faec5066d
Author: Boldizsár Lipka <lipkab at zoho.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M src/gui/auxiliary/event/handler.cpp
Log Message:
-----------
Wrap old SDL code in a preproc directive.
Commit: faaad1991b4e0e22043d091a5e5ea0a5694bb5a8
https://github.com/wesnoth/wesnoth/commit/faaad1991b4e0e22043d091a5e5ea0a5694bb5a8
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M src/sound.cpp
Log Message:
-----------
sound: Include SDL_Mixer channel layout in debug output
Commit: 0763670a3f50eb7f490fe1b34beb53e4652cc273
https://github.com/wesnoth/wesnoth/commit/0763670a3f50eb7f490fe1b34beb53e4652cc273
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M changelog
M src/sound.cpp
Log Message:
-----------
sound: Increase the mixer channel allocation from 16 to 32
This raises the sound effect (SOUND_FX) channel group size from 5 to
21.
The rationale for this change is that the current SFX channel group size
is not enough in some situations (particularly during cutscenes and with
accelerated animations enabled), and decreasing the channel group size
for sound sources (currently 8, preserved as-is in this commit) doesn't
seem like the best solution at this point considering that the sound
source feature is neglected enough as it is. Three other channels are
reserved for the turn bell, turn timer countdown sound, and UI sounds,
and it'd be an even worse idea to drop those.
The SDL_mixer documentation suggests that increased mixer channel
allocations may be a memory usage concern with a high number of channels
("We're talking REALLY high!", their words), but hopefully this small
increase is good enough for our and the UMC making community's purposes
without impacting memory usage or performance on our main supported
platforms. At least Wesnoth's RSS didn't seem to change over a megabyte
when testing this patch on Linux (using ALSA).
Note:
Should this increased limit cause issues on some platform that matters
(hopefully not!) an alternative would be to reengineer the sound channel
selection done in sound::play_sound_internal() so instead of skipping
sounds when all channels are busy, the oldest playing channel is stopped
and reset to the requested sound, for channels in the SOUND_FX group.
However, this seems too complicated to do at this point for 1.12, so yet
another alternative would be to simply reduce the number of channels
reserved for sound sources and give those back to SOUND_FX.
Commit: dc9a2c89e4cf514cf0b2874ec94c980f644c7b0f
https://github.com/wesnoth/wesnoth/commit/dc9a2c89e4cf514cf0b2874ec94c980f644c7b0f
Author: fendrin <fabianmueller5 at gmx.de>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M src/widgets/button.cpp
M src/widgets/button.hpp
Log Message:
-----------
Adds the option to use a suffix to the image paths.
Implemented for using image path functions.
A second change fixes size problems with image type buttons.
Commit: 1e5d58af6a5143f37cd1768f4967bac5b075ccaa
https://github.com/wesnoth/wesnoth/commit/1e5d58af6a5143f37cd1768f4967bac5b075ccaa
Author: fendrin <fabianmueller5 at gmx.de>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M changelog
M data/core/team-colors.cfg
M data/game_config.cfg
A images/buttons/misc/orb-pressed.png
A images/buttons/misc/orb.png
M players_changelog
M src/display.cpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_preferences_display.cpp
M src/minimap.cpp
M src/preferences.cpp
M src/preferences.hpp
M src/unit.cpp
Log Message:
-----------
Made the orb and minimap colors configurable by the preferences.
Commit: c565f92af248842b22d3ad3705ba333d163d6923
https://github.com/wesnoth/wesnoth/commit/c565f92af248842b22d3ad3705ba333d163d6923
Author: fendrin <fabianmueller5 at gmx.de>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
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/masks/07_Elves_Last_Stand.mask
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
Log Message:
-----------
LoW 07: Made the map bigger, adjusted starting positions and more.
* Got a bigger map
* The third former ally is now cotrolled by the player(s)
* Removed the annoying bird sounds
* Introduced an unallied monster side to the south
* Removed the early appearance of Olurf, he will arrive always at end
* Some fixes to the mp port, may still not work properly
Commit: e0186e9f69244096b704b45553b1bb830aae335f
https://github.com/wesnoth/wesnoth/commit/e0186e9f69244096b704b45553b1bb830aae335f
Author: fendrin <fabianmueller5 at gmx.de>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M src/map.cpp
Log Message:
-----------
No longer write the map_data header anymore.
Like discussed at the FOSDEM, those embedded WML attributes are not used
anymore.
Commit: 16f08c46d277304283269ec0613df234eca22905
https://github.com/wesnoth/wesnoth/commit/16f08c46d277304283269ec0613df234eca22905
Author: fendrin <fabianmueller5 at gmx.de>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M data/campaigns/Legend_of_Wesmere/maps/Kalian.map
Log Message:
-----------
Removed obsolete map header.
Commit: 835977c437062575cd5fe4ade4005ff658134900
https://github.com/wesnoth/wesnoth/commit/835977c437062575cd5fe4ade4005ff658134900
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M src/game_preferences_display.cpp
Log Message:
-----------
Remove an old-style-cast.
Commit: 093f19ff9ec7ab04f84b3e9ba88a54dde1f91097
https://github.com/wesnoth/wesnoth/commit/093f19ff9ec7ab04f84b3e9ba88a54dde1f91097
Author: Mark de Wever <koraq at xs4all.nl>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M src/game_preferences_display.cpp
Log Message:
-----------
Remove the usage of the non-standard u_int.
Commit: a52b3846f2c3041dfec9be5e2bbd1a9aa0f7a7cf
https://github.com/wesnoth/wesnoth/commit/a52b3846f2c3041dfec9be5e2bbd1a9aa0f7a7cf
Author: anonymissimus <anonymissimus at arcor.de>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M src/about.cpp
Log Message:
-----------
really fix warning about not initialized variable
The invalid read now was on some later line.
fixes https://gna.org/bugs/index.php?21772
Anyway better to init something incorrectly than to not init it.
Commit: e45894c17b19fce61f1a5368993d3421694a246c
https://github.com/wesnoth/wesnoth/commit/e45894c17b19fce61f1a5368993d3421694a246c
Author: anonymissimus <anonymissimus at arcor.de>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M projectfiles/VC9/wesnoth.vcproj
Log Message:
-----------
vc project update
Commit: f5323b627ccba1aef79d2d8c04580c106aa6ebd4
https://github.com/wesnoth/wesnoth/commit/f5323b627ccba1aef79d2d8c04580c106aa6ebd4
Author: David Mikos <infiniteloopcounter at gmail.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M changelog
M data/core/units/khalifate/Arif.cfg
M data/core/units/khalifate/Batal.cfg
M data/core/units/khalifate/Elder_Falcon.cfg
M data/core/units/khalifate/Falcon.cfg
M data/core/units/khalifate/Ghazi.cfg
M data/core/units/khalifate/Hakim.cfg
M data/core/units/khalifate/Jundi.cfg
M data/core/units/khalifate/Khalid.cfg
M data/core/units/khalifate/Mighwar.cfg
M data/core/units/khalifate/Monawish.cfg
M data/core/units/khalifate/Mudafi.cfg
M data/core/units/khalifate/Muharib.cfg
M data/core/units/khalifate/Naffat.cfg
M data/core/units/khalifate/Qatif-al-nar.cfg
M data/core/units/khalifate/Rasikh.cfg
M data/core/units/khalifate/Shuja.cfg
M data/core/units/khalifate/Tabib.cfg
M data/core/units/khalifate/Tineen.cfg
Log Message:
-----------
Khalifate melee attack sound timings fix.
Commit: af383e8ebb01094f47ec4712db47ea31adf8fc22
https://github.com/wesnoth/wesnoth/commit/af383e8ebb01094f47ec4712db47ea31adf8fc22
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M src/multiplayer_connect_engine.cpp
Log Message:
-----------
workaround for bug #21797
when the side engine in multiplayer_connect_engine.cpp loads a side,
if the game is a save game, the side is not allowed to have a human
player, and it is listed as "network", then we set it to ai,
assuming that it "should" be a "network_ai" if bug #18829 is ever
fixed
Commit: db153ed19c533f7bd05c858df9035cb7e934f5c8
https://github.com/wesnoth/wesnoth/commit/db153ed19c533f7bd05c858df9035cb7e934f5c8
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M src/playmp_controller.cpp
Log Message:
-----------
blindfold_enabled => skip_replay enabled, in playmp_controller
this was suggested by Wintermute, as it is hard to see why you
wouldn't want the replays to go fast if you can't see anything.
Commit: ce06371a99888f4e99451bd12d57f0deb6be42bd
https://github.com/wesnoth/wesnoth/commit/ce06371a99888f4e99451bd12d57f0deb6be42bd
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M changelog
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/masks/07_Elves_Last_Stand.mask
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/core/team-colors.cfg
M data/core/units/khalifate/Arif.cfg
M data/core/units/khalifate/Batal.cfg
M data/core/units/khalifate/Elder_Falcon.cfg
M data/core/units/khalifate/Falcon.cfg
M data/core/units/khalifate/Ghazi.cfg
M data/core/units/khalifate/Hakim.cfg
M data/core/units/khalifate/Jundi.cfg
M data/core/units/khalifate/Khalid.cfg
M data/core/units/khalifate/Mighwar.cfg
M data/core/units/khalifate/Monawish.cfg
M data/core/units/khalifate/Mudafi.cfg
M data/core/units/khalifate/Muharib.cfg
M data/core/units/khalifate/Naffat.cfg
M data/core/units/khalifate/Qatif-al-nar.cfg
M data/core/units/khalifate/Rasikh.cfg
M data/core/units/khalifate/Shuja.cfg
M data/core/units/khalifate/Tabib.cfg
M data/core/units/khalifate/Tineen.cfg
M data/game_config.cfg
A images/buttons/misc/orb-pressed.png
A images/buttons/misc/orb.png
M players_changelog
M projectfiles/VC9/wesnoth.vcproj
M src/about.cpp
M src/display.cpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_preferences_display.cpp
M src/map.cpp
M src/minimap.cpp
M src/preferences.cpp
M src/preferences.hpp
M src/unit.cpp
M src/widgets/button.cpp
M src/widgets/button.hpp
Log Message:
-----------
Merge branch 'master' of https://github.com/wesnoth/wesnoth
Commit: 420f9e806973a37299b3e5a86bf81d3c001b92e9
https://github.com/wesnoth/wesnoth/commit/420f9e806973a37299b3e5a86bf81d3c001b92e9
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M src/playturn.cpp
Log Message:
-----------
recognize server messages to set a side to idle
Commit: 186e66cec6519606bca5e07209c9a557c78b5e71
https://github.com/wesnoth/wesnoth/commit/186e66cec6519606bca5e07209c9a557c78b5e71
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M changelog
M src/flg_manager.cpp
M src/flg_manager.hpp
M src/multiplayer_connect_engine.cpp
M src/multiplayer_connect_engine.hpp
M src/team.cpp
M src/team.hpp
Log Message:
-----------
fix bug #21758
in the refactor of mp_connect, one behavior from 1.10 that was
lost was that the host may not start a game until all sides have
chosen faction. we restore this, adding fields to the side engine
to fix in a robust manner, some debugging capabilities left over.
Commit: 886c2390d8a9ea60c48eb2c0221a96b42816bb18
https://github.com/wesnoth/wesnoth/commit/886c2390d8a9ea60c48eb2c0221a96b42816bb18
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M src/multiplayer_connect.cpp
M src/multiplayer_connect_engine.cpp
Log Message:
-----------
fixup party full bell
after fix of bug #21578, the behavior from 1.10, in which game may not
start until all sides have chosen factions as needed, was restored.
we move the party full bell appropriately.
Commit: 736ceaa6c7e81882c9c5b2e932307b1f1ecb3bfd
https://github.com/wesnoth/wesnoth/commit/736ceaa6c7e81882c9c5b2e932307b1f1ecb3bfd
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M changelog
M src/multiplayer.cpp
M src/playcampaign.cpp
M src/playcampaign.hpp
M src/playturn.cpp
M src/server/game.cpp
Log Message:
-----------
fix bug #18829
it turns out that when the "network_ai" controller type was introduced,
it was implemented on the server in the following way:
https://github.com/wesnoth/wesnoth/blob/a4f47a63c7b2c55fd7d8d3cd425ede256b39acdd/src/server/game.cpp#L464
change_controller requests to the type "ai" are always transformed
by the server into either "human_ai" for host or "network_ai" for client,
and in thunderstruck's refactor of the mp_connect dialogs, ai sides are
always set to "ai" in the WML sent to the server (and set this way on
the host).
however, because of code in play_campaign.cpp which long predated this
refactor, all sides on an mp client are either set to human (if that
player controls them) or "network", or "null".
this causes problems because if that player saves the game, the savegame
will record these sides at human controlled rather than ai controlled...
if the game is reloaded oos can occur, although I won't detail it here.
we update the play_campaign.cpp code to ensure that "ai" controller types
always resolve to human_ai or network_ai as appropriate. additionally,
we make sure that on the host, sides always resolve to human_ai rather
than ai. so the type "ai" should never be observed during an mp game,
and only during scenario configuration, and perhaps during replays.
additionally, we ensure in playturn.cpp that if the client gets a message
from the server to set a side to "ai" during the game, it will in fact
set it to "human_ai" or "network_ai", to preserve the invariant.
finally we also switch over observers to follow this behavior --
previously there was a hack here in the server which would make sure
that any observers which join see all sides as controlled by "human"
https://github.com/wesnoth/wesnoth/blob/a4f47a63c7b2c55fd7d8d3cd425ede256b39acdd/src/server/game.cpp#L197
in order that they do not attempt to substitute themselves for a player.
we change this by removing the hack, and programming the client to remember
if the player is an observer, and if so not attempting to substitute themself
at game start.
Commit: b854aab437f157eea642131b882a4987a95c5b6b
https://github.com/wesnoth/wesnoth/commit/b854aab437f157eea642131b882a4987a95c5b6b
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M src/playturn.cpp
Log Message:
-----------
don't display network_ai sides as replacements for dropped sides
after 18829 fix, don't display "network_ai" sides as possible
controllers for a dropped side, as all ai sides now have this value.
Commit: 2430b491df804700aecc4a43eab3aac3c2a17d56
https://github.com/wesnoth/wesnoth/commit/2430b491df804700aecc4a43eab3aac3c2a17d56
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M src/gui/dialogs/mp_change_control.cpp
Log Message:
-----------
don't show network_ai controllers in :give_control dialog
Commit: f8a01890d119742ffc132771493489546f1c0052
https://github.com/wesnoth/wesnoth/commit/f8a01890d119742ffc132771493489546f1c0052
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
add debugging output to server
Commit: ad4c57f22eef0390803e805629e0aa2ffdcbc4ce
https://github.com/wesnoth/wesnoth/commit/ad4c57f22eef0390803e805629e0aa2ffdcbc4ce
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M src/game_display.cpp
Log Message:
-----------
implement "last 5 chats" notification properly
(fixup 6d460b98271312f806fadfa037b7ea082e862a24)
proper code to find 5'th \n is:
int endl_pos = -1;
for (int ctr = 0; ctr < 5; ctr++)
endl_pos = i->message.find('\n', endl_pos+1);
and not
int endl_pos = 0;
for (int ctr = 0; ctr < 5; ctr++)
endl_pos = i->message.find('\n', endl_pos);
Commit: 487a2c55f22bbd486f2a6c7430a645f818f7094b
https://github.com/wesnoth/wesnoth/commit/487a2c55f22bbd486f2a6c7430a645f818f7094b
Author: Chris Beck <render787 at gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M Doxyfile
M SConstruct
M changelog
A data/campaigns/Legend_of_Wesmere/images/units/monsters/great-ogre.png
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/masks/07_Elves_Last_Stand.mask
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
A data/campaigns/Legend_of_Wesmere/units/Great_Ogre.cfg
A data/core/editor/help.cfg
M data/core/team-colors.cfg
M data/game_config.cfg
A images/buttons/misc/orb-pressed.png
A images/buttons/misc/orb.png
M players_changelog
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/VC9/wesnoth.vcproj
M scons/sdl.py
M src/.gitignore
M src/CMakeLists.txt
M src/SConscript
M src/about.cpp
M src/attack_prediction_display.cpp
M src/clipboard.cpp
M src/controller_base.cpp
M src/display.cpp
M src/editor/palette/palette_manager.cpp
M src/editor/palette/tristate_button.cpp
M src/events.cpp
M src/filesystem.cpp
M src/flg_manager.cpp
M src/flg_manager.hpp
M src/font.cpp
M src/font.hpp
M src/game.cpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_controller.cpp
M src/game_display.cpp
M src/game_preferences_display.cpp
M src/gui/auxiliary/event/dispatcher.hpp
M src/gui/auxiliary/event/handler.cpp
M src/gui/dialogs/lobby_main.cpp
M src/gui/dialogs/mp_change_control.cpp
M src/gui/dialogs/title_screen.cpp
M src/hotkey/hotkey_item.cpp
M src/hotkey/hotkey_preferences_display.cpp
M src/image_modifications.cpp
M src/key.cpp
M src/key.hpp
M src/language.cpp
M src/loadscreen.cpp
M src/map.cpp
M src/map_label.cpp
M src/minimap.cpp
M src/mouse_handler_base.cpp
M src/mouse_handler_base.hpp
M src/multiplayer.cpp
M src/multiplayer_connect.cpp
M src/multiplayer_connect_engine.cpp
M src/multiplayer_connect_engine.hpp
M src/network.cpp
M src/network_ana.cpp
M src/network_worker.cpp
M src/playcampaign.cpp
M src/playcampaign.hpp
M src/playturn.cpp
M src/preferences.cpp
M src/preferences.hpp
M src/preferences_display.cpp
A src/sdl/alpha.cpp
A src/sdl/alpha.hpp
A src/sdl/compat.hpp
A src/sdl/window.cpp
A src/sdl/window.hpp
M src/sdl_utils.cpp
M src/sdl_utils.hpp
M src/serialization/string_utils.cpp
M src/server/game.cpp
M src/server/server.cpp
M src/team.cpp
M src/team.hpp
M src/tests/gui/test_save_dialog.cpp
M src/tests/test_image_modifications.cpp
M src/tests/test_unit_map.cpp
M src/tests/utils/fake_event_source.cpp
M src/tests/utils/fake_event_source.hpp
M src/tests/utils/play_scenario.cpp
M src/tests/utils/play_scenario.hpp
M src/thread.cpp
M src/unit.cpp
M src/video.cpp
M src/video.hpp
M src/wesconfig.h
M src/widgets/button.cpp
M src/widgets/button.hpp
M src/widgets/file_menu.cpp
M src/widgets/scrollarea.cpp
M src/widgets/scrollbar.cpp
M src/widgets/slider.cpp
M src/widgets/slider.hpp
M src/widgets/textbox.cpp
M utils/mp-server/update_server
Log Message:
-----------
Merge branch 'server_set_to_idle' into 1.12
Conflicts:
changelog
projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Compare: https://github.com/wesnoth/wesnoth/compare/f6d38a75c6e8...487a2c55f22b
More information about the Commits
mailing list