[megaglest] 02/10: Merge tag 'upstream/3.13.0'
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Mar 13 01:29:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository megaglest.
commit c0acfe896fee6ffd17212cadda421a2881d29eba
Merge: 8af154f 28f3f85
Author: Markus Koschany <apo at debian.org>
Date: Sun Mar 12 22:06:40 2017 +0100
Merge tag 'upstream/3.13.0'
Upstream version 3.13.0
# gpg: Signatur vom So 12 Mär 2017 22:06:39 CET
# gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
# gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
# gpg: alias "Markus Koschany <markus at koschany.net>" [ultimativ]
# gpg: alias "Markus Koschany <apo at debian.org>" [ultimativ]
CMakeLists.txt | 14 +-
docs/CHANGELOG.txt | 20 +-
docs/README.compiling-linux.txt | 134 +-
docs/README.compiling-windows.txt | 145 +--
docs/README.release-management.txt | 33 +-
docs/README.txt | 8 +-
mk/cmake/Modules/FindOGG.cmake | 2 +-
mk/linux/.gitignore | 1 +
mk/linux/build-mg.sh | 80 +-
mk/linux/coverity-scan.sh | 40 +-
mk/linux/git_update.sh | 14 +-
mk/linux/glest.ini | 2 +
mk/linux/make-binary-archive.sh | 25 +-
mk/linux/make-data-archive.sh | 42 +-
mk/linux/makedata.sh | 6 +
mk/linux/makedeps_folder.sh | 26 +-
mk/linux/mg-version-synch.sh | 26 +-
mk/linux/mg_cppcheck.sh | 26 +-
mk/linux/mg_shared.sh | 64 +-
mk/linux/setupBuildDeps.sh | 211 ++-
mk/linux/start_megaglest_gameserver | 211 ++-
.../tools-for-standalone-client/installer/make.sh | 4 +-
.../installer/scripts/config.lua | 4 +-
.../megaglest-configure-desktop.sh | 14 +-
.../prepare-mini-update.sh | 4 +-
.../start_megaglest | 257 ++--
.../start_megaglest_g3dviewer | 2 +-
.../start_megaglest_mapeditor | 2 +-
mk/{macosx => macos}/.gitignore | 0
mk/{macosx => macos}/CMakeLists.txt | 12 +-
mk/{macosx => macos}/build-mg.sh | 0
.../bundle_resources/Info.plist.in | 2 +-
.../bundle_resources/MegaGlest.icns | Bin
mk/{macosx => macos}/bundle_resources/MegaGlest.sh | 0
mk/{macosx => macos}/glest-dev.ini | 0
mk/{macosx => macos}/glest.ini | 1 +
mk/{macosx => macos}/make-binary-archive.sh | 11 +-
mk/{macosx => macos}/make-release-archives.sh | 2 +-
.../ContentBuilder/content/base_content/.gitignore | 4 +
.../ContentBuilder/content/linux_x64/.gitignore | 4 +
.../sdk/tools/ContentBuilder/content/linux_x64/bin | 1 +
.../content/linux_x64/lib/.gitignore | 4 +
.../ContentBuilder/content/win_x64/.gitignore | 4 +
.../ContentBuilder/content/win_x86/.gitignore | 4 +
.../sdk/tools/ContentBuilder/run_build.bat | 1 +
.../sdk/tools/ContentBuilder/run_build.sh | 6 +
.../scripts/base_content_build_578873.vdf | 25 +
.../scripts/linux_x64_build_578871.vdf | 25 +
.../scripts/megaglest_build_linux_578870.vdf | 16 +
.../scripts/megaglest_build_windows_578870.vdf | 16 +
.../scripts/win_x64_build_578874.vdf | 25 +
.../scripts/win_x86_build_578872.vdf | 25 +
mk/windoze/Glest_vc2015.sln | 2 +-
mk/windoze/Installer/MegaGlestInstaller.nsi | 4 +-
mk/windoze/Installer/MegaGlestUpdater.nsi | 6 +-
mk/windoze/build-mg-2010.bat | 2 +-
mk/windoze/build-mg-2012.bat | 2 +-
mk/windoze/build-mg-2015.bat | 7 +-
mk/windoze/build-mg32bit-2015.bat | 7 +-
mk/windoze/coverity-scan.bat | 2 +-
mk/windoze/glest.ini | 1 +
mk/windoze/make-data-archive.bat | 31 +-
mk/windoze/vc2015/g3d_viewer.vcxproj | 6 +
mk/windoze/vc2015/glest_editor.vcxproj | 6 +
mk/windoze/vc2015/glest_game.vcxproj | 6 +
mk/windoze/vc2015/megaglest_tests.vcxproj | 6 +
source/g3d_viewer/CMakeLists.txt | 37 +-
source/g3d_viewer/main.cpp | 6 +-
source/glest_game/CMakeLists.txt | 53 +-
source/glest_game/ai/ai.cpp | 19 +-
source/glest_game/ai/ai.h | 2 +-
source/glest_game/ai/ai_rule.cpp | 21 +-
source/glest_game/ai/path_finder.cpp | 126 +-
source/glest_game/ai/path_finder.h | 145 ++-
source/glest_game/facilities/components.cpp | 166 ++-
source/glest_game/facilities/components.h | 28 +-
source/glest_game/facilities/game_util.cpp | 30 +-
source/glest_game/facilities/logger.cpp | 2 +-
source/glest_game/game/chat_manager.cpp | 2 +-
source/glest_game/game/console.cpp | 70 +-
source/glest_game/game/console.h | 25 +-
source/glest_game/game/game.cpp | 34 +-
source/glest_game/game/game.h | 1 +
source/glest_game/game/game_settings.h | 14 +-
source/glest_game/game/script_manager.cpp | 1345 +++-----------------
source/glest_game/game/script_manager.h | 5 +
source/glest_game/global/core_data.cpp | 218 +---
source/glest_game/global/core_data.h | 9 +
source/glest_game/graphics/renderer.cpp | 79 +-
source/glest_game/gui/gui.cpp | 42 +-
source/glest_game/gui/selection.cpp | 39 +-
source/glest_game/gui/selection.h | 4 +-
source/glest_game/main/battle_end.cpp | 14 +-
source/glest_game/main/main.cpp | 40 +-
source/glest_game/main/program.cpp | 5 +-
source/glest_game/menu/main_menu.cpp | 15 +-
.../glest_game/menu/menu_state_connected_game.cpp | 104 +-
source/glest_game/menu/menu_state_connected_game.h | 7 +-
source/glest_game/menu/menu_state_custom_game.cpp | 32 +-
source/glest_game/menu/menu_state_keysetup.cpp | 60 +-
source/glest_game/menu/menu_state_new_game.cpp | 23 +-
source/glest_game/menu/menu_state_options.cpp | 167 +--
source/glest_game/menu/menu_state_options.h | 6 +-
.../menu/menu_state_options_graphics.cpp | 152 +--
.../glest_game/menu/menu_state_options_network.cpp | 120 +-
.../glest_game/menu/menu_state_options_sound.cpp | 85 +-
source/glest_game/menu/menu_state_root.cpp | 39 +-
source/glest_game/network/client_interface.cpp | 4 +-
source/glest_game/network/network_message.cpp | 8 +
source/glest_game/network/network_message.h | 1 +
source/glest_game/network/server_interface.cpp | 106 +-
source/glest_game/network/server_interface.h | 1 +
source/glest_game/sound/sound_renderer.cpp | 4 +-
source/glest_game/sound/sound_renderer.h | 2 +-
source/glest_game/type_instances/faction.cpp | 10 +
source/glest_game/type_instances/unit.cpp | 88 +-
source/glest_game/type_instances/unit.h | 8 +-
source/glest_game/types/command_type.cpp | 31 +-
source/glest_game/types/faction_type.cpp | 8 +-
source/glest_game/types/resource_type.cpp | 4 +
source/glest_game/types/skill_type.cpp | 35 +-
source/glest_game/types/skill_type.h | 17 +-
source/glest_game/types/tech_tree.cpp | 32 +-
source/glest_game/types/unit_type.cpp | 30 +-
source/glest_game/types/unit_type.h | 4 +
source/glest_game/types/upgrade_type.cpp | 6 +-
source/glest_game/world/map.cpp | 55 +-
source/glest_game/world/map.h | 153 ++-
source/glest_game/world/minimap.cpp | 6 +-
source/glest_game/world/tileset.cpp | 12 +-
source/glest_game/world/unit_updater.cpp | 173 ++-
source/glest_game/world/unit_updater.h | 5 +-
source/glest_game/world/world.cpp | 141 +-
source/glest_game/world/world.h | 6 +-
source/glest_map_editor/CMakeLists.txt | 37 +-
source/glest_map_editor/main.cpp | 59 +-
source/glest_map_editor/main.h | 4 +-
source/glest_map_editor/program.cpp | 4 +-
source/glest_map_editor/program.h | 2 +-
source/shared_lib/CMakeLists.txt | 53 +-
source/shared_lib/include/graphics/font.h | 12 +-
source/shared_lib/include/graphics/vec.h | 10 +-
.../{streflop => platform/common}/streflop_cond.h | 2 +-
source/shared_lib/include/platform/posix/socket.h | 8 +-
.../include/platform/sdl/platform_main.h | 19 +-
source/shared_lib/include/platform/sdl/thread.h | 6 +
source/shared_lib/include/platform/sdl/window.h | 4 +
.../include/sound/openal/sound_player_openal.h | 2 +-
source/shared_lib/include/sound/sound_player.h | 2 +-
source/shared_lib/include/streflop/CMakeLists.txt | 65 +-
source/shared_lib/include/streflop/FPUCheck.h | 2 +-
source/shared_lib/include/util/util.h | 1 +
source/shared_lib/sources/graphics/font.cpp | 20 +-
source/shared_lib/sources/graphics/pixmap.cpp | 3 +-
source/shared_lib/sources/lua/lua_script.cpp | 10 +-
source/shared_lib/sources/map/map_preview.cpp | 31 +-
.../sources/platform/common/platform_common.cpp | 34 +-
.../shared_lib/sources/platform/posix/socket.cpp | 48 +-
source/shared_lib/sources/platform/sdl/thread.cpp | 31 +-
source/shared_lib/sources/platform/sdl/window.cpp | 129 +-
.../sources/sound/openal/sound_player_openal.cpp | 12 +-
source/shared_lib/sources/streflop/streflopC.cpp | 2 +-
source/shared_lib/sources/util/randomgen.cpp | 6 +-
source/shared_lib/sources/xml/xml_parser.cpp | 40 +-
source/tests/CMakeLists.txt | 58 +-
.../convert_faction_xml2html.pl | 47 +-
.../make_html_for_git_docs.sh | 27 +-
.../tools/convert_faction_xml2html/media/style.css | 4 +
source/tools/convert_faction_xml2html/megapack.ini | 8 +-
source/tools/convert_faction_xml2html/setupDeps.sh | 4 +-
source/tools/support/linux/system_report | 20 +-
source/version.txt | 10 +-
172 files changed, 3747 insertions(+), 3123 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git
More information about the Pkg-games-commits
mailing list