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