merged changes

move onNewTurn, onGameTick and onGameTick20 to try and avoid ParseCommand breakage after nextturn call. Needs testing, but should be safe for most scripts. Also fix locale loading.

don't discard older cmake_c_flags

GCI2012: CMake List Append

GCI2012: Advanced Keyboard Configuration - Added "Controls" tab to settings, where you can set master game-wide controls. - Can revert master key bindings to game's default key bind. - Per-team binds now default to "Use my default", but you can override those binds if you want to. - New key binding interface. - Removed redundant second confirmation prompt for deleting a team. - Added "reset all binds" button to the binding interface in both the main settings and team settings. - I discovered that the reason keyboard camera controls were "broken" is because they were never implemented! But don't worry - I took care of that for you, too. :) (this also closes bug #120)

Preserve windowed resolution after manual resize

ok, enable the splashscreen for win only

Added Support for variable windowed resolution.

restore compatibility with cmake 2.6

NSIS workaround no longer necessary

install shaders only when needed, find clang only when needed, fix building on windows, better cmake boolean vars

disable splash on linux

Small GL message

add a splashscreen while the main interface is loading (enabled on all platforms, disable if it doesn'n't look good