# HG changeset patch # User nemo # Date 1293380469 18000 # Node ID 4102737cf2acde5c83774917c05df86e750b7427 # Parent 6f74c97147fe122c38cf2ed5ed7cce24f0d5c4b4# Parent ac2cb3b99d700b11162bdd7f522850aef78d56a8 merge default into 0.9.15 diff -r ac2cb3b99d70 -r 4102737cf2ac CMakeLists.txt --- a/CMakeLists.txt Sun Dec 26 11:17:01 2010 -0500 +++ b/CMakeLists.txt Sun Dec 26 11:21:09 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 ac2cb3b99d70 -r 4102737cf2ac ChangeLog.txt --- a/ChangeLog.txt Sun Dec 26 11:17:01 2010 -0500 +++ b/ChangeLog.txt Sun Dec 26 11:21:09 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 ac2cb3b99d70 -r 4102737cf2ac doc/Release.txt --- a/doc/Release.txt Sun Dec 26 11:17:01 2010 -0500 +++ b/doc/Release.txt Sun Dec 26 11:21:09 2010 -0500 @@ -8,4 +8,5 @@ 8. Make packages 9. Test packages 10. Upload (hedgewars.org, fireforge.net, gna.org (rsync --delete -avr --rsh="ssh" . unc0rr@download.gna.org:/upload/hedgewars)) -11. Post news +11. Post news (hedgewars.org, hedgewars forum, fireforge.net, gna.org, happypenguin, etc.) +12. Make tag (svn copy svn+ssh://unc0rr@svn.fireforge.net/svnroot/hedgewars/branches/0.9.7 svn+ssh://unc0rr@svn.fireforge.net/svnroot/hedgewars/tags/0.9.7 -m "Tag for 0.9.7 release") \ No newline at end of file diff -r ac2cb3b99d70 -r 4102737cf2ac gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Sun Dec 26 11:17:01 2010 -0500 +++ b/gameServer/HWProtoInRoomState.hs Sun Dec 26 11:21:09 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"] diff -r ac2cb3b99d70 -r 4102737cf2ac hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Sun Dec 26 11:17:01 2010 -0500 +++ b/hedgewars/GSHandlers.inc Sun Dec 26 11:21:09 2010 -0500 @@ -1038,7 +1038,7 @@ if (Gear^.Timer mod 47) = 0 then begin // ok. this was an attempt to turn off dust if not actually drilling land. I have no idea why it isn't working as expected - //if ((y + 12 and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y + 12, x] > 255) then + if (( (y + 12) and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y + 12, x] > 255) then for i:= 0 to 1 do AddVisualGear(x - 5 + Random(10), y + 12, vgtDust); diff -r ac2cb3b99d70 -r 4102737cf2ac share/hedgewars/Data/Graphics/missions.png Binary file share/hedgewars/Data/Graphics/missions.png has changed diff -r ac2cb3b99d70 -r 4102737cf2ac share/hedgewars/Data/Graphics/missions.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Graphics/missions.svg Sun Dec 26 11:21:09 2010 -0500 @@ -0,0 +1,179 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +