merge

a little more intuitive team editing

Frontend: improve statsPage (clean up translation strings)

discrimination between ai and humans

Fixed Sky files

use built-in method QString::isEmpty()

Engine: * Enabled zoom in ready time

Fix graphic issue

another small update to sheep

Completely rework sheep theme

zero span is undefined, use -1 instead

Locales: * Updated en.txt

Adding new weapon descriptions

Added descriptions for new weapons

remove now useless toggle, add ai team

Fix for issue #20

Added descriptions for new weapons

New Art theme music (thank the lord!)

Engine: * Changed ready time's message to include the team name and show as a gamestate message * Moved ready time handling to ProcessGears in uGears (TurnTimeLeft handling)

Engine: * Changed ready time's voicepack sounds

Engine: * Changed ready screen's behaviour (e.g. hitting [attack] WILL close the screen and trigger an attack) * Ammo menu keybind stops ready timer now.

Engine: * Changed the ready screen confirmation so it no longer blocks keybinds except attack and jumps (to avoid hogs dieing by accident)

New Art theme music (thank the lord!)

Updated some stats graphics

o0 merge

help page for lobby

help page for ingame, some other fixes here and there

patch by inu to fix a glitch in netgame chatbox

added a smaller version of forts, fixed a couple of regressions

adds prettier after-game statistics page with more stats

about page done

Improves room list with filter for state/rules/weapons and general search

merge

Extend statistics collection (TeamKills, TurnSkips, TeamDamage) + sending to frontend

X&Y buttons, sounds for some buttons, cleanup

add a description field for schemes and weapons

modified file format for schemes files (which is going to introduce a lot of pre-release bugs, i'm sure)

fade in when returning from game, labels rewritten so that they are drawn at runtime (more flexibility with i18n and iphone support)

tap to dismiss 'get ready', add a toggle to enable/disable it

add a nice group of hogs in lobby page

Engine: * Added cReadyDelay as "Ready" to console variables so it might be changed by frontend

Engine: * Made all keybinds skip ready time

gfAISurvival/heResurrectable: respawn always with 100HP

Engine: * Added a 5 seconds ready time to every (player controlled) hog's start of the round. Use [attack] to skip it (untested in multiplayer). Frontend: * Fixed training missions failing to start.

Fixes memory leak -Burp

Daisy Hat updated

Princess Daisy hat (recoloured peach hat) Recolour by Armonte

Add kill counter to Survival Mode -Burp