Merge

merge

Render drawn maps 10-500 times faster

Oops, forgot to set 'erasing' flag on decoding

Fix a bug with wrong state of teams list when color isn't changed manually

Remove a couple more timers, should mean alpha matches old pulse time now

also change specialists

Set air attack to active by default, make time look a bit nicer, avoid plane buzz activating.

change the array which represents the keyboard state to be a boolean array rather than byte array

Don't allow for multiple key up(or down) events, it will ignore the excess events

Also change Highlander and Racer

moved generic matrix code to uMatrix.pas updated shader and client logic to use a mat4 rather than ftransform or gl_ModelViewProjectionMatrix.

merge

merge

Add onGameTick20 to try and encourage lua to be a bit more efficient. Rewrite Space Invasion to use it. Top speed of aliens is 25% higher now, although that could be changed, I kinda liked it. Change parameter order of div().

Some improvements to pas2c

Fix a remote crasher

- Fix some AI stupidness factors - Slight optimizations and formatting

Make frontend compile with clang

- Allow switching colors with mouse wheel - Use indices instead of color values - Introduce a model for colors - Some small fixes, .pro can be used to build again - Yay, tested it to work via network (and fixed a bug!) (TODO: pass colors to engine by index)

initial GLSL1.2 test version

Minor freezer changes, allow snow to accumulate on indestructible terrain too.

Removed lazy update: workaround for R7103

Bring leftTeams back (with a fix) as it is apparently needed for spectators.

merge

- Restore pre-r9257cf8e7af2 behavior - Get rid of leftTeams, send REMOVE_TEAM immediately instead

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.