merge

even faster and no more warning

Java side makes use of the official multitouch implementation of SDL

faster math

merge fix

Eh. n/m. Even when I did 1 shl, didn't seem right, and anyway, it isn't much of a mask if there are 16 categories and we use 10, of which those are the most common.

merge...i think

Add an event mask for SDL1.2

Add hillbilly voice

Update changelog, comment on possibly redundant lines in GSHandlers

flip some flames

Dir should not be 0, but set it to 1 if 0 in case I missed some other place this was done. Also correct cloud scaling.

If I'm going to be arbitrary about it, might as well go for the more minimal arbitrariness

further engine interaction refactoring

minor updates to ServerProtocolNetwork class

restore a lost view message

unsquash the rescaled clouds

Improve parsing of complex references like "a^[b[c], d]"

Fix inifinite loops

Rearrange token types

Add more border checks

Make mazes filter use same variable as template filter

fix map/template override, remove some pointless command calls

Less precision - less confusion

Improve type declarations parsing

Another set of colours. These are an attempt to fuse ideas from mikade and bugq, based on channel feedback/voting.

Might as well make the air attack team coloured too

Even more improvements to the parser and converter

tweak % again

Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use