[megaglest] 124/143: Merge tag 'upstream/3.11.0'
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Jan 31 20:46:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository megaglest.
commit 96680071656d7a6ab133ee5febef2acab6905d08
Merge: d519fdd 297cbbb
Author: Markus Koschany <apo at gambaru.de>
Date: Sat Jan 31 15:38:07 2015 +0100
Merge tag 'upstream/3.11.0'
Upstream version 3.11.0
# gpg: Signature made Sat 31 Jan 2015 15:37:58 CET using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
CMakeLists.txt | 169 +-
docs/CHANGELOG.txt | 147 +-
docs/COPYRIGHT.source_code.txt | 6 +-
docs/README.compiling-linux.txt | 4 +-
docs/README.compiling-windows.txt | 13 +-
docs/README.release-management.txt | 8 +-
glestkeys.ini | 1 +
megaglest.png | Bin 8274 -> 4581 bytes
mk/cmake/Modules/SpecialMacros.cmake | 26 +-
mk/fedora/megaglest-rpm-meta.tar.bz2 | Bin 17332 -> 0 bytes
mk/fedora/megaglest-rpm-meta/SOURCES/megaglest.png | Bin 2687 -> 2665 bytes
mk/linux/.gitignore | 18 +
mk/linux/build-codeblocks-project.sh | 30 +
mk/linux/build-eclipse-project.sh | 33 +
mk/linux/build-mg-mingw.sh | 38 +
mk/linux/build-mg.sh | 237 ++
mk/linux/coverity-scan.sh | 38 +-
mk/linux/data | 1 -
mk/linux/g3d_viewer | 1 -
mk/linux/glest-dev.ini | 3 +
mk/linux/make-binary-archive.sh | 45 +-
mk/linux/make-data-archive.sh | 46 +-
mk/linux/makedata-diff.sh | 12 +-
mk/linux/makedata-source.sh | 14 +-
mk/linux/makedata.sh | 60 +-
mk/linux/makerelease-embedded.sh | 21 +-
mk/linux/makerelease.sh | 55 +-
mk/linux/maps | 1 -
mk/linux/megaglest-uninstall.ico | Bin 0 -> 9662 bytes
mk/linux/megaglest.png | Bin 8274 -> 4581 bytes
mk/linux/mg-version.sh | 6 +-
mk/linux/mg_cppcheck.sh | 2 +-
mk/linux/mojosetup/.gitignore | 2 +
mk/linux/mojosetup/lua/etc/luavs.bat | 56 +-
mk/linux/mojosetup/megaglest-installer/.gitignore | 2 +
mk/linux/mojosetup/megaglest-installer/make.sh | 25 +-
.../megaglest-installer/meta/glestforumsheader.jpg | Bin 100889 -> 94852 bytes
.../meta/megaglestinstallscreen.jpg | Bin 245233 -> 237901 bytes
.../megaglest-installer/scripts/config.lua | 6 +-
mk/linux/scenarios | 1 -
mk/linux/servers.ini | 6 -
mk/linux/setupBuildDeps.sh | 41 +-
mk/linux/start_megaglest | 11 +
mk/linux/techs | 1 -
mk/linux/tilesets | 1 -
mk/linux/tutorials | 1 -
mk/macosx/CMakeLists.txt | 38 +-
mk/macosx/Info.plist | 12 +-
.../megaglest_editor.ico => shared/editor.ico} | Bin
.../g3dviewer.ico} | Bin
mk/{linux => shared}/glest.ico | Bin
mk/{linux => shared}/glestkeys.ini | 1 +
mk/{windoze => shared}/megaglest.ico | Bin
mk/shared/servers.ini | 6 +
mk/windoze/.gitignore | 26 +-
mk/windoze/CopyWindowsRuntimeDlls.bat | 10 -
mk/windoze/CopyWindowsRuntimeDlls_2010.bat | 10 +-
mk/windoze/CopyWindowsRuntimeDlls_2012.bat | 2 +-
mk/windoze/Glest.sln | 191 --
mk/windoze/Glest.suo | Bin 573952 -> 0 bytes
mk/windoze/Glest_vc2012.sln | 251 ++-
mk/windoze/Installer/MegaGlestInstaller.nsi | 708 +++---
mk/windoze/Installer/MegaGlestUpdater.nsi | 518 ++---
mk/windoze/Installer/make_installer.sh | 6 +
mk/windoze/Installer/megaglestinstallscreen.jpg | Bin 245233 -> 237901 bytes
mk/windoze/Installer/plugins/AccessControl.dll | Bin 0 -> 13312 bytes
mk/windoze/Installer/plugins/AccessControl.txt | 253 +++
mk/windoze/build-mg-2010.bat | 24 +-
mk/windoze/build-mg-2012.bat | 28 +-
mk/windoze/build-mg-mingw.bat | 10 +
mk/windoze/build-mg.bat | 103 -
mk/windoze/coverity-scan.bat | 175 +-
mk/windoze/g2xml.vcproj | 193 --
mk/windoze/g2xml.vcxproj | 2 +-
mk/windoze/g3d_viewer.cbp | 275 ---
mk/windoze/g3d_viewer.rc | 2 +-
mk/windoze/g3d_viewer.vcproj | 314 ---
mk/windoze/g3d_viewer.vcxproj | 4 +-
mk/windoze/getTools.vbs | 286 +--
mk/windoze/glest-dev.ini | 3 +
mk/windoze/glest.ico | Bin 7406 -> 0 bytes
mk/windoze/glest.ini | 95 +
mk/windoze/glest.rc | 2 +-
mk/windoze/glest_editor.cbp | 259 ---
mk/windoze/glest_editor.rc | 2 +-
mk/windoze/glest_editor.vcproj | 314 ---
mk/windoze/glest_editor.vcxproj | 4 +-
mk/windoze/glest_game.cbp | 651 ------
mk/windoze/glest_game.vcproj | 1041 ---------
mk/windoze/glest_game.vcxproj | 8 +-
mk/windoze/libstreflop.cbp | 192 --
mk/windoze/libstreflop.vcproj | 587 -----
mk/windoze/libstreflop.vcxproj | 2 +-
mk/windoze/make-binary-archive.bat | 148 +-
mk/windoze/make-data-archive.bat | 273 ++-
mk/windoze/megaglest.workspace | 11 -
mk/windoze/megaglest_tests.vcxproj | 8 +-
mk/windoze/shared_lib.cbp | 682 ------
mk/windoze/shared_lib.depend | 2223 -------------------
mk/windoze/shared_lib.vcproj | 1233 -----------
mk/windoze/shared_lib.vcxproj | 24 +-
mk/windoze/vc2012/g2xml.vcxproj | 176 +-
mk/windoze/vc2012/g3d_viewer.vcxproj | 117 +-
mk/windoze/vc2012/glest_editor.vcxproj | 116 +-
mk/windoze/vc2012/glest_game.vcxproj | 151 +-
mk/windoze/vc2012/libstreflop.vcxproj | 109 +-
mk/windoze/vc2012/megaglest_tests.vcxproj | 220 +-
mk/windoze/vc2012/shared_lib.vcxproj | 133 +-
mk/windoze/vc2012/xml2g.vcxproj | 188 +-
mk/windoze/xml2g.vcproj | 199 --
mk/windoze/xml2g.vcxproj | 4 +-
servers.ini | 6 +-
setupBuildDeps.sh | 41 +-
source/.gitignore | 5 +-
source/g3d_viewer/CMakeLists.txt | 13 +-
source/g3d_viewer/main.cpp | 51 +-
source/g3d_viewer/main.h | 1 +
source/g3d_viewer/renderer.cpp | 4 +
source/g3d_viewer/renderer.h | 1 +
source/glest_game/CMakeLists.txt | 82 +-
source/glest_game/Doxyfile | 2329 ++++++++++++++++++++
source/glest_game/ai/ai.cpp | 86 +-
source/glest_game/ai/ai_interface.cpp | 7 +-
source/glest_game/ai/ai_rule.cpp | 4 +-
source/glest_game/facilities/components.cpp | 12 +-
source/glest_game/facilities/components.h | 13 +-
source/glest_game/facilities/game_util.cpp | 83 +-
source/glest_game/facilities/game_util.h | 5 +
source/glest_game/game/chat_manager.cpp | 26 +-
source/glest_game/game/commander.cpp | 20 +-
source/glest_game/game/game.cpp | 269 ++-
source/glest_game/game/game.h | 7 +
source/glest_game/game/game_camera.cpp | 53 +-
source/glest_game/game/game_camera.h | 9 +-
source/glest_game/game/game_constants.h | 52 +-
source/glest_game/game/game_settings.h | 27 +-
source/glest_game/game/script_manager.cpp | 134 +-
source/glest_game/game/script_manager.h | 7 +
source/glest_game/global/config.cpp | 20 +-
source/glest_game/global/config.h | 4 +-
source/glest_game/global/core_data.cpp | 48 +-
source/glest_game/global/core_data.h | 12 +-
source/glest_game/graphics/particle_type.cpp | 47 +-
source/glest_game/graphics/particle_type.h | 4 +-
source/glest_game/graphics/renderer.cpp | 754 ++++++-
source/glest_game/graphics/renderer.h | 24 +-
source/glest_game/graphics/unit_particle_type.cpp | 3 +
source/glest_game/gui/display.cpp | 2 +-
source/glest_game/gui/gui.cpp | 285 +--
source/glest_game/gui/selection.cpp | 163 +-
source/glest_game/gui/selection.h | 17 +-
source/glest_game/main/battle_end.cpp | 6 +-
source/glest_game/main/main.cpp | 107 +-
source/glest_game/menu/menu_state_about.h | 2 +-
.../glest_game/menu/menu_state_connected_game.cpp | 505 +++--
source/glest_game/menu/menu_state_connected_game.h | 18 +-
source/glest_game/menu/menu_state_custom_game.cpp | 273 ++-
source/glest_game/menu/menu_state_custom_game.h | 27 +-
source/glest_game/menu/menu_state_graphic_info.cpp | 2 +-
source/glest_game/menu/menu_state_join_game.cpp | 17 +-
source/glest_game/menu/menu_state_keysetup.cpp | 2 +-
source/glest_game/menu/menu_state_load_game.cpp | 52 +-
source/glest_game/menu/menu_state_load_game.h | 1 +
source/glest_game/menu/menu_state_masterserver.cpp | 13 +-
source/glest_game/menu/menu_state_mods.cpp | 6 +-
source/glest_game/menu/menu_state_new_game.cpp | 2 +-
source/glest_game/menu/menu_state_options.cpp | 80 +-
source/glest_game/menu/menu_state_options.h | 3 +
.../menu/menu_state_options_graphics.cpp | 42 +-
.../glest_game/menu/menu_state_options_graphics.h | 3 +
.../glest_game/menu/menu_state_options_network.cpp | 2 +-
.../glest_game/menu/menu_state_options_sound.cpp | 2 +-
source/glest_game/menu/menu_state_root.cpp | 431 +++-
source/glest_game/menu/menu_state_root.h | 23 +-
source/glest_game/menu/menu_state_scenario.cpp | 2 +-
source/glest_game/menu/server_line.cpp | 45 +-
source/glest_game/network/client_interface.cpp | 9 +
source/glest_game/network/client_interface.h | 1 +
source/glest_game/network/connection_slot.cpp | 14 +
source/glest_game/network/connection_slot.h | 2 +
source/glest_game/network/network_interface.cpp | 10 -
source/glest_game/network/network_interface.h | 3 +-
source/glest_game/network/server_interface.cpp | 35 +-
source/glest_game/network/server_interface.h | 1 +
source/glest_game/type_instances/faction.cpp | 279 ++-
source/glest_game/type_instances/faction.h | 18 +-
source/glest_game/type_instances/object.cpp | 1 +
source/glest_game/type_instances/unit.cpp | 556 ++++-
source/glest_game/type_instances/unit.h | 25 +-
source/glest_game/type_instances/upgrade.h | 144 +-
source/glest_game/types/command_type.cpp | 14 +-
source/glest_game/types/command_type.h | 2 -
source/glest_game/types/faction_type.cpp | 119 +-
source/glest_game/types/faction_type.h | 21 +-
source/glest_game/types/projectile_type.cpp | 126 ++
source/glest_game/types/projectile_type.h | 90 +
source/glest_game/types/skill_type.cpp | 444 ++--
source/glest_game/types/skill_type.h | 94 +-
source/glest_game/types/unit_type.cpp | 187 ++
source/glest_game/types/unit_type.h | 106 +-
source/glest_game/types/upgrade_type.cpp | 1007 +++++++--
source/glest_game/types/upgrade_type.h | 369 +++-
source/glest_game/world/map.cpp | 52 +-
source/glest_game/world/map.h | 4 +-
source/glest_game/world/scenario.cpp | 57 +-
source/glest_game/world/scenario.h | 6 +
source/glest_game/world/unit_updater.cpp | 358 ++-
source/glest_game/world/unit_updater.h | 13 +-
source/glest_game/world/world.cpp | 103 +-
source/glest_game/world/world.h | 13 +
source/glest_map_editor/CMakeLists.txt | 5 +-
source/glest_map_editor/main.cpp | 20 +-
source/masterserver/images/game_icon.png | Bin 7035 -> 6968 bytes
source/shared_lib/CMakeLists.txt | 23 +-
.../include/graphics/d3d9/context_d3d9.h | 58 -
.../shared_lib/include/graphics/d3d9/d3d9_util.h | 33 -
.../shared_lib/include/graphics/d3d9/font_d3d9.h | 33 -
.../include/graphics/d3d9/graphics_factory_d3d9.h | 44 -
.../include/graphics/d3d9/model_renderer_d3d9.h | 60 -
.../shared_lib/include/graphics/d3d9/shader_d3d9.h | 116 -
.../include/graphics/d3d9/text_renderer_d3d9.h | 32 -
.../include/graphics/d3d9/texture_d3d9.h | 48 -
source/shared_lib/include/graphics/font.h | 1 -
.../include/graphics/freetype-gl/edtaa3func.h | 98 -
.../include/graphics/freetype-gl/font-manager.h | 135 --
.../include/graphics/freetype-gl/markup.h | 133 --
.../include/graphics/freetype-gl/texture-atlas.h | 161 --
.../include/graphics/freetype-gl/texture-font.h | 124 --
.../include/graphics/freetype-gl/texture-glyph.h | 136 --
.../include/graphics/freetype-gl/vector.h | 293 ---
.../include/graphics/freetype-gl/vertex-buffer.h | 484 ----
.../include/graphics/gl/font_text_freetypegl.h | 281 ---
source/shared_lib/include/graphics/particle.h | 35 +-
.../include/platform/common/platform_common.h | 2 +-
.../include/platform/sdl/platform_main.h | 14 -
source/shared_lib/include/streflop/FPUSettings.h | 23 +
source/shared_lib/include/util/properties.h | 9 +-
source/shared_lib/include/util/util.h | 6 +
source/shared_lib/include/xml/xml_parser.h | 39 +-
.../sources/feathery_ftp/ftpTargetPosix.c | 4 +-
.../sources/graphics/d3d9/context_d3d9.cpp | 85 -
.../shared_lib/sources/graphics/d3d9/d3d9_util.cpp | 28 -
.../shared_lib/sources/graphics/d3d9/font_d3d9.cpp | 45 -
.../sources/graphics/d3d9/model_renderer_d3d9.cpp | 180 --
.../sources/graphics/d3d9/shader_d3d9.cpp | 262 ---
.../sources/graphics/d3d9/text_renderer_d3d9.cpp | 47 -
.../sources/graphics/d3d9/texture_d3d9.cpp | 200 --
source/shared_lib/sources/graphics/font.cpp | 68 +-
.../sources/graphics/freetype-gl/edtaa3func.c | 581 -----
.../sources/graphics/freetype-gl/font-manager.c | 238 --
.../sources/graphics/freetype-gl/makefont.c | 361 ---
.../sources/graphics/freetype-gl/markup.c | 299 ---
.../sources/graphics/freetype-gl/texture-atlas.c | 350 ---
.../sources/graphics/freetype-gl/texture-font.c | 441 ----
.../sources/graphics/freetype-gl/texture-glyph.c | 240 --
.../sources/graphics/freetype-gl/vector.c | 410 ----
.../sources/graphics/freetype-gl/vertex-buffer.c | 764 -------
.../sources/graphics/gl/font_text_freetypegl.cpp | 273 ---
.../sources/graphics/gl/particle_renderer_gl.cpp | 3 +
source/shared_lib/sources/graphics/model.cpp | 6 +-
source/shared_lib/sources/graphics/particle.cpp | 99 +-
source/shared_lib/sources/map/map_preview.cpp | 4 +-
source/shared_lib/sources/miniz/miniz.c | 255 ++-
.../sources/platform/common/base_thread.cpp | 7 +-
.../sources/platform/common/platform_common.cpp | 74 +-
.../sources/platform/posix/ircclient.cpp | 92 +-
.../sources/platform/posix/miniftpclient.cpp | 16 +-
.../shared_lib/sources/platform/posix/socket.cpp | 30 +-
.../sources/platform/sdl/platform_util.cpp | 1 +
source/shared_lib/sources/streflop/FPUSettings.asm | 66 +
source/shared_lib/sources/util/properties.cpp | 198 +-
source/shared_lib/sources/util/util.cpp | 81 +
source/shared_lib/sources/xml/xml_parser.cpp | 88 +-
source/tests/CMakeLists.txt | 10 +-
source/tests/shared_lib/streflop/streflop_test.cpp | 356 +++
source/tests/shared_lib/xml/xml_parser_test.cpp | 62 +-
.../media/datatables/back_disabled.jpg | Bin 612 -> 592 bytes
.../media/datatables/back_enabled.jpg | Bin 807 -> 788 bytes
.../media/datatables/forward_disabled.jpg | Bin 635 -> 617 bytes
.../media/datatables/forward_enabled.jpg | Bin 852 -> 833 bytes
.../media/datatables/sort_asc.png | Bin 263 -> 254 bytes
.../media/datatables/sort_asc_disabled.png | Bin 252 -> 245 bytes
.../media/datatables/sort_desc.png | Bin 260 -> 252 bytes
.../media/datatables/sort_desc_disabled.png | Bin 251 -> 244 bytes
source/tools/glexemel/g3d_logo.png | Bin 60665 -> 60581 bytes
start_megaglest | 11 +
286 files changed, 13732 insertions(+), 19539 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