[megaglest] 03/21: Merge tag 'upstream/3.12.0'
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Jan 27 18:09:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository megaglest.
commit 40f2b52afc81a86798fd8c4158b57f1fe5121ef7
Merge: 6dfc5e5 e545b8b
Author: Markus Koschany <apo at debian.org>
Date: Tue Jan 26 21:27:16 2016 +0100
Merge tag 'upstream/3.12.0'
Upstream version 3.12.0
# gpg: Signature made Tue 26 Jan 2016 21:27:08 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]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
CMakeLists.txt | 272 +-
docs/CHANGELOG.txt | 10 +
docs/README.compiling-windows.txt | 4 +-
docs/README.release-management.txt | 13 +-
docs/README.txt | 13 +-
editor.ico | Bin 7406 -> 0 bytes
g3dviewer.ico | Bin 12014 -> 0 bytes
glest.ico | Bin 7406 -> 0 bytes
glest.ini | 95 -
glestkeys.ini | 57 -
megaglest.bmp | Bin 4150 -> 0 bytes
megaglest.desktop | 10 -
megaglest.ico | Bin 9454 -> 0 bytes
megaglest.png | Bin 4581 -> 0 bytes
megaglest.xpm | 1007 ----
megaglest_editor.desktop | 10 -
megaglest_g3dviewer.desktop | 10 -
mk/cmake/Modules/CurlGetConfig.cmake | 50 +
mk/cmake/Modules/FindCURL.cmake | 72 -
mk/cmake/Modules/FindCppUnit.cmake | 93 +-
mk/cmake/Modules/FindFTGL.cmake | 10 +-
mk/cmake/Modules/FindFontConfig.cmake | 11 +-
mk/cmake/Modules/FindFriBiDi.cmake | 8 +-
mk/cmake/Modules/FindGLEW.cmake | 113 +-
mk/cmake/Modules/FindGLIB2.cmake | 33 +-
mk/cmake/Modules/FindGoogleBreakpad.cmake | 2 +-
mk/cmake/Modules/FindIrcclient.cmake | 8 +-
mk/cmake/Modules/FindLIBVLC.cmake | 19 +-
mk/cmake/Modules/FindLUA.cmake | 260 +-
mk/cmake/Modules/FindLUAJIT.cmake | 36 -
mk/cmake/Modules/FindMiniupnpc.cmake | 33 +-
mk/cmake/Modules/FindOGG.cmake | 38 +-
.../Modules/FindPackageHandleStandardArgs.cmake | 263 --
mk/cmake/Modules/FindSDL2.cmake | 180 +
mk/cmake/Modules/FindXercesC.cmake | 13 +-
mk/cmake/Modules/FindwxWidgets.cmake | 1059 -----
mk/cmake/Modules/ReqVersAndStaticConf.cmake | 80 +
mk/fedora/buildRPMs.sh | 85 -
mk/fedora/megaglest-rpm-meta/SOURCES/README.SUSE | 34 -
.../glest_map_editor/icons/brush_gradient_0.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_n1.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_n2.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_n3.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_n4.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_n5.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_p1.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_p2.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_p3.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_p4.xpm | 25 -
.../glest_map_editor/icons/brush_gradient_p5.xpm | 25 -
.../glest_map_editor/icons/brush_height_0.xpm | 25 -
.../glest_map_editor/icons/brush_height_n1.xpm | 25 -
.../glest_map_editor/icons/brush_height_n2.xpm | 25 -
.../glest_map_editor/icons/brush_height_n3.xpm | 25 -
.../glest_map_editor/icons/brush_height_n4.xpm | 25 -
.../glest_map_editor/icons/brush_height_n5.xpm | 25 -
.../glest_map_editor/icons/brush_height_p1.xpm | 25 -
.../glest_map_editor/icons/brush_height_p2.xpm | 25 -
.../glest_map_editor/icons/brush_height_p3.xpm | 25 -
.../glest_map_editor/icons/brush_height_p4.xpm | 25 -
.../glest_map_editor/icons/brush_height_p5.xpm | 25 -
.../SOURCES/glest_map_editor/icons/brush_none.xpm | 26 -
.../glest_map_editor/icons/brush_object_bush.xpm | 27 -
.../icons/brush_object_c1-bigtree.xpm | 28 -
.../icons/brush_object_c2-hanged.xpm | 31 -
.../icons/brush_object_c3-statue.xpm | 29 -
.../icons/brush_object_c4-bigrock.xpm | 28 -
.../icons/brush_object_c5-blocking.xpm | 27 -
.../icons/brush_object_dead-tree.xpm | 26 -
.../glest_map_editor/icons/brush_object_stone.xpm | 28 -
.../glest_map_editor/icons/brush_object_tree.xpm | 28 -
.../icons/brush_object_water-object.xpm | 28 -
.../glest_map_editor/icons/brush_players_blue.xpm | 26 -
.../glest_map_editor/icons/brush_players_cyan.xpm | 26 -
.../glest_map_editor/icons/brush_players_green.xpm | 26 -
.../icons/brush_players_orange.xpm | 26 -
.../glest_map_editor/icons/brush_players_pink.xpm | 26 -
.../icons/brush_players_player.xpm | 25 -
.../glest_map_editor/icons/brush_players_red.xpm | 26 -
.../glest_map_editor/icons/brush_players_white.xpm | 26 -
.../icons/brush_players_yellow.xpm | 26 -
.../icons/brush_resource_1-gold.xpm | 24 -
.../icons/brush_resource_2-stone.xpm | 24 -
.../glest_map_editor/icons/brush_resource_3.xpm | 24 -
.../glest_map_editor/icons/brush_resource_4.xpm | 24 -
.../glest_map_editor/icons/brush_resource_5.xpm | 24 -
.../icons/brush_surface_custom.xpm | 25 -
.../icons/brush_surface_grass1.xpm | 25 -
.../icons/brush_surface_grass2.xpm | 25 -
.../glest_map_editor/icons/brush_surface_road.xpm | 25 -
.../glest_map_editor/icons/brush_surface_stone.xpm | 25 -
.../icons/edit_randomize-heights.xpm | 24 -
.../glest_map_editor/icons/edit_randomize.xpm | 25 -
.../SOURCES/glest_map_editor/icons/edit_redo.xpm | 24 -
.../icons/edit_switch-surfaces.xpm | 24 -
.../SOURCES/glest_map_editor/icons/edit_undo.xpm | 24 -
.../SOURCES/glest_map_editor/icons/radius_1.xpm | 25 -
.../SOURCES/glest_map_editor/icons/radius_2.xpm | 26 -
.../SOURCES/glest_map_editor/icons/radius_3.xpm | 25 -
.../SOURCES/glest_map_editor/icons/radius_4.xpm | 26 -
.../SOURCES/glest_map_editor/icons/radius_5.xpm | 26 -
.../SOURCES/glest_map_editor/icons/radius_6.xpm | 26 -
.../SOURCES/glest_map_editor/icons/radius_7.xpm | 26 -
.../SOURCES/glest_map_editor/icons/radius_8.xpm | 26 -
.../SOURCES/glest_map_editor/icons/radius_9.xpm | 25 -
.../megaglest-rpm-meta/SOURCES/megaglest.changes | 390 --
.../megaglest-rpm-meta/SOURCES/megaglest.desktop | 8 -
mk/fedora/megaglest-rpm-meta/SOURCES/megaglest.png | Bin 2665 -> 0 bytes
mk/fedora/megaglest-rpm-meta/SPECS/megaglest.spec | 108 -
mk/fedora/megaglest-rpm-meta/megaglest-data.spec | 83 -
mk/linux/.gitignore | 8 +-
mk/linux/build-mg.sh | 139 +-
mk/linux/coverity-scan.sh | 4 +-
mk/linux/formatTextFiles.sh | 20 -
mk/linux/git_update.sh | 28 +
mk/linux/make-binary-archive.sh | 98 +-
mk/linux/make-data-archive.sh | 94 +-
mk/linux/makedata-source.sh | 38 +-
mk/linux/makedata.sh | 6 +-
mk/linux/makedeps_folder.sh | 20 +-
mk/linux/makerelease-embedded.sh | 9 +-
mk/linux/makerelease.sh | 24 +-
mk/linux/megaglest.bmp | Bin 4150 -> 0 bytes
mk/linux/megaglest.desktop | 10 -
mk/linux/megaglest.png | Bin 4581 -> 0 bytes
mk/linux/megaglest.xpm | 1007 ----
mk/linux/megaglest_editor.desktop | 10 -
mk/linux/megaglest_g3dviewer.desktop | 10 -
mk/linux/mg-version-synch.sh | 6 +-
mk/linux/mg_git.sh | 43 +
mk/linux/mg_setsvnprops.sh | 45 -
mk/linux/mojosetup/.gitignore | 2 -
mk/linux/mojosetup/CMakeLists.txt | 846 ----
mk/linux/mojosetup/LICENSE.txt | 32 -
mk/linux/mojosetup/archive_pck.c | 295 --
mk/linux/mojosetup/archive_pkg.c | 250 -
mk/linux/mojosetup/archive_tar.c | 372 --
mk/linux/mojosetup/archive_uz2.c | 373 --
mk/linux/mojosetup/archive_zip.c | 2167 ---------
mk/linux/mojosetup/buildver.c | 97 -
mk/linux/mojosetup/bzip2/blocksort.c | 1094 -----
mk/linux/mojosetup/bzip2/bzlib.c | 1572 -------
mk/linux/mojosetup/bzip2/bzlib.h | 282 --
mk/linux/mojosetup/bzip2/bzlib_private.h | 509 --
mk/linux/mojosetup/bzip2/compress.c | 672 ---
mk/linux/mojosetup/bzip2/crctable.c | 104 -
mk/linux/mojosetup/bzip2/decompress.c | 646 ---
mk/linux/mojosetup/bzip2/huffman.c | 205 -
mk/linux/mojosetup/bzip2/randtable.c | 84 -
mk/linux/mojosetup/bzip2/version.txt | 1 -
mk/linux/mojosetup/checksum_crc32.c | 112 -
mk/linux/mojosetup/checksum_md5.c | 449 --
mk/linux/mojosetup/checksum_sha1.c | 238 -
mk/linux/mojosetup/docs.txt | 1467 ------
mk/linux/mojosetup/fileio.c | 1573 -------
mk/linux/mojosetup/fileio.h | 182 -
mk/linux/mojosetup/gui.c | 243 -
mk/linux/mojosetup/gui.h | 325 --
mk/linux/mojosetup/gui_cocoa.m | 822 ----
mk/linux/mojosetup/gui_gtkplus2.c | 938 ----
mk/linux/mojosetup/gui_ncurses.c | 1510 ------
mk/linux/mojosetup/gui_stdio.c | 655 ---
mk/linux/mojosetup/gui_www.c | 1139 -----
mk/linux/mojosetup/libfetch/README.txt | 48 -
mk/linux/mojosetup/libfetch/common.c | 1114 -----
mk/linux/mojosetup/libfetch/common.h | 135 -
mk/linux/mojosetup/libfetch/fetch.c | 478 --
mk/linux/mojosetup/libfetch/fetch.h | 184 -
mk/linux/mojosetup/libfetch/ftp.c | 1394 ------
mk/linux/mojosetup/libfetch/ftp.errors | 47 -
mk/linux/mojosetup/libfetch/ftperr.h | 70 -
mk/linux/mojosetup/libfetch/http.c | 1373 ------
mk/linux/mojosetup/libfetch/http.errors | 45 -
mk/linux/mojosetup/libfetch/httperr.h | 68 -
mk/linux/mojosetup/libfetch/mojosetup_libfetch.h | 113 -
mk/linux/mojosetup/liblzma/README.txt | 13 -
mk/linux/mojosetup/liblzma/api/lzma.h | 318 --
mk/linux/mojosetup/liblzma/api/lzma/base.h | 606 ---
mk/linux/mojosetup/liblzma/api/lzma/bcj.h | 95 -
mk/linux/mojosetup/liblzma/api/lzma/block.h | 535 ---
mk/linux/mojosetup/liblzma/api/lzma/check.h | 155 -
mk/linux/mojosetup/liblzma/api/lzma/container.h | 429 --
mk/linux/mojosetup/liblzma/api/lzma/delta.h | 82 -
mk/linux/mojosetup/liblzma/api/lzma/filter.h | 429 --
mk/linux/mojosetup/liblzma/api/lzma/hardware.h | 55 -
mk/linux/mojosetup/liblzma/api/lzma/index.h | 687 ---
mk/linux/mojosetup/liblzma/api/lzma/index_hash.h | 112 -
mk/linux/mojosetup/liblzma/api/lzma/lzma.h | 425 --
mk/linux/mojosetup/liblzma/api/lzma/stream_flags.h | 228 -
mk/linux/mojosetup/liblzma/api/lzma/version.h | 126 -
mk/linux/mojosetup/liblzma/api/lzma/vli.h | 171 -
mk/linux/mojosetup/liblzma/check/check.c | 190 -
mk/linux/mojosetup/liblzma/check/check.h | 103 -
mk/linux/mojosetup/liblzma/check/crc_macros.h | 35 -
mk/linux/mojosetup/liblzma/common/alone_decoder.c | 237 -
mk/linux/mojosetup/liblzma/common/alone_decoder.h | 27 -
.../liblzma/common/block_buffer_decoder.c | 83 -
mk/linux/mojosetup/liblzma/common/block_decoder.c | 247 -
mk/linux/mojosetup/liblzma/common/block_decoder.h | 27 -
.../liblzma/common/block_header_decoder.c | 135 -
mk/linux/mojosetup/liblzma/common/block_util.c | 95 -
mk/linux/mojosetup/liblzma/common/common.c | 393 --
mk/linux/mojosetup/liblzma/common/common.h | 301 --
.../liblzma/common/easy_decoder_memusage.c | 29 -
mk/linux/mojosetup/liblzma/common/easy_preset.c | 32 -
mk/linux/mojosetup/liblzma/common/easy_preset.h | 37 -
.../liblzma/common/filter_buffer_decoder.c | 92 -
mk/linux/mojosetup/liblzma/common/filter_common.c | 354 --
mk/linux/mojosetup/liblzma/common/filter_common.h | 53 -
mk/linux/mojosetup/liblzma/common/filter_decoder.c | 193 -
mk/linux/mojosetup/liblzma/common/filter_decoder.h | 28 -
.../liblzma/common/filter_flags_decoder.c | 51 -
mk/linux/mojosetup/liblzma/common/index.c | 1246 -----
mk/linux/mojosetup/liblzma/common/index.h | 78 -
mk/linux/mojosetup/liblzma/common/index_decoder.c | 350 --
mk/linux/mojosetup/liblzma/common/index_hash.c | 337 --
mk/linux/mojosetup/liblzma/common/mythread.h | 47 -
mk/linux/mojosetup/liblzma/common/stream_decoder.c | 463 --
mk/linux/mojosetup/liblzma/common/stream_decoder.h | 26 -
.../mojosetup/liblzma/common/stream_flags_common.c | 52 -
.../mojosetup/liblzma/common/stream_flags_common.h | 38 -
.../liblzma/common/stream_flags_decoder.c | 87 -
mk/linux/mojosetup/liblzma/common/sysdefs.h | 204 -
mk/linux/mojosetup/liblzma/common/tuklib_common.h | 76 -
mk/linux/mojosetup/liblzma/common/tuklib_config.h | 12 -
mk/linux/mojosetup/liblzma/common/tuklib_integer.h | 528 ---
mk/linux/mojosetup/liblzma/common/vli_decoder.c | 90 -
mk/linux/mojosetup/liblzma/common/vli_size.c | 33 -
mk/linux/mojosetup/liblzma/delta/delta_common.c | 75 -
mk/linux/mojosetup/liblzma/delta/delta_common.h | 25 -
mk/linux/mojosetup/liblzma/delta/delta_decoder.c | 86 -
mk/linux/mojosetup/liblzma/delta/delta_decoder.h | 30 -
mk/linux/mojosetup/liblzma/delta/delta_private.h | 42 -
mk/linux/mojosetup/liblzma/lz/lz_decoder.c | 305 --
mk/linux/mojosetup/liblzma/lz/lz_decoder.h | 239 -
mk/linux/mojosetup/liblzma/lzma/lzma2_decoder.c | 308 --
mk/linux/mojosetup/liblzma/lzma/lzma2_decoder.h | 31 -
mk/linux/mojosetup/liblzma/lzma/lzma_common.h | 234 -
mk/linux/mojosetup/liblzma/lzma/lzma_decoder.c | 1088 -----
mk/linux/mojosetup/liblzma/lzma/lzma_decoder.h | 56 -
.../mojosetup/liblzma/lzma/lzma_encoder_presets.c | 65 -
.../mojosetup/liblzma/rangecoder/range_common.h | 90 -
.../mojosetup/liblzma/rangecoder/range_decoder.h | 184 -
.../mojosetup/liblzma/rangecoder/range_encoder.h | 242 -
mk/linux/mojosetup/liblzma/simple/arm.c | 74 -
mk/linux/mojosetup/liblzma/simple/armthumb.c | 79 -
mk/linux/mojosetup/liblzma/simple/ia64.c | 135 -
mk/linux/mojosetup/liblzma/simple/powerpc.c | 78 -
mk/linux/mojosetup/liblzma/simple/simple_coder.c | 285 --
mk/linux/mojosetup/liblzma/simple/simple_coder.h | 65 -
mk/linux/mojosetup/liblzma/simple/simple_decoder.c | 45 -
mk/linux/mojosetup/liblzma/simple/simple_decoder.h | 27 -
mk/linux/mojosetup/liblzma/simple/simple_private.h | 81 -
mk/linux/mojosetup/liblzma/simple/sparc.c | 86 -
mk/linux/mojosetup/liblzma/simple/x86.c | 164 -
mk/linux/mojosetup/lua/COPYRIGHT | 34 -
mk/linux/mojosetup/lua/HISTORY | 183 -
mk/linux/mojosetup/lua/INSTALL | 99 -
mk/linux/mojosetup/lua/Makefile | 114 -
mk/linux/mojosetup/lua/README | 6 -
mk/linux/mojosetup/lua/etc/Makefile | 44 -
mk/linux/mojosetup/lua/etc/README | 37 -
mk/linux/mojosetup/lua/etc/all.c | 61 -
mk/linux/mojosetup/lua/etc/lua.hpp | 32 -
mk/linux/mojosetup/lua/etc/lua.ico | Bin 1078 -> 0 bytes
mk/linux/mojosetup/lua/etc/lua.pc | 31 -
mk/linux/mojosetup/lua/etc/luavs.bat | 28 -
mk/linux/mojosetup/lua/etc/min.c | 62 -
mk/linux/mojosetup/lua/etc/noparser.c | 72 -
mk/linux/mojosetup/lua/etc/strict.lua | 41 -
mk/linux/mojosetup/lua/src/Makefile | 187 -
mk/linux/mojosetup/lua/src/lapi.c | 1303 -----
mk/linux/mojosetup/lua/src/lapi.h | 46 -
mk/linux/mojosetup/lua/src/lauxlib.c | 980 ----
mk/linux/mojosetup/lua/src/lauxlib.h | 234 -
mk/linux/mojosetup/lua/src/lbaselib.c | 481 --
mk/linux/mojosetup/lua/src/lbitlib.c | 231 -
mk/linux/mojosetup/lua/src/lcode.c | 904 ----
mk/linux/mojosetup/lua/src/lcode.h | 105 -
mk/linux/mojosetup/lua/src/lcorolib.c | 177 -
mk/linux/mojosetup/lua/src/lctype.c | 74 -
mk/linux/mojosetup/lua/src/lctype.h | 117 -
mk/linux/mojosetup/lua/src/ldblib.c | 420 --
mk/linux/mojosetup/lua/src/ldebug.c | 602 ---
mk/linux/mojosetup/lua/src/ldebug.h | 56 -
mk/linux/mojosetup/lua/src/ldo.c | 690 ---
mk/linux/mojosetup/lua/src/ldo.h | 68 -
mk/linux/mojosetup/lua/src/ldump.c | 195 -
mk/linux/mojosetup/lua/src/lfunc.c | 183 -
mk/linux/mojosetup/lua/src/lfunc.h | 55 -
mk/linux/mojosetup/lua/src/lgc.c | 1227 -----
mk/linux/mojosetup/lua/src/lgc.h | 169 -
mk/linux/mojosetup/lua/src/linit.c | 89 -
mk/linux/mojosetup/lua/src/liolib.c | 679 ---
mk/linux/mojosetup/lua/src/llex.c | 549 ---
mk/linux/mojosetup/lua/src/llex.h | 100 -
mk/linux/mojosetup/lua/src/llimits.h | 331 --
mk/linux/mojosetup/lua/src/lmathlib.c | 305 --
mk/linux/mojosetup/lua/src/lmem.c | 121 -
mk/linux/mojosetup/lua/src/lmem.h | 72 -
mk/linux/mojosetup/lua/src/loadlib.c | 747 ---
mk/linux/mojosetup/lua/src/lobject.c | 311 --
mk/linux/mojosetup/lua/src/lobject.h | 632 ---
mk/linux/mojosetup/lua/src/lopcodes.c | 129 -
mk/linux/mojosetup/lua/src/lopcodes.h | 310 --
mk/linux/mojosetup/lua/src/loslib.c | 345 --
mk/linux/mojosetup/lua/src/lparser.c | 1657 -------
mk/linux/mojosetup/lua/src/lparser.h | 141 -
mk/linux/mojosetup/lua/src/lstate.c | 344 --
mk/linux/mojosetup/lua/src/lstate.h | 250 -
mk/linux/mojosetup/lua/src/lstring.c | 207 -
mk/linux/mojosetup/lua/src/lstring.h | 68 -
mk/linux/mojosetup/lua/src/lstrlib.c | 994 ----
mk/linux/mojosetup/lua/src/ltable.c | 610 ---
mk/linux/mojosetup/lua/src/ltable.h | 63 -
mk/linux/mojosetup/lua/src/ltablib.c | 305 --
mk/linux/mojosetup/lua/src/ltm.c | 99 -
mk/linux/mojosetup/lua/src/ltm.h | 79 -
mk/linux/mojosetup/lua/src/lua.c | 518 --
mk/linux/mojosetup/lua/src/lua.h | 439 --
mk/linux/mojosetup/lua/src/lua.hpp | 31 -
mk/linux/mojosetup/lua/src/luac.c | 454 --
mk/linux/mojosetup/lua/src/luaconf.h | 568 ---
mk/linux/mojosetup/lua/src/lualib.h | 77 -
mk/linux/mojosetup/lua/src/lundump.c | 280 --
mk/linux/mojosetup/lua/src/lundump.h | 50 -
mk/linux/mojosetup/lua/src/lvm.c | 890 ----
mk/linux/mojosetup/lua/src/lvm.h | 67 -
mk/linux/mojosetup/lua/src/lzio.c | 98 -
mk/linux/mojosetup/lua/src/lzio.h | 87 -
mk/linux/mojosetup/lua/src/print.c | 249 -
mk/linux/mojosetup/lua/test/README | 26 -
mk/linux/mojosetup/lua/test/bisect.lua | 27 -
mk/linux/mojosetup/lua/test/cf.lua | 16 -
mk/linux/mojosetup/lua/test/echo.lua | 5 -
mk/linux/mojosetup/lua/test/env.lua | 7 -
mk/linux/mojosetup/lua/test/factorial.lua | 32 -
mk/linux/mojosetup/lua/test/fib.lua | 40 -
mk/linux/mojosetup/lua/test/fibfor.lua | 13 -
mk/linux/mojosetup/lua/test/globals.lua | 13 -
mk/linux/mojosetup/lua/test/hello.lua | 3 -
mk/linux/mojosetup/lua/test/life.lua | 111 -
mk/linux/mojosetup/lua/test/luac.lua | 7 -
mk/linux/mojosetup/lua/test/printf.lua | 7 -
mk/linux/mojosetup/lua/test/readonly.lua | 12 -
mk/linux/mojosetup/lua/test/sieve.lua | 29 -
mk/linux/mojosetup/lua/test/sort.lua | 66 -
mk/linux/mojosetup/lua/test/table.lua | 12 -
mk/linux/mojosetup/lua/test/trace-calls.lua | 32 -
mk/linux/mojosetup/lua/test/trace-globals.lua | 38 -
mk/linux/mojosetup/lua/test/xd.lua | 14 -
mk/linux/mojosetup/lua_glue.c | 2004 --------
mk/linux/mojosetup/lua_glue.h | 92 -
mk/linux/mojosetup/megaglest-installer/.gitignore | 2 -
.../megaglest-installer/makedeps_folder.sh | 103 -
mk/linux/mojosetup/meta/xdg-utils/xdg-desktop-menu | 1264 -----
mk/linux/mojosetup/meta/xdg-utils/xdg-open | 145 -
mk/linux/mojosetup/miniz.c | 36 -
mk/linux/mojosetup/miniz.h | 706 ---
mk/linux/mojosetup/misc/FindCurses.cmake | 179 -
.../misc/MacAppBundleSkeleton/Contents/Info.plist | 27 -
.../misc/MacAppBundleSkeleton/Contents/PkgInfo | 1 -
.../Contents/Resources/mojosetup.icns | Bin 286311 -> 0 bytes
mk/linux/mojosetup/misc/MojoSetup.xib | 1918 --------
mk/linux/mojosetup/misc/cp.cmake | 29 -
mk/linux/mojosetup/misc/make_self_extracting.c | 215 -
mk/linux/mojosetup/misc/mkdir.cmake | 18 -
mk/linux/mojosetup/misc/rm_recurse.cmake | 18 -
mk/linux/mojosetup/mojosetup.c | 1289 -----
mk/linux/mojosetup/platform.h | 383 --
mk/linux/mojosetup/platform_beos.cpp | 115 -
mk/linux/mojosetup/platform_unix.c | 1558 ------
mk/linux/mojosetup/platform_windows.c | 1630 -------
mk/linux/mojosetup/scripts/app_localization.lua | 67 -
mk/linux/mojosetup/scripts/config.lua | 235 -
mk/linux/mojosetup/scripts/localization.lua | 4968 --------------------
mk/linux/mojosetup/scripts/mojosetup_init.lua | 591 ---
mk/linux/mojosetup/scripts/mojosetup_mainline.lua | 2115 ---------
mk/linux/mojosetup/stb_image.c | 3823 ---------------
mk/linux/mojosetup/universal.h | 439 --
mk/linux/mojosetup/zlib/adler32.c | 169 -
mk/linux/mojosetup/zlib/compress.c | 80 -
mk/linux/mojosetup/zlib/crc32.c | 442 --
mk/linux/mojosetup/zlib/deflate.c | 1834 --------
mk/linux/mojosetup/zlib/deflate.h | 342 --
mk/linux/mojosetup/zlib/infback.c | 632 ---
mk/linux/mojosetup/zlib/inffast.c | 340 --
mk/linux/mojosetup/zlib/inffast.h | 11 -
mk/linux/mojosetup/zlib/inflate.c | 1480 ------
mk/linux/mojosetup/zlib/inflate.h | 122 -
mk/linux/mojosetup/zlib/inftrees.c | 330 --
mk/linux/mojosetup/zlib/inftrees.h | 62 -
mk/linux/mojosetup/zlib/trees.c | 1244 -----
mk/linux/mojosetup/zlib/uncompr.c | 59 -
mk/linux/mojosetup/zlib/version.txt | 1 -
mk/linux/mojosetup/zlib/zconf.h | 428 --
mk/linux/mojosetup/zlib/zlib.h | 1613 -------
mk/linux/mojosetup/zlib/zutil.c | 318 --
mk/linux/mojosetup/zlib/zutil.h | 274 --
mk/linux/setupBuildDeps.sh | 140 +-
mk/linux/start_megaglest | 628 +--
mk/linux/start_megaglest_g3dviewer | 138 +-
mk/linux/start_megaglest_gameserver | 272 +-
mk/linux/start_megaglest_mapeditor | 138 +-
mk/linux/tools-for-standalone-client/.gitignore | 3 +
.../installer/.gitignore | 6 +
.../installer}/make.sh | 244 +-
.../installer}/megaglest-uninstall.ico | Bin
.../installer}/meta/glestforumsheader.bmp | Bin
.../installer}/meta/glestforumsheader.jpg | Bin
.../installer}/meta/megaglestinstallscreen.jpg | Bin
.../installer}/scripts/app_localization.lua | 2 +-
.../installer}/scripts/config.lua | 2 +-
.../megaglest-configure-desktop.sh | 33 +
.../prepare-mini-update.sh | 74 +
mk/macosx/.gitignore | 2 +
mk/macosx/CMakeLists.txt | 29 +-
mk/macosx/build-mg.sh | 111 +-
mk/macosx/bundle_resources/MegaGlest.sh | 12 +-
mk/macosx/make-binary-archive.sh | 55 +-
mk/macosx/make-release-archives.sh | 20 +-
mk/macosx/start_headless_gameserver.sh | 60 -
mk/windoze/.gitignore | 8 +-
mk/windoze/CopyWindowsRuntimeDlls_2015.bat | 15 +
mk/windoze/Glest_vc2015.sln | 500 ++
mk/windoze/Installer/MegaGlestInstaller.nsi | 113 +-
mk/windoze/Installer/MegaGlestUpdater.nsi | 6 +-
mk/windoze/build-mg-2010.bat | 13 +-
mk/windoze/build-mg-2012.bat | 13 +-
.../{build-mg-2012.bat => build-mg-2015.bat} | 93 +-
.../{build-mg-2012.bat => build-mg32bit-2015.bat} | 89 +-
mk/windoze/coverity-scan.bat | 54 +-
mk/windoze/make-binary-archive.bat | 4 +-
...ry-archive.bat => make-binary-archive32bit.bat} | 11 +-
mk/windoze/make-data-archive.bat | 8 -
mk/windoze/vc2012/g3d_viewer.vcxproj | 4 +-
mk/windoze/vc2012/glest_editor.vcxproj | 4 +-
mk/windoze/vc2012/glest_game.vcxproj | 4 +-
mk/windoze/vc2012/libstreflop.vcxproj | 4 +-
mk/windoze/vc2012/megaglest_tests.vcxproj | 4 +-
mk/windoze/vc2012/shared_lib.vcxproj | 6 +-
mk/windoze/vc2015/g2xml.vcxproj | 345 ++
mk/windoze/{vc2012 => vc2015}/g3d_viewer.vcxproj | 52 +-
mk/windoze/{vc2012 => vc2015}/glest_editor.vcxproj | 48 +-
mk/windoze/{vc2012 => vc2015}/glest_game.vcxproj | 58 +-
mk/windoze/{vc2012 => vc2015}/libstreflop.vcxproj | 21 +-
.../{vc2012 => vc2015}/megaglest_tests.vcxproj | 56 +-
mk/windoze/{vc2012 => vc2015}/shared_lib.vcxproj | 53 +-
mk/windoze/vc2015/xml2g.vcxproj | 369 ++
servers.ini | 6 -
setupBuildDeps.sh | 264 --
source/g3d_viewer/CMakeLists.txt | 110 +-
source/g3d_viewer/main.cpp | 149 +-
source/g3d_viewer/main.h | 2 +
source/g3d_viewer/renderer.cpp | 2 +-
source/glest_game/CMakeLists.txt | 199 +-
source/glest_game/ai/ai.cpp | 2 +-
source/glest_game/ai/ai_interface.cpp | 2 +-
source/glest_game/ai/ai_rule.cpp | 244 +-
source/glest_game/facilities/.gitignore | 1 +
source/glest_game/facilities/game_util.cpp | 19 +-
source/glest_game/facilities/logger.cpp | 6 +-
source/glest_game/game/chat_manager.cpp | 98 +-
source/glest_game/game/chat_manager.h | 4 +-
source/glest_game/game/game.cpp | 159 +-
source/glest_game/game/game.h | 4 +-
source/glest_game/game/script_manager.cpp | 2 +-
source/glest_game/global/config.cpp | 30 +-
source/glest_game/global/config.h | 5 +-
source/glest_game/graphics/renderer.cpp | 36 +-
source/glest_game/gui/gui.cpp | 57 +-
source/glest_game/gui/selection.cpp | 56 +-
source/glest_game/gui/selection.h | 6 +-
source/glest_game/main/battle_end.cpp | 8 +-
source/glest_game/main/intro.cpp | 18 +-
source/glest_game/main/intro.h | 8 +-
source/glest_game/main/macosx_main.h | 19 -
source/glest_game/main/macosx_main.m | 406 --
source/glest_game/main/main.cpp | 331 +-
source/glest_game/main/main.h | 8 +
source/glest_game/main/program.cpp | 62 +-
source/glest_game/main/program.h | 7 +-
source/glest_game/menu/main_menu.cpp | 125 +-
source/glest_game/menu/main_menu.h | 4 +
source/glest_game/menu/menu_state_about.cpp | 8 +-
.../glest_game/menu/menu_state_connected_game.cpp | 301 +-
source/glest_game/menu/menu_state_connected_game.h | 4 +-
source/glest_game/menu/menu_state_custom_game.cpp | 233 +-
source/glest_game/menu/menu_state_custom_game.h | 8 +-
source/glest_game/menu/menu_state_graphic_info.cpp | 4 +-
source/glest_game/menu/menu_state_join_game.cpp | 74 +-
source/glest_game/menu/menu_state_join_game.h | 2 +
source/glest_game/menu/menu_state_keysetup.cpp | 111 +-
source/glest_game/menu/menu_state_keysetup.h | 2 +-
source/glest_game/menu/menu_state_load_game.cpp | 12 +-
source/glest_game/menu/menu_state_masterserver.cpp | 83 +-
source/glest_game/menu/menu_state_masterserver.h | 3 +-
source/glest_game/menu/menu_state_mods.cpp | 96 +-
source/glest_game/menu/menu_state_mods.h | 4 +
source/glest_game/menu/menu_state_new_game.cpp | 13 +-
source/glest_game/menu/menu_state_options.cpp | 55 +-
source/glest_game/menu/menu_state_options.h | 1 +
.../menu/menu_state_options_graphics.cpp | 36 +-
.../glest_game/menu/menu_state_options_network.cpp | 22 +-
.../glest_game/menu/menu_state_options_sound.cpp | 36 +-
source/glest_game/menu/menu_state_root.cpp | 31 +-
source/glest_game/menu/server_line.cpp | 38 +-
source/glest_game/network/client_interface.cpp | 85 +-
source/glest_game/network/connection_slot.cpp | 2 +-
source/glest_game/network/network_interface.cpp | 70 +-
source/glest_game/network/network_interface.h | 1 +
source/glest_game/network/network_message.cpp | 616 ++-
source/glest_game/network/network_message.h | 167 +-
source/glest_game/network/server_interface.cpp | 5 +-
source/glest_game/type_instances/faction.cpp | 4 +
source/glest_game/type_instances/unit.cpp | 16 +-
source/glest_game/types/tech_tree.cpp | 3 +-
source/glest_game/types/unit_type.cpp | 1 +
source/glest_game/types/unit_type.h | 1 +
source/glest_map_editor/CMakeLists.txt | 99 +-
source/glest_map_editor/main.cpp | 79 +-
source/glest_map_editor/main.h | 1 +
source/glest_map_editor/program.cpp | 9 +-
source/masterserver/README.txt | 1 -
source/masterserver/addGameStats.php | 274 --
source/masterserver/addServerInfo.php | 310 --
source/masterserver/cleanUpServerList.php | 18 -
source/masterserver/config.php | 32 -
source/masterserver/docs/AUTHORS.txt | 33 -
source/masterserver/docs/README.txt | 66 -
source/masterserver/docs/gnu_gpl_3.0.txt | 674 ---
source/masterserver/functions.php | 122 -
source/masterserver/images/game_icon.png | Bin 6968 -> 0 bytes
source/masterserver/images/megaglest.ico | Bin 9454 -> 0 bytes
source/masterserver/index.php | 7 -
source/masterserver/install/scheme_mysql.sql | 166 -
source/masterserver/robots.txt | 2 -
.../masterserver/scripts/desktop_notifications.js | 355 --
source/masterserver/scripts/json2.js | 486 --
source/masterserver/scripts/utils.js | 56 -
source/masterserver/showGameStats.php | 246 -
source/masterserver/showMapsForGlest.php | 65 -
source/masterserver/showPlayers.php | 118 -
source/masterserver/showRecentServers.php | 20 -
source/masterserver/showScenariosForGlest.php | 66 -
source/masterserver/showServers.php | 230 -
source/masterserver/showServersForGlest.php | 58 -
source/masterserver/showServersJson.php | 36 -
source/masterserver/showTechsForGlest.php | 65 -
source/masterserver/showTilesetsForGlest.php | 65 -
source/masterserver/style/screen.css | 66 -
source/shared_lib/CMakeLists.txt | 294 +-
.../include/compression/compression_utils.h | 2 +
source/shared_lib/include/graphics/FileReader.h | 2 +-
source/shared_lib/include/graphics/ImageReaders.h | 4 +
source/shared_lib/include/graphics/buffer.h | 2 +-
source/shared_lib/include/graphics/model.h | 8 +-
source/shared_lib/include/graphics/model_header.h | 3 +-
source/shared_lib/include/graphics/video_player.h | 6 +-
.../include/platform/common/common_scoped_ptr.h | 33 +
.../include/platform/common/platform_common.h | 13 +-
source/shared_lib/include/platform/posix/socket.h | 2 +
source/shared_lib/include/platform/sdl/gl_wrap.h | 6 +-
.../include/platform/sdl/platform_main.h | 12 +-
source/shared_lib/include/platform/sdl/thread.h | 76 +-
source/shared_lib/include/platform/sdl/window.h | 37 +-
source/shared_lib/include/platform/sdl/window_gl.h | 19 +-
.../shared_lib/include/sound/sound_file_loader.h | 1 +
source/shared_lib/include/util/string_utils.h | 2 +
.../sources/compression/compression_utils.cpp | 49 +
source/shared_lib/sources/graphics/FileReader.cpp | 2 +-
source/shared_lib/sources/graphics/buffer.cpp | 2 +-
.../sources/graphics/gl/model_renderer_gl.cpp | 12 +
source/shared_lib/sources/graphics/model.cpp | 171 +-
source/shared_lib/sources/graphics/pixmap.cpp | 2 +-
source/shared_lib/sources/graphics/texture.cpp | 22 +-
.../shared_lib/sources/graphics/video_player.cpp | 14 +-
source/shared_lib/sources/lua/lua_script.cpp | 33 +-
.../sources/platform/common/platform_common.cpp | 484 +-
.../sources/platform/common/simple_threads.cpp | 5 +-
.../sources/platform/posix/ircclient.cpp | 95 +-
.../shared_lib/sources/platform/posix/socket.cpp | 189 +-
source/shared_lib/sources/platform/sdl/gl_wrap.cpp | 189 +-
.../sources/platform/sdl/platform_util.cpp | 96 +-
source/shared_lib/sources/platform/sdl/thread.cpp | 121 +-
source/shared_lib/sources/platform/sdl/window.cpp | 873 ++--
.../shared_lib/sources/platform/sdl/window_gl.cpp | 97 +-
.../sources/platform/win32/platform_util.cpp | 9 +-
.../sources/sound/openal/sound_player_openal.cpp | 43 +-
.../shared_lib/sources/sound/sound_file_loader.cpp | 5 +
source/shared_lib/sources/streflop/FPUSettings.asm | 21 +-
.../sources/streflop/libm/flt-32/e_log10f.cpp | 2 +-
.../sources/streflop/libm/flt-32/s_cosf.cpp | 2 +-
source/shared_lib/sources/util/leak_dumper.cpp | 7 +-
source/shared_lib/sources/util/properties.cpp | 3 -
source/shared_lib/sources/util/string_utils.cpp | 25 +
source/shared_lib/sources/util/util.cpp | 8 +-
source/tests/CMakeLists.txt | 52 +-
source/tools/convert_faction_xml2html/.gitignore | 1 +
source/tools/convert_faction_xml2html/compare.html | 19 -
.../convert_faction_xml2html/compare_help.html | 16 -
.../convert_faction_xml2html.pl | 7 +-
source/tools/convert_faction_xml2html/favicon.ico | Bin 318 -> 0 bytes
.../make_html_for_git_docs.sh | 95 +
.../convert_faction_xml2html/media/.gitignore | 1 +
.../convert_faction_xml2html/media/compare.html | 4 +-
.../media/compare_help.html | 2 +-
.../tools/convert_faction_xml2html/media/style.css | 3 +-
source/tools/convert_faction_xml2html/megapack.ini | 10 +-
source/tools/convert_faction_xml2html/setupDeps.sh | 36 +-
source/tools/convert_faction_xml2html/style.css | 300 --
source/tools/glexemel/.gitignore | 2 +
source/tools/glexemel/g3d_support.py | 1382 ++++--
source/tools/glexemel/g3d_support_b257.py | 729 ---
source/tools/glexemel/g3d_support_b260.py | 700 ---
source/tools/glexemel/g3d_support_b263.py | 747 ---
source/tools/glexemel/g3d_support_b269.py | 9 +
source/tools/glexemel/g3d_xml_exporter.py | 535 ---
source/tools/support/linux/system_report | 2 +-
source/version.txt | 6 +-
start_megaglest | 305 --
start_megaglest_g3dviewer | 123 -
start_megaglest_mapeditor | 123 -
623 files changed, 9302 insertions(+), 115634 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