# HG changeset patch
# User nemo
# Date 1289765162 18000
# Node ID 85e02b1a8e8f3b887862085c7e1f62837eff92f5
# Parent 6b946b93761f027125a504c504db5f3229a067db# Parent c279aeb615dfc34b006471d9e7b1cce472260a25
merge 0.9.14.1 to trunk
diff -r 6b946b93761f -r 85e02b1a8e8f CMakeLists.txt
diff -r 6b946b93761f -r 85e02b1a8e8f QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt Sun Nov 14 14:53:44 2010 -0500
+++ b/QTfrontend/CMakeLists.txt Sun Nov 14 15:06:02 2010 -0500
@@ -1,5 +1,5 @@
# Configure for Qt4
-set(QT_MIN_VERSION "4.4.0")
+set(QT_MIN_VERSION "4.5.0")
set(QT_USE_QTCORE TRUE)
set(QT_USE_QTGUI TRUE)
diff -r 6b946b93761f -r 85e02b1a8e8f QTfrontend/gamecfgwidget.cpp
diff -r 6b946b93761f -r 85e02b1a8e8f QTfrontend/gamecfgwidget.h
diff -r 6b946b93761f -r 85e02b1a8e8f QTfrontend/hwconsts.cpp.in
diff -r 6b946b93761f -r 85e02b1a8e8f QTfrontend/mapContainer.cpp
diff -r 6b946b93761f -r 85e02b1a8e8f QTfrontend/mapContainer.h
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/Actions.hs
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs Sun Nov 14 14:53:44 2010 -0500
+++ b/gameServer/CoreTypes.hs Sun Nov 14 15:06:02 2010 -0500
@@ -143,8 +143,8 @@
ServerInfo
True
"
http://www.hedgewars.org/
"
- "Hedgewars 0.9.14 is out! Please update.
Download page here
"
- 31
+ "Hedgewars 0.9.14.1 is out! Please update.
Download page here
"
+ 35
46631
0
""
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/HWProtoCore.hs
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/HWProtoInRoomState.hs
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/HWProtoLobbyState.hs
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/HWProtoNEState.hs
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/OfficialServer/DBInteraction.hs
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/Opts.hs
diff -r 6b946b93761f -r 85e02b1a8e8f gameServer/Utils.hs
--- a/gameServer/Utils.hs Sun Nov 14 14:53:44 2010 -0500
+++ b/gameServer/Utils.hs Sun Nov 14 15:06:02 2010 -0500
@@ -97,6 +97,7 @@
protoNumber2ver 32 = "0.9.14-dev"
protoNumber2ver 33 = "0.9.14"
protoNumber2ver 34 = "0.9.15-dev"
+protoNumber2ver 35 = "0.9.14.1"
protoNumber2ver _ = "Unknown"
askFromConsole :: String -> IO String
diff -r 6b946b93761f -r 85e02b1a8e8f hedgewars/GSHandlers.inc
diff -r 6b946b93761f -r 85e02b1a8e8f hedgewars/uAmmos.pas
--- a/hedgewars/uAmmos.pas Sun Nov 14 14:53:44 2010 -0500
+++ b/hedgewars/uAmmos.pas Sun Nov 14 15:06:02 2010 -0500
@@ -171,7 +171,10 @@
if Hedgehogs[i].Gear <> nil then
begin
Hedgehogs[i].Ammo:= GetAmmoByNum(Hedgehogs[i].AmmoStore);
- Hedgehogs[i].CurAmmoType:= amNothing;
+ if (GameFlags and gfPlaceHog) <> 0 then
+ Hedgehogs[i].CurAmmoType:= amTeleport
+ else
+ Hedgehogs[i].CurAmmoType:= amNothing
end
end
end;
diff -r 6b946b93761f -r 85e02b1a8e8f hedgewars/uConsts.pas
diff -r 6b946b93761f -r 85e02b1a8e8f hedgewars/uGears.pas
diff -r 6b946b93761f -r 85e02b1a8e8f tools/CMakeLists.txt
--- a/tools/CMakeLists.txt Sun Nov 14 14:53:44 2010 -0500
+++ b/tools/CMakeLists.txt Sun Nov 14 15:06:02 2010 -0500
@@ -17,7 +17,10 @@
find_package(SDL_mixer REQUIRED)
find_package(OGGVORBIS REQUIRED)
find_package(SPARKLE)
- find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac)
+
+ #use the associated tool from the libraries we've selected
+ string(REGEX REPLACE "(.*)/include;-.*" "\\1" qt_base_dir "${QT_INCLUDE_DIR}")
+ find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac PATH ${qt_base_dir})
if(NOT macdeployqt_EXE)
message(FATAL_ERROR "The utility macdeployqt is required to create the bundle!")
diff -r 6b946b93761f -r 85e02b1a8e8f tools/CreateMacBundle.cmake.in
--- a/tools/CreateMacBundle.cmake.in Sun Nov 14 14:53:44 2010 -0500
+++ b/tools/CreateMacBundle.cmake.in Sun Nov 14 15:06:02 2010 -0500
@@ -1,3 +1,5 @@
+message(STATUS "Performing standalone bundle creation...")
+
execute_process(COMMAND mkdir -p ${frameworks_dir})
execute_process(COMMAND ${macdeployqt_EXE} ${CMAKE_BINARY_DIR}/${bundle_name} OUTPUT_QUIET ERROR_QUIET)