--- 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)
--- 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
"<h2><p align=center><a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a></p></h2>"
- "<font color=yellow><h3 align=center>Hedgewars 0.9.14 is out! Please update.</h3><p align=center><a href=http://hedgewars.org/download.html>Download page here</a></font>"
- 31
+ "<font color=yellow><h3 align=center>Hedgewars 0.9.14.1 is out! Please update.</h3><p align=center><a href=http://hedgewars.org/download.html>Download page here</a></font>"
+ 35
46631
0
""
--- 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
--- 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;
--- 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!")
--- 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)