# HG changeset patch # User nemo # Date 1370026268 14400 # Node ID 2cdb0ed3813a1b30d8ae6fd0bf029b13de7089f9 # Parent 5533554726753f841b493266bba25ecc2522e064# Parent 4114ce5d885db270c456c2a0de46abc0789bb18b Merge 0.9.19 diff -r 553355472675 -r 2cdb0ed3813a CMakeLists.txt --- a/CMakeLists.txt Thu May 30 21:08:13 2013 +0900 +++ b/CMakeLists.txt Fri May 31 14:51:08 2013 -0400 @@ -377,5 +377,5 @@ endif() -include(${CMAKE_MODULE_PATH}/CPackConfig.cmake) +include(${CMAKE_MODULE_PATH}/cpackvars.cmake) diff -r 553355472675 -r 2cdb0ed3813a QTfrontend/main.cpp diff -r 553355472675 -r 2cdb0ed3813a cmake_modules/CPackConfig.cmake --- a/cmake_modules/CPackConfig.cmake Thu May 30 21:08:13 2013 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ - -# revision information in cpack-generated names -if(CMAKE_BUILD_TYPE MATCHES DEBUG) - set(full_suffix "${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION}") -else() - set(full_suffix "${HEDGEWARS_VERSION}") -endif() - -# CPack variables -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Hedgewars, a free turn-based strategy game") -set(CPACK_PACKAGE_VENDOR "Hedgewars Project") -set(CPACK_PACKAGE_FILE_NAME "Hedgewars-${full_suffix}") -set(CPACK_SOURCE_PACKAGE_FILE_NAME "hedgewars-src-${full_suffix}") -set(CPACK_SOURCE_GENERATOR "TBZ2") -set(CPACK_PACKAGE_EXECUTABLES "hedgewars" "Hedgewars") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "Hedgewars ${full_suffix}") -set(CPACK_STRIP_FILES true) - -if(WIN32 AND NOT UNIX) - set(CPACK_NSIS_DISPLAY_NAME "Hedgewars") - set(CPACK_NSIS_HELP_LINK "http://www.hedgewars.org/") - set(CPACK_NSIS_URL_INFO_ABOUT "http://www.hedgewars.org/") - set(CPACK_NSIS_CONTACT "unC0Rr@gmail.com") - set(CPACK_NSIS_MODIFY_PATH OFF) - set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") - set(CPACK_NSIS_MUI_FINISHPAGE_RUN "hedgewars${CMAKE_EXECUTABLE_SUFFIX}") - set(CPACK_NSIS_CREATE_ICONS "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Hedgewars.lnk' '$INSTDIR\\\\hedgewars.exe'") - set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "hedgewars") -endif(WIN32 AND NOT UNIX) - -set(CPACK_SOURCE_IGNORE_FILES - #temporary files - "~" - ".swp" - #version control - "\\\\.hg" - #output binary/library - "\\\\.exe$" - "\\\\.a$" - "\\\\.so$" - "\\\\.dylib$" - "\\\\.dll$" - "\\\\.ppu$" - "\\\\.o$" - "\\\\.cxx$" - #graphics - "\\\\.xcf$" - "\\\\.svg$" - "\\\\.svgz$" - "\\\\.psd$" - "\\\\.sifz$" - #misc - "\\\\.core$" - "\\\\.sh$" - "\\\\.orig$" - "\\\\.layout$" - "\\\\.db$" - "\\\\.dof$" - #archives - "\\\\.zip$" - "\\\\.gz$" - "\\\\.bz2$" - "\\\\.tmp$" - #cmake-configured files - "hwconsts\\\\.cpp$" - "config\\\\.inc$" - "hwengine\\\\.desktop$" - "Info\\\\.plist$" - #other cmake generated files - "Makefile" - "Doxyfile" - "CMakeFiles" - "[dD]ebug$" - "[rR]elease$" - "CPack" - "cmake_install\\\\.cmake$" - "CMakeCache\\\\.txt$" -# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libtremor" -# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libfreetype" -# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua" - "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge" - "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/frontlib" - "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/promotional_art" - "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/cmdlineClient" - "^${CMAKE_CURRENT_SOURCE_DIR}/tools/templates" - "^${CMAKE_CURRENT_SOURCE_DIR}/bin/checkstack*" - "^${CMAKE_CURRENT_SOURCE_DIR}/doc" - "^${CMAKE_CURRENT_SOURCE_DIR}/templates" - "^${CMAKE_CURRENT_SOURCE_DIR}/tmp" - "^${CMAKE_CURRENT_SOURCE_DIR}/utils" - "^${CMAKE_CURRENT_SOURCE_DIR}/share/hedgewars/Data/Maps/test" - "^${CMAKE_CURRENT_SOURCE_DIR}/install_manifest.txt" - "^${CMAKE_CURRENT_SOURCE_DIR}/CMakeCache.txt" - "^${CMAKE_CURRENT_SOURCE_DIR}/hedgewars\\\\." -) - -include(CPack) diff -r 553355472675 -r 2cdb0ed3813a cmake_modules/cpackvars.cmake --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cmake_modules/cpackvars.cmake Fri May 31 14:51:08 2013 -0400 @@ -0,0 +1,100 @@ + +# revision information in cpack-generated names +if(CMAKE_BUILD_TYPE MATCHES DEBUG) + set(full_suffix "${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION}") +else() + set(full_suffix "${HEDGEWARS_VERSION}") +endif() + +# CPack variables +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Hedgewars, a free turn-based strategy game") +set(CPACK_PACKAGE_VENDOR "Hedgewars Project") +set(CPACK_PACKAGE_FILE_NAME "Hedgewars-${full_suffix}") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "hedgewars-src-${full_suffix}") +set(CPACK_SOURCE_GENERATOR "TBZ2") +set(CPACK_PACKAGE_EXECUTABLES "hedgewars" "Hedgewars") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "Hedgewars ${full_suffix}") +set(CPACK_STRIP_FILES true) + +if(WIN32 AND NOT UNIX) + set(CPACK_NSIS_DISPLAY_NAME "Hedgewars") + set(CPACK_NSIS_HELP_LINK "http://www.hedgewars.org/") + set(CPACK_NSIS_URL_INFO_ABOUT "http://www.hedgewars.org/") + set(CPACK_NSIS_CONTACT "unC0Rr@gmail.com") + set(CPACK_NSIS_MODIFY_PATH OFF) + set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") + set(CPACK_NSIS_MUI_FINISHPAGE_RUN "hedgewars${CMAKE_EXECUTABLE_SUFFIX}") + set(CPACK_NSIS_CREATE_ICONS "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Hedgewars.lnk' '$INSTDIR\\\\hedgewars.exe'") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "hedgewars") +endif(WIN32 AND NOT UNIX) + +set(CPACK_SOURCE_IGNORE_FILES + #temporary files + "~" + ".swp" + #version control + "\\\\.hg" + #output binary/library + "\\\\.exe$" + "\\\\.a$" + "\\\\.so$" + "\\\\.dylib$" + "\\\\.dll$" + "\\\\.ppu$" + "\\\\.o$" + "\\\\.cxx$" + "\\\\.hi$" + #graphics + "\\\\.xcf$" + "\\\\.svg$" + "\\\\.svgz$" + "\\\\.psd$" + "\\\\.sifz$" + #misc + "\\\\.core$" + "\\\\.sh$" + "\\\\.orig$" + "\\\\.layout$" + "\\\\.db$" + "\\\\.dof$" + #archives + "\\\\.zip$" + "\\\\.gz$" + "\\\\.bz2$" + "\\\\.tmp$" + #cmake-configured files + "hwconsts\\\\.cpp$" + "config\\\\.inc$" + "hwengine\\\\.desktop$" + "Info\\\\.plist$" + #other cmake generated files + "Makefile" + "Doxyfile" + "CMakeFiles" + "[dD]ebug$" + "[rR]elease$" + "CPack" + "cmake_install\\\\.cmake$" + "cmake_uninstall\\\\.cmake$" + "CMakeCache\\\\.txt$" + "build_windows_.*\\\\.bat$" +# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libtremor" +# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libfreetype" +# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua" +# "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/frontlib" +# "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/cmdlineClient" + "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge" + "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/promotional_art" + "^${CMAKE_CURRENT_SOURCE_DIR}/tools/templates" + "^${CMAKE_CURRENT_SOURCE_DIR}/tools/drawMapTest" + "^${CMAKE_CURRENT_SOURCE_DIR}/doc" + "^${CMAKE_CURRENT_SOURCE_DIR}/tmp" + "^${CMAKE_CURRENT_SOURCE_DIR}/utils" + "^${CMAKE_CURRENT_SOURCE_DIR}/share/hedgewars/Data/Maps/test" + "^${CMAKE_CURRENT_SOURCE_DIR}/install_manifest.txt" + "^${CMAKE_CURRENT_SOURCE_DIR}/CMakeCache.txt" + "^${CMAKE_CURRENT_SOURCE_DIR}/hedgewars\\\\." +) + +include(CPack) diff -r 553355472675 -r 2cdb0ed3813a gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Thu May 30 21:08:13 2013 +0900 +++ b/gameServer/CoreTypes.hs Fri May 31 14:51:08 2013 -0400 @@ -238,8 +238,8 @@ ServerInfo True "

http://www.hedgewars.org/

" - "

Hedgewars 0.9.18 is out! Please update.

Download page here" - 43 -- latestReleaseVersion + "

Hedgewars 0.9.19 is out! Please update.

Download page here" + 45 -- latestReleaseVersion 41 -- earliestCompatibleVersion 46631 "" diff -r 553355472675 -r 2cdb0ed3813a gameServer/Utils.hs --- a/gameServer/Utils.hs Thu May 30 21:08:13 2013 +0900 +++ b/gameServer/Utils.hs Fri May 31 14:51:08 2013 -0400 @@ -90,6 +90,8 @@ , (42, "0.9.18-dev") , (43, "0.9.18") , (44, "0.9.19-dev") + , (45, "0.9.19") + , (46, "0.9.20-dev") ] askFromConsole :: B.ByteString -> IO B.ByteString diff -r 553355472675 -r 2cdb0ed3813a share/hedgewars/Data/Maps/Basketball/map.lua --- a/share/hedgewars/Data/Maps/Basketball/map.lua Thu May 30 21:08:13 2013 +0900 +++ b/share/hedgewars/Data/Maps/Basketball/map.lua Fri May 31 14:51:08 2013 -0400 @@ -1,6 +1,6 @@ -- Hedgewars - Basketball for 2+ Players -HedgewarsScriptLoad("Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local score = {[0] = 0, [1] = 0, [2] = 0, [3] = 0, [4] = 0, [5] = 0} diff -r 553355472675 -r 2cdb0ed3813a share/hedgewars/Data/Maps/CTF_Blizzard/map.lua --- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Thu May 30 21:08:13 2013 +0900 +++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Fri May 31 14:51:08 2013 -0400 @@ -91,7 +91,7 @@ -- add support for more players -- re-enable sudden death, but set water rise to 0 -HedgewarsScriptLoad("Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") --------------------------------------------------------------- ----------lots of bad variables and things diff -r 553355472675 -r 2cdb0ed3813a share/hedgewars/Data/Maps/Control/map.lua --- a/share/hedgewars/Data/Maps/Control/map.lua Thu May 30 21:08:13 2013 +0900 +++ b/share/hedgewars/Data/Maps/Control/map.lua Fri May 31 14:51:08 2013 -0400 @@ -49,7 +49,7 @@ --script begins ----------------- -HedgewarsScriptLoad("Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") --------------------------------------------------------------- ----------lots of bad variables and things diff -r 553355472675 -r 2cdb0ed3813a share/hedgewars/Data/Maps/Knockball/map.lua --- a/share/hedgewars/Data/Maps/Knockball/map.lua Thu May 30 21:08:13 2013 +0900 +++ b/share/hedgewars/Data/Maps/Knockball/map.lua Fri May 31 14:51:08 2013 -0400 @@ -1,6 +1,6 @@ -- Hedgewars - Knockball for 2+ Players -HedgewarsScriptLoad("Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local score = {[0] = 0, [1] = 0, [2] = 0, [3] = 0, [4] = 0, [5] = 0} diff -r 553355472675 -r 2cdb0ed3813a share/hedgewars/Data/Maps/TrophyRace/map.lua --- a/share/hedgewars/Data/Maps/TrophyRace/map.lua Thu May 30 21:08:13 2013 +0900 +++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua Fri May 31 14:51:08 2013 -0400 @@ -1,6 +1,6 @@ -- Hedgewars - Roperace for 2+ Players -HedgewarsScriptLoad("Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") -- store number of hedgehogs local numhhs = 0 diff -r 553355472675 -r 2cdb0ed3813a tools/build_windows.bat --- a/tools/build_windows.bat Thu May 30 21:08:13 2013 +0900 +++ b/tools/build_windows.bat Fri May 31 14:51:08 2013 -0400 @@ -40,7 +40,7 @@ echo Running cmake... set ERRORLEVEL= -cmake . -G "MinGW Makefiles" -DCMAKE_PREFIX_PATH="%CD%\misc\winutils\" -DPNG_LIBRARY="%CD%\misc\winutils\bin\libpng13.dll" -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" +cmake . -G "MinGW Makefiles" -DPNG_LIBRARY="%CD%\misc\winutils\bin\libpng13.dll" -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" -DCMAKE_PREFIX_PATH="%CD%\misc\winutils\" ::prefix should be last if %ERRORLEVEL% NEQ 0 goto exitpoint