# HG changeset patch # User sheepluva # Date 1420463009 -3600 # Node ID abeb23dca6e92c4b37aa2e287307231e30603386 # Parent fc37b9df2b03ffaf3dc61476cd6e812d87638740# Parent ae4565ab03fa4f9da73068fbf9896f71c9eb1010 Merge pull request #25 from LocutusOfBorg/translation Add LocutusOfBorg to IT translation credits diff -r ae4565ab03fa -r abeb23dca6e9 .travis.yml --- a/.travis.yml Sat Dec 27 10:39:11 2014 +0100 +++ b/.travis.yml Mon Jan 05 14:03:29 2015 +0100 @@ -11,13 +11,13 @@ # Debug build - BUILD_ARGS="-DCMAKE_BUILD_TYPE=Debug" # Everything that's optional + - BUILD_ARGS="-DBUILD_ENGINE_C=1" - BUILD_ARGS="-DNOPNG=1" - BUILD_ARGS="-DNOVIDEOREC=1" - BUILD_ARGS="-DNOSERVER=1" - BUILD_ARGS="-DLUA_SYSTEM=0" - BUILD_ARGS="-DPHYSFS_SYSTEM=0" - BUILD_ARGS="-DGL2=1" - - BUILD_ARGS="-DBUILD_ENGINE_C=1" matrix: allow_failures: # Failures we expect here @@ -27,10 +27,12 @@ script: - mkdir build && cd build && cmake $BUILD_ARGS .. && make VERBOSE=1 && make test_verbose notifications: + email: false irc: channels: - "chat.freenode.net#hedgewars" template: - "hw-build #%{build_number} (%{commit} by %{author}): %{message}" - "See details at %{build_url}" - email: false + on_success: change + on_failure: always diff -r ae4565ab03fa -r abeb23dca6e9 CMakeLists.txt --- a/CMakeLists.txt Sat Dec 27 10:39:11 2014 +0100 +++ b/CMakeLists.txt Mon Jan 05 14:03:29 2015 +0100 @@ -51,8 +51,8 @@ #versioning set(CPACK_PACKAGE_VERSION_MAJOR 0) set(CPACK_PACKAGE_VERSION_MINOR 9) -set(CPACK_PACKAGE_VERSION_PATCH 21) -set(HEDGEWARS_PROTO_VER 48) +set(CPACK_PACKAGE_VERSION_PATCH 22) +set(HEDGEWARS_PROTO_VER 50) set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") include(${CMAKE_MODULE_PATH}/revinfo.cmake) diff -r ae4565ab03fa -r abeb23dca6e9 ChangeLog.txt --- a/ChangeLog.txt Sat Dec 27 10:39:11 2014 +0100 +++ b/ChangeLog.txt Mon Jan 05 14:03:29 2015 +0100 @@ -8,10 +8,13 @@ + Highlander gamemode can now be used with custom weapon schemes (1-8=How probable to get this weapon. 9=All hogs get it) + New gameplay mode "Construction Mode" + New gameplay mode "TechRacer" + + New game play mode "DiagonalMaze" (generates a simple diagonal maze) + + Add 7 target practice missions, now with simple scoring + + Update RC Plane Challenge: Stats screen reworked and shows now several facts, simple ranking system based on used planes, some taunts in the game + New training/multiplayer mission: "Climb Home" + Game scheme screen has a "Script parameter" field now. This allows to make more customizable scripts/modes. + Network game rejoining. Note: Your team(s) will vanish after 3 turns. - + Visual and gameplay changes to "sea" - world edges. + + Visual and gameplay changes to "sea" - world edge, visual change to wrap world edge to allow seeing through the wrap, visual change to bounce worldedge + The map of the Basketball Mission can be selected for regular games again ("BasketballField") + New engine command: /togglechat will disable/enable chat display (does not affect chat history display) + Change to Racer: first weapon/utility available will be automatically selected on start @@ -32,13 +35,15 @@ + Moved room status filter to top left of rooms list. Lua API: + + New library: Params, makes parsing of script parameters easier + + New library: TargetPractice, used to generate target practice missions (the newly added missions use it) + More helpful syntax error messages. + New hooks: onParameters(paramString) -- called when script parameters are configured. the parameter contains the parameter(s) as text string onPreviewInit() -- called during map preview initialization onGearWaterSkip(gearUid) -- called when a gear skims the water without drowning (when hitting it with high speed at low angle). By checking gearUid you can figure out which gear that was. + New functions: - Dismissteam(teamname) -- removes a team from the game (note: if you used loc() on teamnames, don't forget to the translated teamname here too) + DismissTeam(teamname) -- removes a team from the game (note: if you used loc() on teamnames, don't forget to the translated teamname here too) GetGameFlag(gameflag) -- returns true/false PlaceSprite(x, y, sprite, frameIdx [, landFlag, ... ]) -- sprite refers to an id from the TSprite list SetWaterLine(waterline) -- moves water level to the specified y. the current value is in read-only global waterline diff -r ae4565ab03fa -r abeb23dca6e9 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sat Dec 27 10:39:11 2014 +0100 +++ b/QTfrontend/hwform.cpp Mon Jan 05 14:03:29 2015 +0100 @@ -1832,7 +1832,7 @@ if (hwnet) { NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet); - connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &))); + connect(hwnet, SIGNAL(netSchemeConfig(QStringList)), netAmmo, SLOT(setNetSchemeConfig(QStringList))); ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo); diff -r ae4565ab03fa -r abeb23dca6e9 QTfrontend/model/ammoSchemeModel.cpp --- a/QTfrontend/model/ammoSchemeModel.cpp Sat Dec 27 10:39:11 2014 +0100 +++ b/QTfrontend/model/ammoSchemeModel.cpp Mon Jan 05 14:03:29 2015 +0100 @@ -845,7 +845,7 @@ return netScheme[index.column()]; } -void NetAmmoSchemeModel::setNetSchemeConfig(QStringList & cfg) +void NetAmmoSchemeModel::setNetSchemeConfig(QStringList cfg) { if(cfg.size() != netScheme.size()) { diff -r ae4565ab03fa -r abeb23dca6e9 QTfrontend/model/ammoSchemeModel.h --- a/QTfrontend/model/ammoSchemeModel.h Sat Dec 27 10:39:11 2014 +0100 +++ b/QTfrontend/model/ammoSchemeModel.h Mon Jan 05 14:03:29 2015 +0100 @@ -70,7 +70,7 @@ QVariant data(const QModelIndex &index, int role) const; public slots: - void setNetSchemeConfig(QStringList & cfg); + void setNetSchemeConfig(QStringList cfg); private: QList netScheme; diff -r ae4565ab03fa -r abeb23dca6e9 QTfrontend/net/newnetclient.h --- a/QTfrontend/net/newnetclient.h Sat Dec 27 10:39:11 2014 +0100 +++ b/QTfrontend/net/newnetclient.h Mon Jan 05 14:03:29 2015 +0100 @@ -111,7 +111,7 @@ void roomNameUpdated(const QString & name); void askForRoomPassword(); - void netSchemeConfig(QStringList &); + void netSchemeConfig(QStringList); void paramChanged(const QString & param, const QStringList & value); void configAsked(); diff -r ae4565ab03fa -r abeb23dca6e9 QTfrontend/res/html/about.html --- a/QTfrontend/res/html/about.html Sat Dec 27 10:39:11 2014 +0100 +++ b/QTfrontend/res/html/about.html Mon Jan 05 14:03:29 2015 +0100 @@ -74,7 +74,7 @@ English: Andrey Korotaev <unC0Rr@gmail.com>
Finnish: Nina Kuisma <ninnnu@gmail.com>, Janne Uusitupa
French: Antoine Turmel <geekshadow@gmail.com>, Clement Woitrain <sphrixclement@gmail.com>, Matisumi
- German: Peter Hüwe <PeterHuewe@gmx.de>, Mario Liebisch <mario.liebisch@gmail.com>, Richard Karolyi <sheepluva@ercatec.net>
+ German: Peter Hüwe <PeterHuewe@gmx.de>, Mario Liebisch <mario.liebisch@gmail.com>, Richard Karolyi <sheepluva@ercatec.net>, Wuzzy <almikes@aol.com>
Greek: <talos_kriti@yahoo.gr>
Italian: Luca Bonora <bonora.luca@gmail.com>, Marco Bresciani <m.bresciani@email.it>, Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Japanese: ADAM Etienne <etienne.adam@gmail.com>, Marco Bresciani <m.bresciani@email.it>
diff -r ae4565ab03fa -r abeb23dca6e9 cmake_modules/CheckHaskellModuleExists.cmake --- a/cmake_modules/CheckHaskellModuleExists.cmake Sat Dec 27 10:39:11 2014 +0100 +++ b/cmake_modules/CheckHaskellModuleExists.cmake Mon Jan 05 14:03:29 2015 +0100 @@ -30,11 +30,11 @@ "-DPARAMETERS=${PARAMETERS}" -cpp -c "${CMAKE_MODULE_PATH}/checkModule.hs" + RESULT_VARIABLE COMMAND_RESULT ERROR_VARIABLE BUILD_ERROR OUTPUT_STRIP_TRAILING_WHITESPACE ) - - if("${BUILD_ERROR}" STREQUAL "") + if(${COMMAND_RESULT} EQUAL 0) message(STATUS "Looking for ${FUNCTION} in ${MODULE} - found") set(${VARIABLE} 1 CACHE INTERNAL "Have module ${MODULE}") file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log diff -r ae4565ab03fa -r abeb23dca6e9 gameServer/Actions.hs --- a/gameServer/Actions.hs Sat Dec 27 10:39:11 2014 +0100 +++ b/gameServer/Actions.hs Mon Jan 05 14:03:29 2015 +0100 @@ -415,11 +415,12 @@ processAction RemoveClientTeams = do (Just ci) <- gets clientIndex rnc <- gets roomsClients + n <- client's nick removeTeamActions <- io $ do rId <- clientRoomM rnc ci roomTeams <- room'sM rnc teams rId - return . Prelude.map (RemoveTeam . teamname) . Prelude.filter (\t -> teamownerId t == ci) $ roomTeams + return . Prelude.map (RemoveTeam . teamname) . Prelude.filter (\t -> teamowner t == n) $ roomTeams mapM_ processAction removeTeamActions diff -r ae4565ab03fa -r abeb23dca6e9 gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Sat Dec 27 10:39:11 2014 +0100 +++ b/gameServer/CoreTypes.hs Mon Jan 05 14:03:29 2015 +0100 @@ -162,7 +162,6 @@ data TeamInfo = TeamInfo { - teamownerId :: ClientIndex, teamowner :: B.ByteString, teamname :: B.ByteString, teamcolor :: B.ByteString, @@ -170,6 +169,7 @@ teamfort :: B.ByteString, teamvoicepack :: B.ByteString, teamflag :: B.ByteString, + isOwnerRegistered :: Bool, difficulty :: Int, hhnum :: Int, hedgehogs :: [HedgehogInfo] diff -r ae4565ab03fa -r abeb23dca6e9 gameServer/EngineInteraction.hs --- a/gameServer/EngineInteraction.hs Sat Dec 27 10:39:11 2014 +0100 +++ b/gameServer/EngineInteraction.hs Mon Jan 05 14:03:29 2015 +0100 @@ -102,7 +102,9 @@ , [eml ["eseed ", mParams Map.! "SEED"]] , [eml ["e$gmflags ", showB gameFlags]] , schemeFlags + , schemeAdditional , [eml ["e$template_filter ", mParams Map.! "TEMPLATE"]] + , [eml ["e$feature_size ", mParams Map.! "FEATURE_SIZE"]] , [eml ["e$mapgen ", mapgen]] , mapgenSpecific , concatMap teamSetup ti @@ -111,11 +113,11 @@ ] where keys1, keys2 :: Set.Set B.ByteString - keys1 = Set.fromList ["MAP", "MAPGEN", "MAZE_SIZE", "SEED", "TEMPLATE"] + keys1 = Set.fromList ["FEATURE_SIZE", "MAP", "MAPGEN", "MAZE_SIZE", "SEED", "TEMPLATE"] keys2 = Set.fromList ["AMMO", "SCHEME", "SCRIPT", "THEME"] sane = Set.null (keys1 Set.\\ Map.keysSet mParams) && Set.null (keys2 Set.\\ Map.keysSet prms) - && (not . null . drop 27 $ scheme) + && (not . null . drop 40 $ scheme) && (not . null . tail $ prms Map.! "AMMO") mapGenTypes = ["+rnd+", "+maze+", "+drawn+"] maybeScript = let s = head . fromMaybe ["Normal"] $ Map.lookup "SCRIPT" prms in if s == "Normal" then [] else [eml ["escript Scripts/Multiplayer/", s, ".lua"]] @@ -131,6 +133,7 @@ schemeFlags = map (\(v, (n, m)) -> eml [n, " ", showB $ (readInt_ v) * m]) $ filter (\(_, (n, _)) -> not $ B.null n) $ zip (drop (length gameFlagConsts) scheme) schemeParams + schemeAdditional = let scriptParam = B.tail $ scheme !! 41 in [eml ["e$scriptparam ", scriptParam] | not $ B.null scriptParam] ammoStr :: B.ByteString ammoStr = head . tail $ prms Map.! "AMMO" ammo = let l = B.length ammoStr `div` 4; ((a, b), (c, d)) = (B.splitAt l . fst &&& B.splitAt l . snd) . B.splitAt (l * 2) $ ammoStr in @@ -184,6 +187,7 @@ , ("e$healthdec", 1) , ("e$ropepct", 1) , ("e$getawaytime", 1) + , ("e$worldedge", 1) ] diff -r ae4565ab03fa -r abeb23dca6e9 gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Sat Dec 27 10:39:11 2014 +0100 +++ b/gameServer/HWProtoInRoomState.hs Mon Jan 05 14:03:29 2015 +0100 @@ -41,7 +41,7 @@ chans <- roomClientsChans let nicks = map (nick . client rnc) . roomClients rnc $ clientRoom rnc ci - let allPlayersRegistered = all ((<) 0 . B.length . webPassword . client rnc . teamownerId) $ teams rm + let allPlayersRegistered = all isOwnerRegistered $ teams rm if (playersIn rm == readyPlayers rm || clientProto cl > 43) && not (isJust $ gameInfo rm) then if enoughClans rm then @@ -87,15 +87,19 @@ return [Warning $ loc "Restricted"] else if isMaster cl then return [ - ModifyRoom f, + ModifyRoom $ f (clientProto cl), AnswerClients chans ("CFG" : paramName : paramStrs)] else return [ProtocolError $ loc "Not room master"] where - f r = if paramName `Map.member` (mapParams r) then + f clproto r = if paramName `Map.member` (mapParams r) then r{mapParams = Map.insert paramName (head paramStrs) (mapParams r)} else - r{params = Map.insert paramName paramStrs (params r)} + r{params = Map.insert paramName (fixedParamStr clproto) (params r)} + fixedParamStr clproto + | clproto /= 49 = paramStrs + | paramName /= "SCHEME" = paramStrs + | otherwise = L.init paramStrs ++ [B.replicate 50 'X' `B.append` L.last paramStrs] handleCmd_inRoom ("ADD_TEAM" : tName : color : grave : fort : voicepack : flag : difStr : hhsInfo) @@ -103,11 +107,13 @@ | otherwise = do (ci, _) <- ask rm <- thisRoom + cl <- thisClient clNick <- clientNick clChan <- thisClientChans othChans <- roomOthersChans roomChans <- roomClientsChans cl <- thisClient + let isRegistered = (<) 0 . B.length . webPassword $ cl teamColor <- if clientProto cl < 42 then return color @@ -115,7 +121,7 @@ liftM (head . (L.\\) (map B.singleton ['0'..]) . map teamcolor . teams) thisRoom let roomTeams = teams rm let hhNum = let p = if not $ null roomTeams then minimum [hhnum $ head roomTeams, canAddNumber roomTeams] else 4 in newTeamHHNum roomTeams p - let newTeam = clNick `seq` TeamInfo ci clNick tName teamColor grave fort voicepack flag dif hhNum (hhsList hhsInfo) + let newTeam = clNick `seq` TeamInfo clNick tName teamColor grave fort voicepack flag isRegistered dif hhNum (hhsList hhsInfo) return $ if not . null . drop (maxTeams rm - 1) $ roomTeams then [Warning $ loc "too many teams"] @@ -152,6 +158,7 @@ handleCmd_inRoom ["REMOVE_TEAM", tName] = do (ci, _) <- ask r <- thisRoom + clNick <- clientNick let maybeTeam = findTeam r let team = fromJust maybeTeam @@ -159,18 +166,18 @@ return $ if isNothing $ maybeTeam then [Warning $ loc "REMOVE_TEAM: no such team"] - else if ci /= teamownerId team then + else if clNick /= teamowner team then [ProtocolError $ loc "Not team owner!"] else [RemoveTeam tName, ModifyClient (\c -> c{ teamsInGame = teamsInGame c - 1, - clientClan = if teamsInGame c == 1 then Nothing else Just $ anotherTeamClan ci team r + clientClan = if teamsInGame c == 1 then Nothing else Just $ anotherTeamClan clNick team r }) ] where - anotherTeamClan ci team = teamcolor . fromMaybe (error "CHECKPOINT 011") . find (\t -> (teamownerId t == ci) && (t /= team)) . teams + anotherTeamClan clNick team = teamcolor . fromMaybe (error "CHECKPOINT 011") . find (\t -> (teamowner t == clNick) && (t /= team)) . teams findTeam = find (\t -> tName == teamname t) . teams @@ -207,16 +214,18 @@ let maybeTeam = findTeam r let team = fromJust maybeTeam + maybeClientId <- clientByNick $ teamowner team + let teamOwnerId = fromJust maybeClientId return $ if not $ isMaster cl then [ProtocolError $ loc "Not room master"] - else if isNothing maybeTeam then + else if isNothing maybeTeam || isNothing maybeClientId then [] else [ModifyRoom $ modifyTeam team{teamcolor = newColor}, AnswerClients others ["TEAM_COLOR", teamName, newColor], - ModifyClient2 (teamownerId team) (\c -> c{clientClan = Just newColor})] + ModifyClient2 teamOwnerId (\c -> c{clientClan = Just newColor})] where findTeam = find (\t -> teamName == teamname t) . teams diff -r ae4565ab03fa -r abeb23dca6e9 gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Sat Dec 27 10:39:11 2014 +0100 +++ b/gameServer/HWProtoLobbyState.hs Mon Jan 05 14:03:29 2015 +0100 @@ -105,7 +105,7 @@ : AnswerClients chans ["CLIENT_FLAGS", "-r", nick cl] : [(AnswerClients [sendChan cl] $ "JOINED" : nicks) | not $ null nicks] ) - ++ [ModifyRoom (\r -> let (t', g') = moveTeams clTeams . fromJust $ gameInfo r in r{gameInfo = Just g', teams = t'}) | not $ null clTeams] + -- ++ [ModifyRoom (\r -> let (t', g') = moveTeams clTeams . fromJust $ gameInfo r in r{gameInfo = Just g', teams = t'}) | not $ null clTeams] ++ [AnswerClients [sendChan cl] ["CLIENT_FLAGS", "+h", nick $ fromJust owner] | isJust owner] ++ [sendStateFlags cl jRoomClients | not $ null jRoomClients] ++ answerFullConfig cl jRoom diff -r ae4565ab03fa -r abeb23dca6e9 gameServer/OfficialServer/checker.hs --- a/gameServer/OfficialServer/checker.hs Sat Dec 27 10:39:11 2014 +0100 +++ b/gameServer/OfficialServer/checker.hs Mon Jan 05 14:03:29 2015 +0100 @@ -54,7 +54,7 @@ deriving Show serverAddress = "netserver.hedgewars.org" -protocolNumber = "47" +protocolNumber = "49" getLines :: Handle -> IO [B.ByteString] getLines h = g @@ -87,18 +87,18 @@ "ACHIEVEMENT" : typ : teamname : location : value : ps bs ps _ = [] -checkReplay :: Chan Message -> [B.ByteString] -> IO () -checkReplay coreChan msgs = do +checkReplay :: String -> String -> String -> Chan Message -> [B.ByteString] -> IO () +checkReplay home exe prefix coreChan msgs = do tempDir <- getTemporaryDirectory (fileName, h) <- openBinaryTempFile tempDir "checker-demo" B.hPut h . BW.pack . concat . map (fromMaybe [] . Base64.decode . B.unpack) $ msgs hFlush h hClose h - (_, _, Just hOut, _) <- createProcess (proc "/usr/home/unC0Rr/Sources/Hedgewars/Releases/0.9.20/bin/hwengine" + (_, _, Just hOut, _) <- createProcess (proc exe [fileName - , "--user-prefix", "/usr/home/unC0Rr/.hedgewars" - , "--prefix", "/usr/home/unC0Rr/Sources/Hedgewars/Releases/0.9.20/share/hedgewars/Data" + , "--user-prefix", home + , "--prefix", prefix , "--nomusic" , "--nosound" , "--stats-only" @@ -139,8 +139,8 @@ sendPacket packet = writeChan chan $ Packet packet -session :: B.ByteString -> B.ByteString -> Socket -> IO () -session l p s = do +session :: B.ByteString -> B.ByteString -> String -> String -> String -> Socket -> IO () +session l p home exe prefix s = do noticeM "Core" "Connected" coreChan <- newChan forkIO $ recvLoop s coreChan @@ -169,7 +169,7 @@ onPacket _ ["PING"] = answer ["PONG"] onPacket _ ["LOGONPASSED"] = answer ["READY"] onPacket chan ("REPLAY":msgs) = do - checkReplay chan msgs + checkReplay home exe prefix chan msgs warningM "Check" "Started check" onPacket _ ("BYE" : xs) = error $ show xs onPacket _ _ = return () @@ -187,18 +187,24 @@ updateGlobalLogger "Check" (setLevel DEBUG) updateGlobalLogger "Engine" (setLevel DEBUG) + d <- getHomeDirectory Right (login, password) <- runErrorT $ do - d <- liftIO $ getHomeDirectory conf <- join . liftIO . CF.readfile CF.emptyCP $ d ++ "/.hedgewars/settings.ini" l <- CF.get conf "net" "nick" p <- CF.get conf "net" "passwordhash" return (B.pack l, B.pack p) + Right (exeFullname, dataPrefix) <- runErrorT $ do + conf <- join . liftIO . CF.readfile CF.emptyCP $ d ++ "/.hedgewars/checker.ini" + l <- CF.get conf "engine" "exe" + p <- CF.get conf "engine" "prefix" + return (l, p) + Exception.bracket setupConnection (\s -> noticeM "Core" "Shutting down" >> sClose s) - (session login password) + (session login password (d ++ "/.hedgewars") exeFullname dataPrefix) where setupConnection = do noticeM "Core" "Connecting to the server..." diff -r ae4565ab03fa -r abeb23dca6e9 gameServer/Utils.hs --- a/gameServer/Utils.hs Sat Dec 27 10:39:11 2014 +0100 +++ b/gameServer/Utils.hs Mon Jan 05 14:03:29 2015 +0100 @@ -113,6 +113,8 @@ , (46, "0.9.20-dev") , (47, "0.9.20") , (48, "0.9.21-dev") + , (49, "0.9.21") + , (50, "0.9.22-dev") ] askFromConsole :: B.ByteString -> IO B.ByteString @@ -201,7 +203,7 @@ : (filter (\(p, _) -> p /= "SCHEME") $ Map.toList pr)) | clientProto cl < 48 = map (toAnswer cl) $ - ("FULLMAPCONFIG", tail $ Map.elems mpr) + ("FULLMAPCONFIG", let l = Map.elems mpr in if length l > 5 then tail l else l) : ("SCHEME", pr Map.! "SCHEME") : (filter (\(p, _) -> p /= "SCHEME") $ Map.toList pr) diff -r ae4565ab03fa -r abeb23dca6e9 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Sat Dec 27 10:39:11 2014 +0100 +++ b/hedgewars/uConsts.pas Mon Jan 05 14:03:29 2015 +0100 @@ -105,9 +105,9 @@ // To allow these to layer, going to treat them as masks. The bottom byte is reserved for objects // TODO - set lfBasic for all solid land, ensure all uses of the flags can handle multiple flag bits // lfObject and lfBasic are only to be different *graphically* in all other ways they should be treated the same - lfBasic = $8000; // white + lfBasic = $8000; // black lfIndestructible = $4000; // red - lfObject = $2000; + lfObject = $2000; // white lfDamaged = $1000; // lfIce = $0800; // blue lfBouncy = $0400; // green diff -r ae4565ab03fa -r abeb23dca6e9 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Sat Dec 27 10:39:11 2014 +0100 +++ b/hedgewars/uGearsHandlersMess.pas Mon Jan 05 14:03:29 2015 +0100 @@ -804,6 +804,8 @@ move:= true else if (xx > snowRight) or (xx < snowLeft) then move:=true + else if (cGravity < _0) and (yy < LAND_HEIGHT-1200) then + move:=true // Solid pixel encountered else if ((yy and LAND_HEIGHT_MASK) = 0) and ((xx and LAND_WIDTH_MASK) = 0) and (Land[yy, xx] <> 0) then begin @@ -920,7 +922,9 @@ end; Gear^.Pos:= 0; Gear^.X:= int2hwFloat(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft); - Gear^.Y:= int2hwFloat(LAND_HEIGHT + LongInt(GetRandom(50)) - 1325); + if (cGravity < _0) and (yy < LAND_HEIGHT-1200) then + Gear^.Y:= int2hwFloat(LAND_HEIGHT - 50 - LongInt(GetRandom(50))) + else Gear^.Y:= int2hwFloat(LAND_HEIGHT + LongInt(GetRandom(50)) - 1250); Gear^.State:= Gear^.State or gstInvisible; end end; diff -r ae4565ab03fa -r abeb23dca6e9 hedgewars/uGearsHandlersRope.pas --- a/hedgewars/uGearsHandlersRope.pas Sat Dec 27 10:39:11 2014 +0100 +++ b/hedgewars/uGearsHandlersRope.pas Mon Jan 05 14:03:29 2015 +0100 @@ -29,7 +29,7 @@ uAmmos, uDebug, uUtils, uGearsHedgehog, uGearsRender; const - IsNilHHFatal = true; + IsNilHHFatal = false; procedure doStepRopeAfterAttack(Gear: PGear); var diff -r ae4565ab03fa -r abeb23dca6e9 hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Sat Dec 27 10:39:11 2014 +0100 +++ b/hedgewars/uGearsHedgehog.pas Mon Jan 05 14:03:29 2015 +0100 @@ -834,7 +834,9 @@ Gear^.Hedgehog^.visStepPos:= (Gear^.Hedgehog^.visStepPos + 1) and 7; - if (not cArtillery) and ((Gear^.Message and gmPrecise) = 0) then + if (not cArtillery or + ((CurAmmoGear <> nil) and (CurAmmoGear^.Kind = gtBlowTorch))) and + ((Gear^.Message and gmPrecise) = 0) then MakeHedgehogsStep(Gear); SetAllHHToActive(false); diff -r ae4565ab03fa -r abeb23dca6e9 hedgewars/uLand.pas --- a/hedgewars/uLand.pas Sat Dec 27 10:39:11 2014 +0100 +++ b/hedgewars/uLand.pas Mon Jan 05 14:03:29 2015 +0100 @@ -56,18 +56,18 @@ begin yd:= LAND_HEIGHT - 1; repeat - while (yd > 0) and (Land[yd, x] = 0) do dec(yd); + while (yd > 0) and (Land[yd, x] <> lfBasic) do dec(yd); if (yd < 0) then yd:= 0; - while (yd < LAND_HEIGHT) and (Land[yd, x] <> 0) do + while (yd < LAND_HEIGHT) and (Land[yd, x] = lfBasic) do inc(yd); dec(yd); yu:= yd; - while (yu > 0 ) and (Land[yu, x] <> 0) do dec(yu); - while (yu < yd ) and (Land[yu, x] = 0) do inc(yu); + while (yu > 0 ) and (Land[yu, x] = lfBasic) do dec(yu); + while (yu < yd ) and (Land[yu, x] <> lfBasic) do inc(yu); if (yd < LAND_HEIGHT - 1) and ((yd - yu) >= 16) then begin diff -r ae4565ab03fa -r abeb23dca6e9 hedgewars/uLandGenPerlin.pas --- a/hedgewars/uLandGenPerlin.pas Sat Dec 27 10:39:11 2014 +0100 +++ b/hedgewars/uLandGenPerlin.pas Mon Jan 05 14:03:29 2015 +0100 @@ -97,11 +97,6 @@ grad(p[BB ], x-N , y-N))); end; -function f(t: double): double; inline; -begin - f:= t * t * t * (t * (t * 6 - 15) + 10); -end; - procedure inoise_setup(); var i, ii, t: Longword; begin @@ -130,7 +125,8 @@ margin = 200; procedure GenPerlin; -var y, x, {dy, }di, dj, df, r, param1, param2, rCutoff, detail: LongInt; +var y, x, di, dj, r, param1, param2, rCutoff, detail: LongInt; +var df: Int64; begin param1:= cTemplateFilter div 3; param2:= cTemplateFilter mod 3; diff -r ae4565ab03fa -r abeb23dca6e9 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Sat Dec 27 10:39:11 2014 +0100 +++ b/hedgewars/uStore.pas Mon Jan 05 14:03:29 2015 +0100 @@ -611,17 +611,17 @@ // loading failed if tmpsurf = nil then begin - - // anounce that loading failed - OutError(msgFailed, false); - // output sdl error if loading failed when data source was available if rwops <> nil then begin + // anounce that loading failed + OutError(msgFailed, false); + SDLTry(false, (imageFlags and ifCritical) <> 0); // rwops was already freed by IMG_Load_RW rwops:= nil; - end; + end else + OutError(msgFailed, (imageFlags and ifCritical) <> 0); exit; end; diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Graphics/amRubber.png Binary file share/hedgewars/Data/Graphics/amRubber.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Locale/pl.txt --- a/share/hedgewars/Data/Locale/pl.txt Sat Dec 27 10:39:11 2014 +0100 +++ b/share/hedgewars/Data/Locale/pl.txt Mon Jan 05 14:03:29 2015 +0100 @@ -58,6 +58,7 @@ 00:54=Miotacz błota 00:55=Zamrażarka 00:56=Tasak +00:57=Guma 01:00=Walczmy! 01:01=Remis @@ -81,6 +82,9 @@ 01:19=Ekstremalne 01:20=%1 odbicie 01:21=Dźwięk wyciszony +01:22=Tryb AFK +01:23=Automatyczne wyłączanie kamery +01:24=Automatyczne włączanie kamery ; Event messages ; Hog (%1) died @@ -544,6 +548,7 @@ 03:54=Narzędzie 03:55=Przełammy lody! 03:56=Nie przytnij sobie igieł! +03:57=Narzędzie ; Weapon Descriptions (use | as line breaks) 04:00=Atakuj przeciwników zwykłym granatem.|Wybuchnie kiedy zapalnik skończy odliczanie.|1-5: Ustawia zapalnik|Atak: Przytrzymaj by rzucić z większą siłą @@ -604,6 +609,7 @@ 04:54=Wystrzel strumień kleistej mazi.|Buduj mosty, zasypuj wrogów, zatykaj tunele.|Uważaj by nie zasypać samego siebie! 04:55=Epoka lodowcowa powraca!!|Zamroź jeże, uczyń podłoże śliskim lub zapobiegnij|utonięciu zamrażając wodę.|Atak: Strzał 04:56=Rzuć w przeciwnika dwoma tasakami i zablokuj mu |drogę lub użyj ich do wspinaczki! Jednak uważaj! |Te tasaki są naprawdę ostre!|Atak: Przytrzymaj by rzucić z większą siłą (dwukrotnie) +04:57=Budowanie elastyczny pasek wykonany z gumy,|z których jeże i inne rzeczy|odbijają się bez obrażeń upadku.|Lewo/Prawo: Zmiana orientacji pasek gumy|Kursor: Umieść pasek gumy w aktualnej pozycji ; Game goal strings 05:00=Ustawienia gry diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Sat Dec 27 10:39:11 2014 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Mon Jan 05 14:03:29 2015 +0100 @@ -526,7 +526,7 @@ -- bazooka - grenade - rope - parachute - deagle - btorch - construct - portal - rcplane SaveCampaignVar("HeroAmmo", GetAmmoCount(hero.gear, amBazooka)..GetAmmoCount(hero.gear, amGrenade).. GetAmmoCount(hero.gear, amRope)..GetAmmoCount(hero.gear, amParachute)..GetAmmoCount(hero.gear, amDEagle).. - GetAmmoCount(hero.gear, amBlowTorch)..GetAmmoCount(hero.gear, amConstruction).. + GetAmmoCount(hero.gear, amBlowTorch)..GetAmmoCount(hero.gear, amGirder).. GetAmmoCount(hero.gear, amPortalGun)..GetAmmoCount(hero.gear, amRCPlane)) AnimCaption(hero.gear, loc("Checkpoint reached!"), 5000) end @@ -542,7 +542,7 @@ AddAmmo(hero.gear, amBlowTorch, tonumber(ammo:sub(6,6))) -- weird, if 0 bazooka isn't displayed in the weapons menu if tonumber(ammo:sub(7,7)) > 0 then - AddAmmo(hero.gear, amConstruction, tonumber(ammo:sub(7,7))) + AddAmmo(hero.gear, amGirder, tonumber(ammo:sub(7,7))) end AddAmmo(hero.gear, amPortalGun, tonumber(ammo:sub(8,8))) AddAmmo(hero.gear, amRCPlane, tonumber(ammo:sub(9,9))) diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Scripts/Multiplayer/Gravity.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Gravity.lua Sat Dec 27 10:39:11 2014 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Gravity.lua Mon Jan 05 14:03:29 2015 +0100 @@ -17,7 +17,12 @@ function grav_onNewTurn() - SetGravity(gravity) + if delta ~= nil and period == nil then + SetGravity(gravity) + else + SetGravity(div(gravity, mln)) + end + wdGameTicks = GameTime if script2_onNewTurn ~= nil then @@ -36,7 +41,7 @@ if delta == nil then if periodtimer == 0 then periodtimer = period * 2 - SetGravity(div(GetRandom(maxgravity - mingravity) + mingravity, mln)) + SetGravity(div(GetRandom(maxgravity - mingravity + 1) + mingravity, mln)) else periodtimer = periodtimer - 1 end diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/CMakeLists.txt --- a/share/hedgewars/Data/Themes/CMakeLists.txt Sat Dec 27 10:39:11 2014 +0100 +++ b/share/hedgewars/Data/Themes/CMakeLists.txt Mon Jan 05 14:03:29 2015 +0100 @@ -21,6 +21,7 @@ Golf Halloween Hell + Hoggywood Island Jungle Nature diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/BlueWater.svg diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/CandyCane.png Binary file share/hedgewars/Data/Themes/Cake/CandyCane.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Cherry.png Binary file share/hedgewars/Data/Themes/Cake/Cherry.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Cherry.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Cherry.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,311 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Chunk.png Binary file share/hedgewars/Data/Themes/Cake/Chunk.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Chunk.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Chunk.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,12078 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Clouds.png Binary file share/hedgewars/Data/Themes/Cake/Clouds.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Clouds.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Clouds.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,280 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/CupCake.png Binary file share/hedgewars/Data/Themes/Cake/CupCake.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Droplet.png diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Droplet.svg diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Flake.png Binary file share/hedgewars/Data/Themes/Cake/Flake.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Flake.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Flake.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,155 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Gingerbread.png Binary file share/hedgewars/Data/Themes/Cake/Gingerbread.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Gingerbread.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Gingerbread.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,940 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Girder.png Binary file share/hedgewars/Data/Themes/Cake/Girder.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Girder.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Girder.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,138 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/IceCream.png Binary file share/hedgewars/Data/Themes/Cake/IceCream.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/IceCream.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/IceCream.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,2110 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/LandBackTex.png Binary file share/hedgewars/Data/Themes/Cake/LandBackTex.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/LandTex.png Binary file share/hedgewars/Data/Themes/Cake/LandTex.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/LandTex.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/LandTex.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,7229 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Lollipop.png Binary file share/hedgewars/Data/Themes/Cake/Lollipop.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Lollipop.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Lollipop.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,265 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Oreo.png Binary file share/hedgewars/Data/Themes/Cake/Oreo.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Oreo.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Oreo.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,721 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Oreo2.png Binary file share/hedgewars/Data/Themes/Cake/Oreo2.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/SDDroplet.png Binary file share/hedgewars/Data/Themes/Cake/SDDroplet.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/SDDroplet.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/SDDroplet.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,981 @@ + + + + + + + + image/svg+xml + + + + + Carlos Vives B. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/SDSplash.png Binary file share/hedgewars/Data/Themes/Cake/SDSplash.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/SDSplash.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/SDSplash.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,1004 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/SDWater.png Binary file share/hedgewars/Data/Themes/Cake/SDWater.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/SDWater.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/SDWater.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,595 @@ + + + + + + + + image/svg+xml + + + + + + Carlos Vives B. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Sky.png Binary file share/hedgewars/Data/Themes/Cake/Sky.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Sky.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Sky.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,888 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Snowball.png Binary file share/hedgewars/Data/Themes/Cake/Snowball.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Snowball.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/Snowball.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,80 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/Splash.png Binary file share/hedgewars/Data/Themes/Cake/Splash.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/amSnowball.png Binary file share/hedgewars/Data/Themes/Cake/amSnowball.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/amSnowball.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/amSnowball.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,96 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/icon.png Binary file share/hedgewars/Data/Themes/Cake/icon.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/icon@2x.png Binary file share/hedgewars/Data/Themes/Cake/icon@2x.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/icon@2x.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/icon@2x.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,3063 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/plant3.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Cake/plant3.svg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,496 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Cake/theme.cfg --- a/share/hedgewars/Data/Themes/Cake/theme.cfg Sat Dec 27 10:39:11 2014 +0100 +++ b/share/hedgewars/Data/Themes/Cake/theme.cfg Mon Jan 05 14:03:29 2015 +0100 @@ -1,11 +1,19 @@ -sky = 0, 0, 51 +sky = 14, 5, 36 border = 255, 200, 90 water-top = $FF, $DF, $E1 water-bottom = $FF, $DF, $E1 water-opacity = $80 +sd-water-top = 92, 5, 0 +sd-water-bottom = 75, 6, 2 +sd-water-opacity = 125 music = snow.ogg clouds = 9 -object = plant1, 3, 83, 215, 92, 35, 1, 0, 0, 250, 190 -object = plant2, 3, 118, 115, 41, 20, 1, 0, 0, 159, 110 -object = plant3, 3, 0, 115, 70, 40, 1, 8, 0, 60, 100 -flakes = 20, 100, 0, 30, 250 +object = Cherry, 1, 12, 181, 108, 9, 1, 3, 1, 124, 168 +object = Gingerbread, 3, 11, 173, 116, 11, 1, 6, 1, 123, 160 +object = CandyCane, 2, 0, 85, 25, 25, 2, 0, 0, 170, 70, 50, 70, 120, 40 +object = CupCake, 1, 20, 179, 121, 12, 1, 2, 1, 155, 171 +object = IceCream, 2, 0, 257, 45, 12, 1, 8, 1, 150, 236 +object = Lollipop, 2, 222, 120, 43, 15, 1, 0, 0, 220, 111 +spray = Oreo, 2 +spray = Oreo2, 2 +flakes = 55, 40, 99999999, 30, 200 diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/Border.png Binary file share/hedgewars/Data/Themes/Hoggywood/Border.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Hoggywood/CMakeLists.txt Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,6 @@ +file(GLOB images *.png) + +install(FILES + theme.cfg + ${images} + DESTINATION ${SHAREPATH}Data/Themes/Hoggywood) diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/Clouds.png Binary file share/hedgewars/Data/Themes/Hoggywood/Clouds.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/Flake.png Binary file share/hedgewars/Data/Themes/Hoggywood/Flake.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/Girder.png Binary file share/hedgewars/Data/Themes/Hoggywood/Girder.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/LandBackTex.png Binary file share/hedgewars/Data/Themes/Hoggywood/LandBackTex.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/LandTex.png Binary file share/hedgewars/Data/Themes/Hoggywood/LandTex.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/SDClouds.png Binary file share/hedgewars/Data/Themes/Hoggywood/SDClouds.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/SignL.png Binary file share/hedgewars/Data/Themes/Hoggywood/SignL.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/SignR.png Binary file share/hedgewars/Data/Themes/Hoggywood/SignR.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/Sky.png Binary file share/hedgewars/Data/Themes/Hoggywood/Sky.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/SkyL.png Binary file share/hedgewars/Data/Themes/Hoggywood/SkyL.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/SkyR.png Binary file share/hedgewars/Data/Themes/Hoggywood/SkyR.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/camera.png Binary file share/hedgewars/Data/Themes/Hoggywood/camera.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/clapper.png Binary file share/hedgewars/Data/Themes/Hoggywood/clapper.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/hogscar.png Binary file share/hedgewars/Data/Themes/Hoggywood/hogscar.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/horizont.png Binary file share/hedgewars/Data/Themes/Hoggywood/horizont.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/horizontL.png Binary file share/hedgewars/Data/Themes/Hoggywood/horizontL.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/icon.png Binary file share/hedgewars/Data/Themes/Hoggywood/icon.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/icon@2x.png Binary file share/hedgewars/Data/Themes/Hoggywood/icon@2x.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/palm.png Binary file share/hedgewars/Data/Themes/Hoggywood/palm.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/reel.png Binary file share/hedgewars/Data/Themes/Hoggywood/reel.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/reel2.png Binary file share/hedgewars/Data/Themes/Hoggywood/reel2.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/star1.png Binary file share/hedgewars/Data/Themes/Hoggywood/star1.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/star2.png Binary file share/hedgewars/Data/Themes/Hoggywood/star2.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/star3.png Binary file share/hedgewars/Data/Themes/Hoggywood/star3.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/star4.png Binary file share/hedgewars/Data/Themes/Hoggywood/star4.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/star5.png Binary file share/hedgewars/Data/Themes/Hoggywood/star5.png has changed diff -r ae4565ab03fa -r abeb23dca6e9 share/hedgewars/Data/Themes/Hoggywood/theme.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Hoggywood/theme.cfg Mon Jan 05 14:03:29 2015 +0100 @@ -0,0 +1,22 @@ +sky = 100, 180, 220 +border = 71, 74, 93 +water-top = $54, $5C, $9D +water-bottom = $34, $3C, $7D +water-opacity = $80 +music = Rock.ogg +sd-music = hell.ogg +clouds = 32 +object = palm, 4, 169, 467, 61, 6, 2, 0, 0, 333, 238, 168, 237, 55, 92 +object = hogscar, 1, 20, 159, 70, 1, 1, 0, 0, 132, 140 +object = camera, 1, 25, 285, 92, 25, 1, 0, 0, 123, 222 +object = clapper, 1, 52, 227, 18, 5, 1, 0, 0, 263, 209 +object = reel, 1, 64, 128, 1, 1, 2, 0, 0, 150, 90, 170, 90, 49, 40 +object = reel2, 1, 40, 0, 20, 5, 1, 0, 45, 140, 175 +object = SignL, 1, 177, 15, 4, 39, 1, 0, 0, 160, 54 +object = SignR, 1, 0, 17, 5, 39, 1, 23, 0, 158, 56 +;spray = star1, 1 +;spary = star2, 1 +;spray = star3, 1 +spray = star4, 1 +spray = star5, 1 +flakes = 100, 3, 99999999, 10, 20