merge

add the button images to the android assets

wops, must use tabs not spaces..

the buttons actually work now!

fix compiler error for non android build

wops, too much copy pasting

show buttons on the screen, similar to the iOS overlay

ios game configuration page rotation gliches fix

Some progress, still can't find the source of bad behavior

ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there

Increase volume on a number of sounds that were many times quieter than the other voices. Also remove empty space in Ooff1.ogg so it plays at the right time.

unbreak tardis

unbreak ammo menu

Disable opacity across the board. It is screwed up in OSX and apparently also Linux. Bad artifacts and overall performance.

ok. really fix by toggling back to ready. At least, I think this should do it...

attempt to fix 3222bb0612ca - otherwise you are unable to start a second game without quitting the room.

add individual hog healths to team health bar

Further work on propagating types. Now it hopefully works fully, just need to annotate namespace with types first.

some refactoring + you can now tap on the ammo menu to select a weapon

BUUUUURN OBJC AMMOMENU BUUUURNhg diff! (on a separate note, this reduces the codesize by ~37k)

check if the latest assets have been moved to the sdcard (compare with versionCode)

Rewrote the Ammomenu: Added landscape ammomenu At the moment MOBILE indicates landscape, but we could just as easily make a variable out of it Draw to texture once uVariables.AmmoMenuInvalidated indicates a new ammo menu needs to be drawn, see uTeams and uAmmos Slot/Cellsize is dependent on uConsts.AMSlotSize this should make it easier to scale the ammo menu on smaller screens AmmoRect AmmoRect indicates where and how big the ammo menu is, this makes positioning a bit easier imo, because you only need to change the position at one single point needs testing on the iphone (and other systems as well ofcourse..)

Android makefile: compile with debug symbols and ant clean, otherwise it wont update the apk if you have only changed a lib

Expanded copyToXY, it doesn't copy the whole src sprite, srcX/Y to srcW/h, added DrawSprite2Surf and DrawLine2Surf

disable using files from the assets dir, and use fopen()

Propagate types on identifiers

chinese update

astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"