whoops, temp file was committed...

merge

cmake: Fix SDL2 header version detection

Update ChangeLog.txt, mostly for campaign bugfixes

ACF, mission 3: Add mission strings to remind the player of the main goal

ACF, mission 3: Standardize mine times. 3s if alone, 5s if playing with 2 hogs

ACF, mission 3: Fix player not losing properly after killing princess

Delete unused code in ACF mission 3

Fix bullets being reflected too early on bouncy world edge border while digging land

Make hogs keep their hat when holding the baseball bat

ACF, mission 3: Fix victory causing a lot of loser message being displayed. Also add EndTurn()

ACF, mission 3: Fail faster after Leaks or Dense Cloud died

ACF, mission 3: Fix Lua error when Leaks a Lot dies at the beginning

ACF, mission 3: Fix Lua error spam when Dense Cloud dies in the pit sequence

Lua: Fix SwitchHog breaking the ammo menu of the new hog

Time achievement for ClimbHome

Declare achievements alongwith EndGame call, since it would skip SendStats

Achievement for ClimbHome

Don't dump ghost points if map isn't detected

Dump best time ghost on console

Fix ACF Eplilogue becoming unplayble when all hogs except the traitor have died

Get rid of some incorrect timeout messages in ACF, by using EndTurn(true)

Set infinite skip in ACF: United We Stand

Fix Lua fail in Long Live the Queen mission on victory

Fix engine crash in ACF mission 5 when skipping animation after killing wave 2 while the cyborg is talking Also harden the code against double function calls

Lua: Fix HideHog causing engine crash when provided with invalid gear ID or hog was hidden

Remove outdated/unused debug output

Refactor hardcoded ammo IDs in The Great Escape

HedgeEditor: Fix blow torch / pick hammer in wrong crate type

Fix broken HedgeEditor export of utility and ammo crates

Refactor HedgeEditor output, get rid of wepArray in favor of simpler ammo iteration

Mention inf attack rule in Diver, also fix the in-game mission name

Refactor Teamwork 2: No more hacky skipping, set proper ammos for enemy instead

Fix false victory in Teamwork/Teamwork 2 when one of your hogs die in same turn as enemy

Mention important game modifiers in Spooky Tree and Nobody Laugh

fly saint flyy

Decode chat slang in en.txt (“GL HF”)

Use Robot voice for enemy in Bamboo Thicked and Newton and the Hammock

Fix Ammo/Utility crate confusion in portal mission

Fix incorrect PointsType in sniper rifle training and That Sinking Feeling

Set fixed wind in bazooka training. Fixed impossible first target when bad wind

Standardize the secret achievements strings in Lua scripts

Fix Traitor taunt being played when hog w/ heResurrectable drowns w/o damage

Disable resurrection message for respawning with heResurrectalbe It was often irritating. Now this message is only shown for using the resurrector utility.

Mutant: Fix “Boring” taunt being played when becoming the mutant

Highlander: Fix crate collect sound playing when hog didn't get anything

HedgeEditor: Disable waypoint export because output scripts break when waypoints have been added

HedgeEditor: Make sprTargetBee the first selected sprite

Refactor Frenzy script - Use GetAmmoName instead of hardcoding ammo names into strings - Remove Tracker - Make texts a bit more translator-friendly

Construction Mode: Mention teleportation restriction in tooltip

Show traditional winning animation in Mutant again

Use the traditional winning sequence in Space Invasion again (killing off the losers)

Add back the missing winning animation for Racer and TechRecer

Lua API: SendAchevementsStatsOff, SendGameResultOff, SendRankingStatsOff

Fix caption of stats screen not being reset on clear()

Update more HWPs: Knockball, Racer, Construction Mode Changes: - New ammo icon for Knockball's baseball bat with ball - New ammo icon for waypoint placement tool in Racer - Remove airplane cursor in Racer and Construction Mode

HedgeEditor: Fix incorrect preview of air attack icon in sprAMAmmos/sprAMAmmosBW

Add dud mine to missions.png and use it in HedgeEditor

Clean up HedgeEditor HWP mess, fix broken/outdated graphics - Simplify ammo menu icons - Add Ammos_bw.png - Simplify Target.png - Fix dud mine preview looking like normal mine - Fix weapon crate preview of air attack, drill strike, napalm

Update and simplify Construction Mode sidecar HWP Changes: - Remove amGirder.png (not required anymore) - Make all non-overwritten ammo icons transparent (for nemo's Ammos overwrite patch) - Add Ammos_bw.png

Fix install failure of Ammos_base.png for QTfrontend

turn hwp Ammos overrides into overlays. untested.

Add Octopus fort

Fix sndBoring being played when force-ending turn due to victory

Clarify how the weapons restocking works in Highlander

Backed out changeset 82951b9b3c2f Reason: People think giving hogs the weapons again in consecutive turns is OP

Fix rubber duck description (it no longer drops *straight down*)

Drop rubber duck like dynamite

Backed out changeset 98824a464230 (disable GetLaunchX/Y again) Reason: GetLaunchX/GetLaunchY were buggy

Move sidecar lua load to prior to script load. This should let the script use it for dependencies.

Fix incorrect SDL_UnloadObject usage in about.cpp (copy-paste fail)

Jungle Theme: allow flower object to go across gaps

Art theme: fix alpha in landtex

clean up flake falling/rising code. this should fix issue #157

fix fort mode's edge adjustments getting lost with weWrap. issue #181

HedgeEditor: Fix maximum ammos sprite ID being 1 too low

Fix broken ammo preview caused by previous commit Yes, I'm dumb.

Fix hog not getting new ammo in Highlander when it takes 2 consecutive turns This happens when all enemy hogs are frozen

Lock ammo scheme of TechRacer (is ignored anyway)

Fix sniper rifle disabling laser sight utility after shooting

fix campaign missions not showing up for me

Backed out changeset 071a05275798 Reason: Can't switch weapon forwards while preventing slipping, or while doing precise aiming

Fix warning caused in uGearsHedgehog.pas

Replace hardcoded max. ammo index in Highlander with AmmoTypeMax

Lua variable: AmmoTypeMax (maximum ammo type ID for iterating)

Make sticky mines fall off the map when frozen

Freezer allows to freeze sticky mines (currently only disables them)

Stretch teamselwidget across whole page in local multiplayer page

Allow to press [Precise]+[Slot] to cycle through weapons in reverse order

Only select from default graves and forts for new themes

Add DLC filtering in DataManager.cpp and namegen.cpp

For testing purposes, drop tointeger and pushint since Lua uses ptrdiff causing inconsistent behaviour if we try to get a longword value from tointeger on 64 bit vs 32bit. This should improve script reliability a bit

Make health gain message translatable

Take sacrifices into account for the “Stupid” taunt

Call hog stupid for selfkilling

Call hedgehogs stupid for poisoning themselves