# HG changeset patch # User unc0rr # Date 1311399117 -14400 # Node ID 3134fafcfe125c87513d2260d265c7800a38d232 # Parent 109e9b5761c2ce3475192974888ff8a9ce150516# Parent 99078dea3a8f36e6217c8bb5763c78d769e8cfd9 merge diff -r 109e9b5761c2 -r 3134fafcfe12 ChangeLog.txt --- a/ChangeLog.txt Sat Jul 23 09:30:51 2011 +0400 +++ b/ChangeLog.txt Sat Jul 23 09:31:57 2011 +0400 @@ -1,6 +1,46 @@ + features * bugfixes +0.9.15 -> ???: + + New modes: The Specialists, Space Invasion + + Installing content (anything under Data/ - maps, sounds, and any such stuff) to user profile allows custom adding/overriding of any Data/ content + + Sudden Death art + + New Weapon/Utility: Land Spray Gun + + New Game mode: Tag team + + Allow up to 8 teams in a game + + Shoppa scheme by default resets ammo + + Shots are on a tenth of a second delay instead of a 1 and a quarter second delay (fast deagle/portal fire) + + Defective mines explode if they take enough damage + + Rope head can attach to hogs/crates/barrels again (rope still passes through them) + + Control of grenade bounce + + Drill Strike bombs don't explode when leaving ground, but after a (customizable!) timer + + Ukranian localization of Default voice. support for localized voices + + Theme cleanup, including the new theme config file change + + Improvements in scoring and tracking damage + + Camera tracking now toggleable + + Mudball does not end turn + + Indicator for height of plane when using napalm + + Land smoothing (looks less pixelated on generation and damage) + + Improved lua script support (e.g. possibility to change hats) + * Prevent portaling to impossible locations better + * Snow accumulates more smoothly + * Rope should be less sticky now + * Fix for last portal shot always being yellow + * More accurate napalm strike drop location + * AI fixes + * Fixed locales, such as korean + * Code refactoring + * Various bug/leak fixes + +Frontend/Menu and Netgame: + + Drawing straight lines in drawn map mode + + Autokick ignored players joining your room + + Improved nick sorting in lobby and rooms. (not case-sensitive, letters first, friend @ top, ignored @ bottom) + + Display player count in lobby + + Lobby: Player names of online players can be clicked in chat directly so that you don't have to find them in the player list + * Fix invisible icons in popup menus + * Various fixes and adjustments + 0.9.14 -> 0.9.15: + Ability to create, save and load hand drawn maps + New maps: Capture the Flag (Blizzard) Map diff -r 109e9b5761c2 -r 3134fafcfe12 QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Sat Jul 23 09:30:51 2011 +0400 +++ b/QTfrontend/mapContainer.cpp Sat Jul 23 09:31:57 2011 +0400 @@ -175,7 +175,7 @@ connect(cbTemplateFilter, SIGNAL(activated(int)), this, SLOT(setTemplateFilter(int))); maze_size_label = new QLabel(tr("Type"), mapWidget); - mainLayout.addWidget(maze_size_label, 2, 0); + mapLayout->addWidget(maze_size_label, 2, 0); maze_size_label->hide(); cbMazeSize = new QComboBox(mapWidget); cbMazeSize->addItem(tr("Small tunnels"), 0); diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua Sat Jul 23 09:31:57 2011 +0400 @@ -0,0 +1,87 @@ + +loadfile(GetDataPath() .. "Scripts/Locale.lua")() + +local player = nil +local enemy = nil +local firedShell = false +local turnNumber = 0 + +local hhs = {} +local numhhs = 0 + +function onGameInit() + + Seed = 0 + TurnTime = 20000 + CaseFreq = 0 + MinesNum = 0 + Explosives = 0 + Map = "Bamboo" + Theme = "Bamboo" + + AddTeam(loc("Pathetic Resistance"), 14483456, "Simple", "Island", "Default") + player = AddHog("Ikeda", 0, 10, "StrawHat") + + AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Default") + enemy = AddHog(loc("Unit 835"), 5, 10, "cyborg") + + SetGearPosition(player,1166,1680) + SetGearPosition(enemy,2848,1443) + +end + + +function onGameStart() + + ShowMission(loc("Bamboo Thicket"), loc("User Challenge"), loc("Eliminate the enemy before the time runs out"), -amBazooka, 0) + + --WEAPON CRATE LIST. WCRATES: 1 + SpawnAmmoCrate(1915,1876,amBazooka) + --UTILITY CRATE LIST. UCRATES: 2 + SpawnUtilityCrate(1986,1141,amBlowTorch) + SpawnUtilityCrate(1427,1527,amParachute) + + AddAmmo(enemy, amGrenade, 100) + +end + +function onNewTurn() + SetWind(100) + turnNumber = turnNumber + 1 +end + +function onAmmoStoreInit() + SetAmmo(amSkip, 9, 0, 0, 0) + SetAmmo(amGirder, 4, 0, 0, 0) + SetAmmo(amBlowTorch, 0, 0, 0, 1) + SetAmmo(amParachute, 0, 0, 0, 2) + SetAmmo(amBazooka, 0, 0, 0, 2) +end + + +function onGearAdd(gear) + + if GetGearType(gear) == gtHedgehog then + hhs[numhhs] = gear + numhhs = numhhs + 1 + elseif GetGearType(gear) == gtShell then + firedShell = true + end + +end + +function onGearDelete(gear) + + if (gear == enemy) then + + ShowMission(loc("Bamboo Thicket"), loc("MISSION SUCCESSFUL"), loc("Congratulations!"), 0, 0) + + if (turnNumber < 6) and (firedShell == false) then + AddCaption(loc("Achievement Unlocked") .. ": " .. loc("Energetic Engineer"),0xffba00ff,capgrpMessage2) + end + + elseif gear == player then + ShowMission(loc("Bamboo Thicket"), loc("MISSION FAILED"), loc("Oh no! Just try again!"), -amSkip, 0) + end + +end diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Ball.png Binary file share/hedgewars/Data/Themes/Golf/Ball.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Border.png Binary file share/hedgewars/Data/Themes/Golf/Border.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Car.png Binary file share/hedgewars/Data/Themes/Golf/Car.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Chunk.png Binary file share/hedgewars/Data/Themes/Golf/Chunk.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Clouds.png Binary file share/hedgewars/Data/Themes/Golf/Clouds.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Club.png Binary file share/hedgewars/Data/Themes/Golf/Club.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Flag1.png Binary file share/hedgewars/Data/Themes/Golf/Flag1.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Flag2.png Binary file share/hedgewars/Data/Themes/Golf/Flag2.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Flake.png Binary file share/hedgewars/Data/Themes/Golf/Flake.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Girder.png Binary file share/hedgewars/Data/Themes/Golf/Girder.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Hole.png Binary file share/hedgewars/Data/Themes/Golf/Hole.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/LandBackTex.png Binary file share/hedgewars/Data/Themes/Golf/LandBackTex.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/LandTex.png Binary file share/hedgewars/Data/Themes/Golf/LandTex.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Sky.png Binary file share/hedgewars/Data/Themes/Golf/Sky.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/SkyL.png Binary file share/hedgewars/Data/Themes/Golf/SkyL.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/SkyR.png Binary file share/hedgewars/Data/Themes/Golf/SkyR.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/Tee.png Binary file share/hedgewars/Data/Themes/Golf/Tee.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/horizont.png Binary file share/hedgewars/Data/Themes/Golf/horizont.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/icon.png Binary file share/hedgewars/Data/Themes/Golf/icon.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/icon@2x.png Binary file share/hedgewars/Data/Themes/Golf/icon@2x.png has changed diff -r 109e9b5761c2 -r 3134fafcfe12 share/hedgewars/Data/Themes/Golf/theme.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Golf/theme.cfg Sat Jul 23 09:31:57 2011 +0400 @@ -0,0 +1,15 @@ +sky = 117, 141, 186 +border = 38, 114, 35 +water-top = $54, $5C, $9D +water-bottom = $34, $3C, $7D +water-opacity = $80 +music = nature.ogg +clouds = 9 +object = Ball, 3, 0, 18, 24, 6, 1, 0, 0, 24, 13 +object = Tee, 1, 6, 22, 5, 4, 1, 0, 0, 16, 20 +object = Car, 1, 65, 258, 80, 2, 1, 0, 0, 240, 215 +object = Hole, 5, 0, 44, 100, 4, 1, 19, 0, 54, 41 +object = Flag1, 1, 65, 258, 80, 2, 1, 0, 0, 240, 215 +object = Flag2, 1, 65, 258, 80, 2, 1, 0, 0, 240, 215 +object = Club, 2, 162, 254, 21, 6, 1, 0, 0, 240, 245 +flakes = 100, 1, 1000, 50, 50