Permalink
Browse files

Merge branch 'release/3.13.0'

  • Loading branch information...
filux committed Mar 8, 2017
2 parents 0fcffb1 + 4846ad0 commit 967257e491d82f1090ae6d07a0e2c5afd267fa9d
Showing with 3,895 additions and 3,194 deletions.
  1. +97 −12 .travis-before_install.sh
  2. +39 −49 .travis.yml
  3. +8 −6 CMakeLists.txt
  4. +9 −7 README.md
  5. +1 −1 data/glest_game
  6. +18 −2 docs/CHANGELOG.txt
  7. +58 −76 docs/README.compiling-linux.txt
  8. +69 −76 docs/README.compiling-windows.txt
  9. +9 −24 docs/README.release-management.txt
  10. +4 −4 docs/README.txt
  11. +1 −1 mk/cmake/Modules/FindOGG.cmake
  12. +1 −0 mk/linux/.gitignore
  13. +53 −27 mk/linux/build-mg.sh
  14. +13 −27 mk/linux/coverity-scan.sh
  15. +7 −7 mk/linux/git_update.sh
  16. +2 −0 mk/linux/glest.ini
  17. +14 −11 mk/linux/make-binary-archive.sh
  18. +32 −10 mk/linux/make-data-archive.sh
  19. +6 −0 mk/linux/makedata.sh
  20. +15 −11 mk/linux/makedeps_folder.sh
  21. +21 −5 mk/linux/mg-version-synch.sh
  22. +20 −6 mk/linux/mg_cppcheck.sh
  23. +29 −35 mk/linux/mg_shared.sh
  24. +103 −108 mk/linux/setupBuildDeps.sh
  25. +148 −63 mk/linux/start_megaglest_gameserver
  26. +3 −1 mk/linux/tools-for-standalone-client/installer/make.sh
  27. +1 −1 mk/linux/tools-for-standalone-client/installer/mojosetup
  28. +2 −2 mk/linux/tools-for-standalone-client/installer/scripts/config.lua
  29. +7 −7 mk/linux/tools-for-standalone-client/megaglest-configure-desktop.sh
  30. +2 −2 mk/linux/tools-for-standalone-client/prepare-mini-update.sh
  31. +174 −83 mk/linux/{ → tools-for-standalone-client}/start_megaglest
  32. +1 −1 mk/linux/{ → tools-for-standalone-client}/start_megaglest_g3dviewer
  33. +1 −1 mk/linux/{ → tools-for-standalone-client}/start_megaglest_mapeditor
  34. 0 mk/{macosx → macos}/.gitignore
  35. +6 −6 mk/{macosx → macos}/CMakeLists.txt
  36. 0 mk/{macosx → macos}/build-mg.sh
  37. +1 −1 mk/{macosx → macos}/bundle_resources/Info.plist.in
  38. BIN mk/{macosx → macos}/bundle_resources/MegaGlest.icns
  39. 0 mk/{macosx → macos}/bundle_resources/MegaGlest.sh
  40. 0 mk/{macosx → macos}/glest-dev.ini
  41. +1 −0 mk/{macosx → macos}/glest.ini
  42. +8 −3 mk/{macosx → macos}/make-binary-archive.sh
  43. +1 −1 mk/{macosx → macos}/make-release-archives.sh
  44. +4 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/base_content/.gitignore
  45. +4 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/.gitignore
  46. +1 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/bin
  47. +4 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/lib/.gitignore
  48. +4 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/win_x64/.gitignore
  49. +4 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/win_x86/.gitignore
  50. +1 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.bat
  51. +6 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.sh
  52. +25 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/base_content_build_578873.vdf
  53. +25 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/linux_x64_build_578871.vdf
  54. +16 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_linux_578870.vdf
  55. +16 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_windows_578870.vdf
  56. +25 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/win_x64_build_578874.vdf
  57. +25 −0 mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/win_x86_build_578872.vdf
  58. +1 −1 mk/windoze/Glest_vc2015.sln
  59. +2 −2 mk/windoze/Installer/MegaGlestInstaller.nsi
  60. +3 −3 mk/windoze/Installer/MegaGlestUpdater.nsi
  61. +1 −1 mk/windoze/build-mg-2010.bat
  62. +1 −1 mk/windoze/build-mg-2012.bat
  63. +4 −3 mk/windoze/build-mg-2015.bat
  64. +4 −3 mk/windoze/build-mg32bit-2015.bat
  65. +1 −1 mk/windoze/coverity-scan.bat
  66. +1 −0 mk/windoze/glest.ini
  67. +17 −14 mk/windoze/make-data-archive.bat
  68. +6 −0 mk/windoze/vc2015/g3d_viewer.vcxproj
  69. +6 −0 mk/windoze/vc2015/glest_editor.vcxproj
  70. +6 −0 mk/windoze/vc2015/glest_game.vcxproj
  71. +6 −0 mk/windoze/vc2015/megaglest_tests.vcxproj
  72. +35 −2 source/g3d_viewer/CMakeLists.txt
  73. +3 −3 source/g3d_viewer/main.cpp
  74. +43 −10 source/glest_game/CMakeLists.txt
  75. +17 −2 source/glest_game/ai/ai.cpp
  76. +1 −1 source/glest_game/ai/ai.h
  77. +17 −4 source/glest_game/ai/ai_rule.cpp
  78. +85 −41 source/glest_game/ai/path_finder.cpp
  79. +129 −16 source/glest_game/ai/path_finder.h
  80. +127 −39 source/glest_game/facilities/components.cpp
  81. +19 −9 source/glest_game/facilities/components.h
  82. +14 −16 source/glest_game/facilities/game_util.cpp
  83. +1 −1 source/glest_game/facilities/logger.cpp
  84. +1 −1 source/glest_game/game/chat_manager.cpp
  85. +65 −5 source/glest_game/game/console.cpp
  86. +22 −3 source/glest_game/game/console.h
  87. +15 −19 source/glest_game/game/game.cpp
  88. +1 −0 source/glest_game/game/game.h
  89. +7 −7 source/glest_game/game/game_settings.h
  90. +168 −1,177 source/glest_game/game/script_manager.cpp
  91. +5 −0 source/glest_game/game/script_manager.h
  92. +68 −150 source/glest_game/global/core_data.cpp
  93. +9 −0 source/glest_game/global/core_data.h
  94. +62 −17 source/glest_game/graphics/renderer.cpp
  95. +37 −5 source/glest_game/gui/gui.cpp
  96. +35 −4 source/glest_game/gui/selection.cpp
  97. +2 −2 source/glest_game/gui/selection.h
  98. +12 −2 source/glest_game/main/battle_end.cpp
  99. +33 −7 source/glest_game/main/main.cpp
  100. +4 −1 source/glest_game/main/program.cpp
  101. +10 −5 source/glest_game/menu/main_menu.cpp
  102. +82 −22 source/glest_game/menu/menu_state_connected_game.cpp
  103. +6 −1 source/glest_game/menu/menu_state_connected_game.h
  104. +21 −11 source/glest_game/menu/menu_state_custom_game.cpp
  105. +25 −35 source/glest_game/menu/menu_state_keysetup.cpp
  106. +22 −1 source/glest_game/menu/menu_state_new_game.cpp
  107. +69 −98 source/glest_game/menu/menu_state_options.cpp
  108. +1 −5 source/glest_game/menu/menu_state_options.h
  109. +68 −84 source/glest_game/menu/menu_state_options_graphics.cpp
  110. +43 −77 source/glest_game/menu/menu_state_options_network.cpp
  111. +25 −60 source/glest_game/menu/menu_state_options_sound.cpp
  112. +27 −12 source/glest_game/menu/menu_state_root.cpp
  113. +3 −1 source/glest_game/network/client_interface.cpp
  114. +8 −0 source/glest_game/network/network_message.cpp
  115. +1 −0 source/glest_game/network/network_message.h
  116. +40 −66 source/glest_game/network/server_interface.cpp
  117. +1 −0 source/glest_game/network/server_interface.h
  118. +2 −2 source/glest_game/sound/sound_renderer.cpp
  119. +1 −1 source/glest_game/sound/sound_renderer.h
  120. +10 −0 source/glest_game/type_instances/faction.cpp
  121. +63 −25 source/glest_game/type_instances/unit.cpp
  122. +4 −4 source/glest_game/type_instances/unit.h
  123. +29 −2 source/glest_game/types/command_type.cpp
  124. +4 −4 source/glest_game/types/faction_type.cpp
  125. +4 −0 source/glest_game/types/resource_type.cpp
  126. +27 −8 source/glest_game/types/skill_type.cpp
  127. +16 −1 source/glest_game/types/skill_type.h
  128. +20 −12 source/glest_game/types/tech_tree.cpp
  129. +21 −9 source/glest_game/types/unit_type.cpp
  130. +4 −0 source/glest_game/types/unit_type.h
  131. +5 −1 source/glest_game/types/upgrade_type.cpp
  132. +47 −8 source/glest_game/world/map.cpp
  133. +147 −6 source/glest_game/world/map.h
  134. +3 −3 source/glest_game/world/minimap.cpp
  135. +10 −2 source/glest_game/world/tileset.cpp
  136. +124 −49 source/glest_game/world/unit_updater.cpp
  137. +4 −1 source/glest_game/world/unit_updater.h
  138. +116 −25 source/glest_game/world/world.cpp
  139. +3 −3 source/glest_game/world/world.h
  140. +35 −2 source/glest_map_editor/CMakeLists.txt
  141. +25 −34 source/glest_map_editor/main.cpp
  142. +2 −2 source/glest_map_editor/main.h
  143. +2 −2 source/glest_map_editor/program.cpp
  144. +1 −1 source/glest_map_editor/program.h
  145. +1 −1 source/masterserver
  146. +41 −12 source/shared_lib/CMakeLists.txt
  147. +11 −1 source/shared_lib/include/graphics/font.h
  148. +8 −2 source/shared_lib/include/graphics/vec.h
  149. +1 −1 source/shared_lib/include/{streflop → platform/common}/streflop_cond.h
  150. +5 −3 source/shared_lib/include/platform/posix/socket.h
  151. +10 −9 source/shared_lib/include/platform/sdl/platform_main.h
  152. +6 −0 source/shared_lib/include/platform/sdl/thread.h
  153. +4 −0 source/shared_lib/include/platform/sdl/window.h
  154. +1 −1 source/shared_lib/include/sound/openal/sound_player_openal.h
  155. +1 −1 source/shared_lib/include/sound/sound_player.h
  156. +50 −15 source/shared_lib/include/streflop/CMakeLists.txt
  157. +1 −1 source/shared_lib/include/streflop/FPUCheck.h
  158. +1 −0 source/shared_lib/include/util/util.h
  159. +14 −6 source/shared_lib/sources/graphics/font.cpp
  160. +2 −1 source/shared_lib/sources/graphics/pixmap.cpp
  161. +5 −5 source/shared_lib/sources/lua/lua_script.cpp
  162. +16 −15 source/shared_lib/sources/map/map_preview.cpp
  163. +18 −16 source/shared_lib/sources/platform/common/platform_common.cpp
  164. +33 −15 source/shared_lib/sources/platform/posix/socket.cpp
  165. +22 −9 source/shared_lib/sources/platform/sdl/thread.cpp
  166. +55 −74 source/shared_lib/sources/platform/sdl/window.cpp
  167. +9 −3 source/shared_lib/sources/sound/openal/sound_player_openal.cpp
  168. +1 −1 source/shared_lib/sources/streflop/streflopC.cpp
  169. +3 −3 source/shared_lib/sources/util/randomgen.cpp
  170. +24 −16 source/shared_lib/sources/xml/xml_parser.cpp
  171. +49 −9 source/tests/CMakeLists.txt
  172. +27 −20 source/tools/convert_faction_xml2html/convert_faction_xml2html.pl
  173. +25 −2 source/tools/convert_faction_xml2html/make_html_for_git_docs.sh
  174. +4 −0 source/tools/convert_faction_xml2html/media/style.css
  175. +4 −4 source/tools/convert_faction_xml2html/megapack.ini
  176. +2 −2 source/tools/convert_faction_xml2html/setupDeps.sh
  177. +14 −6 source/tools/support/linux/system_report
  178. +5 −5 source/version.txt
