Merge

Fix reported in bug #327, comment #3 - untested but seems reasonable/safe.

http://www.demoties.com/wp-content/uploads/2011/03/mar-01-6.jpg

Mark team for deletion when letting others know it has left during game. Should help with quitters problem.

Don't remove already removed team

wops add this too

reimplemented ResetKbd and calling it when exiting gsChat status, this restores behavior from.17: You can now walk -> press t/chat -> type some stuff while still walking -> exit gsChat and stop walking at that moment

android: fix the default make target

Android: add freezer commit message

add NOPNG to cmake to explicitly disable PNG dependency reorganise osx detection and variable initalization (simpler crosscompiling) in cmake

add GHC and GHFLAGS from cmake too

rename a few internal cmake variables (for consistency and readability)

Replaced matrix related FFP code with explicit matrix calculations. The modelview matrices now get uploaded at a single point via glLoadMatrix4 rather than using the GL1 matrix stack. In the GL2 variant this will become a uniform upload.

Merge

there a libSDLMain.a in the bundled SDL framework

Merge

android: possible fix for bitmap recycle errors

fixed wheelup/down Wheel up and down used to be swapped in both binds.cpp and uKeys.pas (2 wrongs make a right eh) After I fixed uKeys zooming was inverted, so I changed binds.cpp too, but now existing teams will still have its zoom inverted..

add a nilcheck

checksum

Feel free to add real checksum function

better lazy loading for cScaleFactor

Ok. I think *this* should flip it correctly...

android: added an unsigned target to the makefile, to help automate signing

remove the need to qt and co when using cmake with -DANDROID=1

Minor tweaks to freezer, mostly to simplify current state to laptop

clean up pngs

merge

+ Trivial update. + Script for managing WxW, AFR, and Surf'n'Crate shoppa-variants.

A few scripts to try out. 2x challenge, 1x GSoC training, 1x user mission.