# HG changeset patch
# User nemo
# Date 1293342438 18000
# Node ID 5160cb2f737b8c23484a15b57470299a4e63621b
# Parent  6fbce14e2e2cf79fe9e6517739bb5556c44e964b# Parent  3682db294daee505ca701d201628463277605c5e
pull in a few changes from default

diff -r 3682db294dae -r 5160cb2f737b CMakeLists.txt
--- a/CMakeLists.txt	Sun Dec 26 00:28:23 2010 -0500
+++ b/CMakeLists.txt	Sun Dec 26 00:47:18 2010 -0500
@@ -8,7 +8,7 @@
 ENDIF()
 
 #detect Mercurial revision (if present)
-set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
+#set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
 IF(version_suffix MATCHES "-dev")
 	set(HW_DEV true)
 	IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.hg)
@@ -165,7 +165,7 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(HEDGEWARS_PROTO_VER 34)
+set(HEDGEWARS_PROTO_VER 37)
 
 if(WITH_SERVER)
 	message(STATUS "Server is going to be built! Make sure you have GHC installed")
diff -r 3682db294dae -r 5160cb2f737b ChangeLog.txt
--- a/ChangeLog.txt	Sun Dec 26 00:28:23 2010 -0500
+++ b/ChangeLog.txt	Sun Dec 26 00:47:18 2010 -0500
@@ -1,6 +1,31 @@
 + features
 * bugfixes
 
+0.9.14 -> 0.9.15:
+ + Ability to create, save and load hand drawn maps
+ + New maps: Capture the Flag (Blizzard) Map
+ + New themes: Christmas
+ + Snowflakes on Christmas/Snow themes accumulates on the ground
+ + New game modifiers: No wind, More wind
+ + New missions: Dangerous ducklings, Diver, Spooky tree, Teamwork
+ + New weapons: Mudball, Drill strike
+ + Many more Lua hooks
+ + Readytimer
+ + Ability to edit seed
+ + Ability to select gameplay scripts
+ + New gameplay scripts: Capture the Flag, No jumping, Random weapon
+ + New Lua unified translation framework
+ + Code refactoring
+ + Max teams upped to 8
+ + Cosmetic enhancements to Napalm strike
+ + Selecting a game scheme selects the corresponding weapon set
+ + Dust when drills dig
+ + New hats: beaver, porkey, sheep
+ + Add density property to Gears
+ + Reworked management of schemes and weapon sets
+ + Explosions detach rope from land
+ + Allow hog speech when not your turn
+
 0.9.13 -> 0.9.14:
  + New audio tracks
  + New forts: EvilChicken, Tank
diff -r 3682db294dae -r 5160cb2f737b gameServer/HWProtoInRoomState.hs
--- a/gameServer/HWProtoInRoomState.hs	Sun Dec 26 00:28:23 2010 -0500
+++ b/gameServer/HWProtoInRoomState.hs	Sun Dec 26 00:47:18 2010 -0500
@@ -37,7 +37,7 @@
 handleCmd_inRoom clID clients rooms ("ADD_TEAM" : name : color : grave : fort : voicepack : flag : difStr : hhsInfo)
     | length hhsInfo == 15 && clientProto client < 30 = handleCmd_inRoom clID clients rooms ("ADD_TEAM" : name : color : grave : fort : voicepack : " " : flag : difStr : hhsInfo)
     | length hhsInfo /= 16 = [ProtocolError "Corrupted hedgehogs info"]
-    | length (teams room) == 6 = [Warning "too many teams"]
+    | length (teams room) == 8 = [Warning "too many teams"]
     | canAddNumber <= 0 = [Warning "too many hedgehogs"]
     | isJust findTeam = [Warning "There's already a team with same name in the list"]
     | gameinprogress room = [Warning "round in progress"]