View
@@ -1,12 +1,97 @@
#!/bin/sh
set -ex
wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
tar xf SDL2-2.0.3.tar.gz
(
cd SDL2-2.0.3
./configure --enable-static --disable-shared
make
sudo make install
)
#!/bin/bash
# script for use with travis and on linux only
#
# Copyright (c) 2015-2016 MegaGlest Team under GNU GPL v3.0+
export LANG=C
SCRIPTDIR="$(dirname "$(readlink -f "$0")")"
# ----------------------------------------------------------------------------
# Load shared functions
. $SCRIPTDIR/mk/linux/mg_shared.sh
detect_system
# ----------------------------------------------------------------------------
Compiler_name="$1"; Compiler_version="$2"
Compiler_version_grep="$(echo "$Compiler_version" | sed 's/\./\\./g')"
set -x
if [ "$Compiler_version" != "" ] && [ "$Compiler_version" != "default" ]; then
# UPDATE REPOS
sudo apt-get update -qq
sudo apt-get install -y -qq
set +x
if [ "$Compiler_name" = "gcc" ]; then
VersionAvByDefault="$(apt-cache search ^g[c+][c+]-[0-9] | grep -v '[0-9]-[a-zA-Z]' | grep "^gcc-$Compiler_version_grep")"
elif [ "$Compiler_name" = "clang" ]; then
VersionAvByDefault="$(apt-cache search ^clang-[0-9] | grep -v '[0-9]-[a-zA-Z]' | grep "^clang-$Compiler_version_grep")"
fi
set -x
if [ "$VersionAvByDefault" = "" ]; then
if [ "$distribution" = "Ubuntu" ]; then
if [ "$Compiler_name" = "gcc" ] || ( [ "$Compiler_name" = "clang" ] && [ "$codename" = "precise" ] ); then
# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
sudo add-apt-repository --yes "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${codename} main"
#sudo add-apt-repository --yes "deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${codename} main"
fi
fi
if [ "$distribution" = "Ubuntu" ] || [ "$distribution" = "Debian" ]; then
if [ "$Compiler_name" = "clang" ]; then
# http://apt.llvm.org/
sudo add-apt-repository --yes "deb http://apt.llvm.org/${codename}/ llvm-toolchain-${codename} main"
#sudo add-apt-repository --yes "deb-src http://apt.llvm.org/${codename}/ llvm-toolchain-${codename} main"
sudo add-apt-repository --yes "deb http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${Compiler_version} main"
#sudo add-apt-repository --yes "deb-src http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${Compiler_version} main"
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
fi
fi
fi
fi
set -e
if [ "$VersionAvByDefault" = "" ]; then
# UPDATE REPOS
sudo apt-get update -qq
#sudo apt-get upgrade -qq # UPGRADE SYSTEM TO LATEST PATCH LEVEL
sudo apt-get install -y -qq
fi
if [ "$Compiler_version" != "" ] && [ "$Compiler_version" != "default" ]; then
if [ "$Compiler_name" = "gcc" ]; then
set +ex
Gcc_AvSepGpp="$(apt-cache search ^g[c+][c+]-[0-9] | grep -v '[0-9]-[a-zA-Z]' | grep "^g++-$Compiler_version_grep")"
set -ex
if [ "$Gcc_AvSepGpp" = "" ]; then
sudo apt-get --allow-unauthenticated install -qq --force-yes gcc-${Compiler_version}
else
sudo apt-get --allow-unauthenticated install -qq --force-yes gcc-${Compiler_version} g++-${Compiler_version}
fi
elif [ "$Compiler_name" = "clang" ]; then
sudo apt-get --allow-unauthenticated install -qq --force-yes clang-${Compiler_version}
fi
fi
# what available versions we can use
set +x
apt-cache search ^g[c+][c+]-[0-9] | grep -v '[0-9]-[a-zA-Z]'
apt-cache search ^clang-[0-9] | grep -v '[0-9]-[a-zA-Z]'
set -x
# INSTALL OUR DEPENDENCIES
sudo $SCRIPTDIR/mk/linux/setupBuildDeps.sh --quiet
if [ "$distribution" = "Ubuntu" ]; then
case $release in
12.04*)
SDL2_version="2.0.5"
wget https://www.libsdl.org/release/SDL2-${SDL2_version}.tar.gz
tar xf SDL2-${SDL2_version}.tar.gz
( cd SDL2-${SDL2_version}
./configure --enable-static --disable-shared
make
sudo make install )
;;
*)
;;
esac
fi
View
@@ -3,40 +3,37 @@ language: cpp
sudo: required
os:
- linux
- osx
compiler:
- gcc
- clang
env:
- GCC_VERSION="5"
- GCC_VERSION="native"
- LLVM_VERSION="3.7"
- LLVM_VERSION="native"
matrix:
exclude:
- compiler: gcc
env: LLVM_VERSION="3.7"
- compiler: gcc
env: LLVM_VERSION="native"
- compiler: clang
env: GCC_VERSION="5"
- compiler: clang
env: GCC_VERSION="native"
include:
- os: linux
compiler: gcc
env: Tr_Compiler_Version="6"
# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
dist: trusty # broken compiler on 12.04
- os: linux
compiler: gcc
env: Tr_Compiler_Version="default"
- os: linux
compiler: clang
env: Tr_Compiler_Version="3.9"
# http://apt.llvm.org/, compiler not newer than available on debian testing
# https://packages.debian.org/search?suite=testing&keywords=clang-
dist: trusty
- os: linux
compiler: clang
env: LLVM_VERSION="native" # broken compiler
env: Tr_Compiler_Version="default"
dist: trusty # broken compiler on 12.04
- os: osx
compiler: gcc # unsupported compiler
#osx_image: xcode6.4 # seems broken and has lower priority in queue than default one
env: Tr_Xcode_Version="default"
#env: Tr_Xcode_Version="6.4"
# https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
# https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements
fast_finish: true
allow_failures:
- os: osx
compiler: clang
env: LLVM_VERSION="3.7" # missing compiler by brew
#allow_failures:
# - os: osx
# it's not really acceptable to wait 40 minutes or sometimes up to even 3 hours
# for the result just because the queue for mac is always so long
git:
submodules: false
@@ -46,30 +43,26 @@ git:
# - master
before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GCC_VERSION" != "native" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi
# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main"; fi
# http://llvm.org/apt/
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi # UPDATE REPOS
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then ./.travis-before_install.sh "$CC" "$Tr_Compiler_Version"; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
#- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get upgrade -qq; fi # UPGRADE SYSTEM TO LATEST PATCH LEVEL
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -y -qq; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then sudo apt-get install -qq gcc-${GCC_VERSION} g++-${GCC_VERSION}; fi
- if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi
- if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mk/linux/setupBuildDeps.sh --quiet; fi # INSTALL OUR DEPENDENCIES
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit glib fribidi miniupnpc wxmac; fi
# ^ not on travis also needed are: cmake + pkgconfig + xquartz (find by "search") + (maybe) git + (maybe) bash
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew outdated cmake || brew upgrade cmake; brew outdated pkgconfig || brew upgrade pkgconfig; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew link --force gettext; fi
# ^ odd linking problems related with brew which is not creating links
- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew install Caskroom/cask/xquartz; fi
- if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" = "gcc" ]; then export CXX="g++-${Tr_Compiler_Version}" CC="gcc-${Tr_Compiler_Version}"; fi
- if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" == "clang" ]; then export CXX="clang++-${Tr_Compiler_Version}" CC="clang-${Tr_Compiler_Version}"; fi
- $CC --version
- $CXX --version
- cmake --version
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo ./.travis-before_install.sh; fi
script:
# ALL THE BUILD COMMANDS HERE
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then mk/linux/build-mg.sh -c 4; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macosx/build-mg.sh -c 4; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then mk/linux/build-mg.sh -c 4; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then mk/linux/build-mg.sh -w -c 4; fi
# ^ -w may be removed on more modern dist: than trusty, problems related with 'new wx+clang+old gcc'
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-mg.sh -c 4; fi
# https://docs.travis-ci.com/user/notifications/#IRC-notification
notifications:
@@ -80,7 +73,4 @@ notifications:
use_notice: true
on_success: change
template:
#- "[%{repository_slug}#%{branch} @%{commit}] %{author}): %{message}"
#- "Diff: %{compare_url}"
#- "Build: %{build_url}"
- "[%{repository_name}#%{branch}@%{commit}] %{author}: %{message} %{build_url}"
View
@@ -97,7 +97,7 @@ ENDIF()
## Compiler flags, CPACK configuration and other Apple specific code.
IF(APPLE)
include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)
include(${PROJECT_SOURCE_DIR}/mk/macos/CMakeLists.txt)
ENDIF(APPLE)
IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
@@ -227,7 +227,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
# Get the current commit SHA1
execute_process(
COMMAND git log -1 --format=%h
COMMAND git log -1 --format=%h --abbrev=7
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_SHA1
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -241,7 +241,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h`")
SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h --abbrev=7`")
MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]")
@@ -282,8 +282,10 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
ENDFOREACH()
ENDIF()
IF(NOT CUSTOM_DATA_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
SET(CUSTOM_DATA_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)")
IF(NOT WANT_SINGLE_INSTALL_DIRECTORY)
IF(NOT CUSTOM_DATA_INSTALL_PATH)
SET(CUSTOM_DATA_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)")
ENDIF()
SET(CUSTOM_DATA_INSTALL_PATH_VALUE "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}")
ENDIF()
@@ -337,7 +339,7 @@ OPTION(WANT_DEV_OUTPATH "Use developer friendly output paths." OFF)
IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/")
ELSEIF(UNIX AND APPLE)
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macosx/")
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macos/")
ELSEIF(UNIX AND NOT APPLE)
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/other_unix/")
ELSE()
View
@@ -10,8 +10,8 @@ MegaGlest is an entertaining free (freeware and free software)
and open source cross-platform 3D real-time strategy (RTS) game,
where you control the armies of one of seven different factions:
Tech, Magic, Egypt, Indians, Norsemen, Persian or Romans. The
game is setup in one of 17 naturally looking settings, which
-like the unit models- are crafted with great appreciation for
game is played in one of 17 naturally looking settings, which,
like the unit models, are crafted with great attention to
detail. A lot of additional game data can be downloaded from
within the game at no cost.
@@ -22,10 +22,12 @@ within the game at no cost.
[![intro](http://megaglest.org/uploads/images/trailer3.png)]
(http://downloads.megaglest.org/videos/megaglest_game_trailer_lq.webm)
If you want compile MegaGlest yourself then you should read the
[**tutorial**](https://docs.megaglest.org/MG/Development) or
[tutorial2](https://github.com/MegaGlest/megaglest-source/wiki/Git-How-To)
If you want to compile MegaGlest yourself, you should read the following:
[Development Tutorial](https://docs.megaglest.org/MG/Development)
go to the [Main Repository](https://github.com/MegaGlest/megaglest-source)
( e.g. from the fork ... )
[Git Workflow](https://github.com/MegaGlest/megaglest-source/wiki/Git-How-To)
Return to the main (upstream) repository [**here**](https://github.com/MegaGlest/megaglest-source)
Submodule glest_game updated 643 files
View
@@ -4,6 +4,22 @@ MEGAGLEST CHANGELOG
To see a timeline of detail changes please visit:
https://github.com/MegaGlest/megaglest-source/commits/master
v3.13.0
- important sounds like "attack alarm" are always played
- display build/morph/upgrade time
- new AI tag <ai-build-size> for units(buildings) which allows fake size for buildings
while placing them
- much better error handling and messages especially for modders and xml-related problems
- fix unwanted double event for some keys ( like alt+enter )
- map filter option for game setup on headless server
- option to select/command multiple buildings of same type ( uniform-selection )
- major cross platform OOS fix which especially showed up quite often when playing without
fog of war
- you must prove basic game knowledge before you can play online by winning a special scenario
- less visible parts of black squares while rendering cliffs
- possibility to let units spawn units on death
- improved AI behavior per faction ( mostly magic )
v3.12.0
- MegaGlest uses SDL2 now
- glowing meshes. ( models can glow like particles do )
@@ -16,12 +32,12 @@ v3.12.0
v3.11.1
- no more false clicks when commanding via mini map
- map editor has a more useful and powerful map height randomizer
- map editor saves all maps with .mgm ending by default.
- map editor saves all maps with .mgm ending by default
- fixed map editor ( several linux distributions had trouble )
- for missing tilesets and techs optional download from mod center instead of server. (bugfix)
- healthbar default set to "if needed"
- nicer tilesets as defaults
- improved camera startposition on game start ( main building in center ).
- improved camera startposition on game start ( main building in center )
- attackBoosts: Ep + Hp regeneration is shown in description
- MegaGlest can be build easier on MacOS ( sadly noone was willing to test )
Oops, something went wrong.

0 comments on commit 967257e

Please sign in to comment.