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.

Bit more freezer.

Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival

Might help if this was actually its own unique weapon

Provide training/campaign with a random seed to ignore/use.

remove ProcessKdb references all together, removed movecursor() because it doesnt seem to do anything

first attempt at fixing controller/gamepad, it works with the android controller but it doesnt have hats/buttons, needs testing

dont allow choosing weapons when the AI is playing

android typo/sabotage

fix sdl13 build

readded optimization for SetScale

unbreak android build - export the Game function - fill the ammo store with 0s in the frondend, if we're missing any weapons - use english as default language

Replaced FFP code that sets up orthogonal projection with explicit matrix calculation. Storing the orthogonal projection in the projection matrix for legacy GL (1.x) rather than in the modelview matrix.

android: add missing graphics, only placeholders tho..

Refactored TTexture to allow encoding sprite(s) at an arbitrary location within a (possibly shared) physical texture. The original variant only allowed encoding a sprite at the bottomleft of a larger physical texture to use NPOT sprites on POT only supporting systems.

Learn hask^Wpascal, dudes!

AI can't use cWindSpeedf since it now does a smooth transition

oops

Dammit Xeli

'\xd7af' -> 0xd7af

Make uUtils.c compile

help pas2c

More magic

unc0rr's magic macro

oops, wrong type

pas2c stuff again

Get rid of cripple SendIPCc

A solution to char vs string problem: mark single-letter strings with _S macro

Make pas2c even more happier with uGears.c, allow assigning arrays in some cases

Add missing identifiers

Fix casing and type for gl