just merging if statements

- Update .pro file - Rethink logic of TCPBase, fixes bug with failing to receive all bytes from engine when process end signal is received before tcp disconnect

Remove unused uCommands from uGearsHandlersMess

Fix lastGameType not being updated if game type was demo or save (fixes a crash) Previously, if you first played a normal game, then a demo, the “play again” button would appear, but clicking it would only crash HW. This fix will remove this button after a demo or save, because the frontend doesn't know how to restart demos or saves yet.

Fix desyncs when forcing rope re-selection after missing a shot or hitting bounce world edge Also re-introduce rope-reselection when touching ground

Fix desync when dropping weapon from parachute or jetpack

Backed out changeset 28210d2a9a36 (fixes bug #553) This fixes a desync when you take fall damage while roping and having a secondary ammo selected.

initialise previousGameState to something valid and not gsSuspend

Add Lua problems to the troubleshooting section of INSTALL.md

travis: Install qt4 with a brew tap

Don't send taunt message for automatically happening taunt animation

Remove newlines at end of Gravity mission panel

Fix frontend not sending script param if empty

Fix Battialion script showing “Round 0” at start

Fix host not re-sending ammo scheme after editing an existing ammo scheme This caused clients to start with an incompatible ammo loadout.

Update Polish tips and mission map descriptions

Update changelog regarding wrap world edge bugs

Add Polish translation for campaigns and new missions

Update pl.txt translation file

Backed out changeset c162995831d8

Backed out changeset 058a5d373e4a

Backed out changeset d08afea02908

Minor pl.txt update

Update and complete Polish frontend translation

Fix Hedgewars going into suspension mode (game freezes) when windows got minimized

Update Polish translation (frontend, 3 strings missing)

Fix broken cancel button on the login window (bug #373)

ACF6: Make sure player only gets portal gun at the portal sequence, and not a pile full of weapons and ropes

ACF3: Mention mines time in a sequence where it has been forgotten String freeze is maintained, the string is already in stub.lua

ACF2: Fix Lua error spam when Leaks A Lot died in same turn as weaklings, also do other minor tweaks - Grant skip to Dense Cloud and Leaks A Lot again, after refusing the cyborg's offer - Fix flow chart - String freeze is maintained, the new string is already in stub.lua.

Fix some German translations in ClimbHome and ACF

Add comments for all A Classic Fairytale missions to summarize the story in a flow chart-like fashion

Use SDL_SetRelativeMouseMode to detect mouse movements, fixes xinput issues

HedgeEditor: Define fallback flag/voice/fort/grave when saving level data

HedgeEditor: Don't change mode in background when pressing left/right w/o amAirAttack selected

Fix ammo menu, placement and camera movement keys not working in ammo menu

Fix CheckWorldWrap not correctly checking for bounce edge. Also fix teleport @ bounce edge

Update cabal file

Fix bad LuaGoals comparison for pas2c builds

Update small preview image of Basketball and BasketballField maps

ACF7: Fix two weird thinking bubbles which should be speech bubbles

ACF7: Fix no animation starting for some possible scenes

Oops. Changelog was wrong, the error message spam was for ACF8, not ACF7

ACF7: Fix possible Lua error spam in intro sequence This was caused by a race of onGearDelete vs AnimationSetup. If AnimationSetup came first, it uses old values from the natives table. The solution is to force the code to guarantee that AnimationSetup always coms after deleting gears in the natives table.

Fix some German typos and change a translation word (Ziele → Zielscheiben)

Disable hog control after winning target practice challenge

ACF5: Fix final animation being stuck when the cyborg's way to the right is blocked Fixed with the new maxMoveTime parameter in AnimMove. If cyborg didn't reach its destination in 7000ms, the move anim is skipped and the sequence just continues.

Animate library: Add new parameter maxMoveTime to AnimMove

Slightly update russian localization

ACF7: Set correct hog position after skipping start anim

ACF2: Mention that both hogs must survive String freeze is preserved, the string is already in stub.lua.

ACF, mission 2: Fix various mission breakages when heroes died together with enemies

Change SD music for Halloween and Hoggywood themes (old tracks) Rationale: - Halloween: hell music is the logical continuation, default SD music just ruins the atmosphere - Hoggywood: default SD music fits better here; the hell music was historically chosen when there wasn't a generic music yet

Fix German typo in de.lua

Expose the gotten achievements of Bamboo Thicked and Dangerous Ducklings in the stats screen Also fix Basic rope training captions. The string freeze is maintained. Only existing strings are used.

Add sparkle's name to Rope Knock Challenge Reason: For being the first known player to finish ClimbHome. String freeze is preserved, the hog names are not localized.

Update credits for Fruit.ogg

Complete music credits for Jungle.ogg by alfadur

oops

jungle music

checksum immediately after loading because surface2tex does surface manipulation. also add some FIXMEs

Make gtDuck use DirAngle instead of Angle for rotation

Fix sometimes ammo schemes not being saved after changing before an ammo scheme got deleted in session This was because the bool isDeleting is not initialized, so its initial value is unpredictable. Which means there's chance it starts with true, confusing the frontend.

one more pattern

Use maybeNick from Utils, fixes empty nickname inserted in ROOMS protocol command parameters. Not tested, but builds, and it's Haskell...

you know what... I think everything would have been fine if we'd simply required all this hog stuff to be in the same block...

w is in pixels, so presumably this needs to be *4

use pitch for surfaces, land_width x2 since 16 bit

Modernize Cargo.toml a bit

Remove silly toUtf8 which caused bug with default team name

Add a few random team names and fix typos

2nd try... just shortcircuit most of onGameTick20 when we are between turns.

this should probably sidestep that thing unc0rr keeps bringing up. untested. but then, I've never had it happen. I think what happens is onGameTick20 is called in same tick as onNewTurn and before it...

Update README.md: Add game description, controls, getting started guide for n00bs, fix typos, reorganize sections

Rewrite INSTALL file: Markdown format, add troubleshooting section, more detailed build instructions, etc.

ACF mission 5: Take away switch and always play with deployed hog in final mission stage

Lua API: Fix Goals text being cut off at ca. 255 characters

More changelog updates

Changelog: Add 0.9.23 highlights, change headers, reorganize 0.9.23 engine updates, fix typos, mention some features

Use Gear^.Boom to calculate cake party faces

Fix cake party face not working across wrap world border

Make air mines follow hedgehogs across wrap world edge

Make GearsNear and CheckGearNear check gears across wrap world edge This fixes hog detection of mine, sticky mine, resurrector, seduction and crate across the world edge. Air mine is only partially fixed.

Add KoBeWi to credits

Update changelog

HedgeEditor: Fix broken napalm/mine strike/drill strike

Rope Knock Challenge: Don't count hog kills after hero hurt itself

Rope knock challenge: Add names of developers and Shoppa tournament players who ranked 1st/2nd/3rd The string freeze is maintained. The hog names are not localized. The string "points" is already in stub.lua.

Fix bee homing incorrectly when target is across wrap world edge

Wrap around target coordinates when clicking on other side of wrap-around world edge This fixes girder placement failure on other side (not across).

Move CalcWorldWrap to uUtils.pas

Add Wuzzy to credits I think I deserved it. :D

Fix AddAmmo setting ammo to 99 when trying to add infinite ammo This affected the portal mission, the crate only gave you 99 portal guns instead of infinite.

add copherneue

Fix division by 0 in sniper rifle training

Sniper rifle training: Fix missing victory sound, also disable controls at the end String freeze notice: This commit will display a caption with the string "Victory!". It does NOT violate the string freeze, as this string is already present in stub.lua.

Sniper rifle mission: Faster dynamite blow-up, also skip with precise

Sniper rifle training: Fix general camera weirdness - Camera bounced back and forth between shots - FollowGear was called every 20ms (way too often) - Now camera only re-centers when using sniper rifle - Camera also centers to dynamite once

Sniper rifle mission: Fix targets spawning twice in dynamite scenes, jacking up the total amount of targets

Fix small German typo

Fix GCC warnings: -Wimplicit-fallthrough and -Wint-in-bool-context

Fix PhysFS 3.0.0 deprecation warnings for error reporting

Fix compiler getting nervous about C++11 dependency

Update hedgewars_de.ts translation

Run lupdate $ lupdate QTfrontend -ts share/hedgewars/Data/Locale/*.ts

Update Big Armory mission image (duck position)

Fix first ammo row being invisible when there's only one weapon in the first row

Fix a few German typos and weird grammar

Update German Lua and campaign translations

Run update_lua_locale_files.sh

Turn loc_gen.txt into an executable Shell script Still clunky and slow, however. :(

Fix bubbles drawn on the wrong side when hog drowns and faces right

Increase chance for AI to use tardis over skip

AI player checks if it can use tardis before selecting it

extend land digest to all surfaces that could possibly be loaded into Land[] - i.e. ones that impact sync

AI hogs use timebox instead of skip if clueless what to do

AI doesn't use extra damage/vampirism/invulnerable again if already active

Move amNothing from F1 slot to new special hidden weapon slot. Move amDuck to F1

Add air mine, cleaver to Highlander ammo scheme, and remove resurrector

Fix rubber duck not being used in Highlander

Also drop air mine and rubber duck from Construction Mode crates

Highlander: Mention the "max. 1 ammo per type" rule in mission panel

Loyal Highlander: loyal=true in Highlander script param, you only get stuff for *enemy* kills Normal Highlander is of course not affected by this. This setting is optional.

Fix failure to update all cloud layers properly when entering Sudden Death

mark up sprites for uStore loading. critical is for ones needed for proper gameplay, checksum is for ones where the game will desync if they don't match. will add checksumming next...

Don't switch back to rope/chute/jetpack if selected ammo is not ammoprop_AltUse This fixes a regression like that you can't shoryuken after rope.

Explain TropyRace's knockout rule in the mission panel

QTfrontend: Fix flickering and bad offset of control config popup If you opened the pop-up to change a key, there was a very short flicker at the left side and the pop-up had a bad offset which sometimes caused entries to be out of screen bounds.

Add missing variable in uWorld.pas in videorec builds

Fix incorrect hints about molotov cocktail insta-booming barrels

Rope: Keep rope selected if sliding on ground and secondary weapon selected For consistency w/ previous rope commit

Remove unused variable in uWorld.pas

wind blowing around mines off-turn was too annoying.

Keep rope/jetpack/parachute selected when destroyed and having secondary ammo selected Assumption: You rope with secondary ammo selected. You miss a shot, destroying the rope gear. Previous behaviour: Rope gets deselected and the secondary ammo gets selected, you can no longer rope. Very annoying, reason of many Shoppa fails! New behaviour: Rope stays selected, but selection of secondary ammo is cleared (because rope gear got destroyed). Makes much more sense overall. Analog for jetpack and parachute.

Fix rope angle possible to go below 0° if having secondary weapon selected

Fix faulty stats screen translation in English locale

Don't let player save ammo scheme with pre-installed name, even case-insensitively

Fix "at least 2 teams" warning not updated when net team is added/removed

Fix cursor still being visible after using piano strike

Change DLC icon (thanks, nemo!)

Mark custom maps/forts/scripts with circle icon instead of icon

Mark custom forts with asterisk in team editor

Lua API: Remove BorderColor variable from onGameInit Seems to be broken, returns negative value, is not used in any script, obscure feature anyway.

Construction Mode: Fix Lua error spam when using time box with filters on map

Fix hog holding nothing in hand when choosing napalm or piano strike

Eliminate some possible spoilers in stats screen of ASA: fruit02

Fix player being able to switch to dying hog

Remove spaces from grave names

Add 7 graves

No longer jiggle sticky mines if using portable portal device This fixes the sticky mine sound playing when using portal gun while any sticky mine is placed on ground. We decided that placed sticky mines can't be teleported.

Update German and English locale files

Improve error messages when feedback or DLC fail to reach Internet Problems with a missing SSL library are hinted at.

Update Italian translation (it.lua)

Fix short sound breakdown shortly after using time box

Fix team getting inf. ammo when stockpiling >= 100 ammo

Fix possibility to accidentally destroy team by entering an already existing team name

Fix old team name not being removed after renaming team in frontend

extend overridable graphics/sounds to 8 of each, for lua scripters who really like having their own sprites/sounds. these should not be used in the engine.

Make sure new teams start with an unique name

Names of new or copied game schemes are now unique

Rework weapon scheme handling in frontend and fix a couple of bugs There were many oddities in weapon scheme editing which are fixed now: * When you left the weapon scheme editor, everything flashed briefly * When you leaft the weapon scheme editr, the weapon scheme selection always reverted to Default. Very annoying * Clicking on New or Copy now instantly creates and save the new weapons set

Fix molotov cocktails bouncing off vertically off rubber

Fix argument bug in default name of copy of copy of ammo scheme

Strip invalid PNG profiles from PNGs Bad PNGs caused a few annoying warnings like “libpng warning: iCCP: known incorrect sRGB profile”. Command used: pngcrush -rem gAMA -rem cHRM -rem iCCP -rem sRGB Note that many images have “@2x” in their name, this probably explains why they have been overlooked before.

Fix splash screen on Windows This fix needs testing

Less stupid resetPosition comment in uCursor.pas

Fix camera going crazy when starting game with mouse centered

Use https links in README files Don't worry, I tested all links

(Hopefully) fix game camera being shifted on Windows 10 IMPORTANT: This fix needs testing before 0.9.23 release!

Fix teleport allowing you to teleport in land if you clicked beyond the wrap-around border

ClimbHome: Fix final team scoring 0 if hog took damage

ClimbHome: Make sure hog faces left on turn start

Climb Home: Fix game getting stuck when player reaches home What now happens if a player reaches home: - sndWinning - Show caption with finishing time - Winning hog is teleported to roof and can be seen by everyone - 4 second delay - If there are still hogs left, the game continues normally - Each victory is mentioned in stats screen at the end

Add test case for testing that mines don't move for a very long time

Destroy rope when attempting to shoot it through wrap / bouncy world edge This fixes a variety of graphical glitches

Fix cursor often jumping to center when putting target while moving cursor It was about this time this HORRIBLY ANNOYING bug got fixed. Oh boy!

Show selected weapon again when using it in inf attack mode This is useful if you have e.g. lots of (finite) bazookas; it's easy to lose track of the amount of remaining bazookas. Not displayed for weapons which always end your turn.

Remove ScriptParam from HedgeEditor

HedgeEditor: Also save hog effects (e.g. poison) and looking direction

Clean up internal HedgeEditor TODO list

Add translator comment for "toggle team bars"

Fix Birdy descending into water if hog took damage before it got picked up (bug #160)

Add README files to explain the tests directory

Put Testing dir into .hgignore and .gitignore

Fix cake taking >200s to explode when it's completely stuck and can't move (bug #194)

Add test case to test if cake explodes in time when stuck in tight space See also: bug #194

Remove broken “Play again” button in stats page after an online game

Relicense my contributions from WTFPL to CC-0 To reduce the total number of different licenses used in HW. Not that it makes any difference …

Add 6 hats from the hat thread, the TheMadCharles' barrelhider hat (CC BY 3.0) and 12 hairless hat variants

Update German translation (especially de.txt)

fine. I will

Reduce number of initial teams: 4 human, 2 AI teams

Create 5 human teams + 5 AI teams on first start

Make multipy sign in QTfrondend translatable and update hedgewars_en.ts

Add a bunch of announcer messages in English Thanks, KoBeWi!

Use generic team names for non-themed random teams; add a bunch of more random team names First team name list in types.ini are considered to be generic. If the random team generator decides to use hats not taken from types.ini, it only uses a generic team name, not one of the other themed team names.

Nobody Laugh mission: Set bot level to maximum because the player is supposed to win before the time runs out

Battalion: Only show collected ammo to local player

Change some HedgeEditor menu icons

Change Highlander.cfg to select Default by default Because if you scroll through the list, you often end up with HedgeEditor being chosen as game scheme. xD

ACF6: Set correct position of native after skipping

ACF1, fruit01, WxW: Make sure the selection dialogues never disappear on their own

Merge sheepluva's changes

TrophyRace: Fix game never eliminating any hogs after a hog skipped or ran out of time Warning: This commit _might_ invalidate past records, but I'm not sure if this is actually the case. Note that only the eliminiation part of the script is touched, not the actual race logic. Even if records are actually broken by this, I and sheepluva have decided that it's more imporant to fix this very, VERY stupid and old bug than to preserve records.

fix some fpc hints

Fix broken format string in de.lua, breaking Tumbler script

ASA, moon01, desert01: Enable skip for hero only if there is turn-based play

fix copypasta fail that caused segfaults (esp. in pas2c)

ASA, moon01: Don't save checkpoint if player was first detected, and then grabbed the weapons

ASA, moon01: Fix various turn-based and gameplaying bugs

ASA, moon01: Move escape dialog into a proper animation dialogue

Merge sheepluva's changes

ACF7: Don't make princess disappear instantly after victory

workaround to fix pas2c mistyping a constant as bool

ACF5: Fix position of Fiery Water when skipping start anim.

ACF5: Spare traitor's life with skip instead of precise Since you can accidentally press precise

ASA, fruit01: Change choice keys

ASA, fruit01: Show mission text when reaching launch pad with enemies

ASA, fruit01: Improve mission texts and choice dialog handling

ACF1: Change rope challenge confirm key to [Attack]

ACF1: Fix princess/elder flying very weirdly when punching to direction they look at

ACF1: Force player to press jump to confirm difficulty dialog To prevent the player from accidentally making a choice too early

ASA, ice01: Fix turn ready caption

make hellfire test a bit less seed-sensitive

ASA, moon01: Fix minions sometimes taking double turns

pas2c happiness initiative 2017, continued

change return codes to avoid overlap with fpc ones

ASA, Spacetrip: Fix guards taking 2 turns in succession

make PHYSFS_setBuffer() known to pas2c

fix some things that annoy pas2c and whitespaces

Merge sheepluva's changes

A Space Adventure: Add outro sequence / epilogue in the final mission

don't use colorkey for land spray this fixes issue #220

rename ifTransparent to ifColorKey This should make the name less confusing. However this image-flag will possibly be dropped completely.

currently irrelevant sdl call adjustment as suggested by https://wiki.libsdl.org/MigrationGuide

ASA, ice01: Fix losing turn early in game

ASA, desert01: Fix smugglers sometimes getting multiple turns

Fix rope detection in ASA desert01

Use Default voice in A Space Adventure campaign

Change graves of teams in missions for greater variety In A Space Adventure, only one grave was used for all teams, which was clearly bad.