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

uStore.pas: Correctly point to shaders

oops, forgot that data absolute path only applies to linux

Added shaders and -GL2 option

move DATA_INSTALL_DIR to the configurable options section

fix hwc install and pas2c preprocessing (but not total conversion)

typo when using DATA_INSTALL_DIR

update branch with default

Fix build

GCI2012: Feedback Redo

convert Game() library call to argc,argv format so that we can use the new parsing functions

Don't play sounds in chat if sound is disabled, try to prevent sound crashes by checking for audio init failure.

GCI2012: Change Argument Passing Between Frontend and Engine

merge

get executable directory at runtime rather than configure time

adjust rpath on osx too for libengine

fix sky

Shoppa tournament 2012 winners

trophyrace with names removed

GCI2012: Beautify Network Page

remove the CROSSAPPLE option until a better solution is found

cmake rework, cleanup a lot of redundant sections, separate library and binary install location, unify osx and win handling of the data directory (tested on win, lin and mac)

edit rpath manually, allowing frontend+libengine to run on linux too

can change library name and compile it on windows again

remove FPFLAGS and GHFLAGS from cache every time

can compile engine as library on linux but not run the executable (automatically), most likely breaking other platforms (wrt engine-as-library)

can use engine as library on windows too

minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()

bye bye cBits

move GetParams in ArgParser, print a warning when using a deprecated command, pascalisation of +1s

GCI2012: Optional Second Argument

Use physfs here too

add hwengine.desktop to hgignore

Merge from default

Pass ROUND_FINISHED to engine so it could stop syncing

improve engine cmd line parsing and its documentation

Documented an unclear method call

Reloads PAGE_SETUP values after clearing passwordhash

Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false

Merge from parent

Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog

Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated

fixed minor problem with saving hash

Removed whitespaces, refactored hash setting getting and clearing

Removed commented-out unused code

*sigh*

Patched login dialog bugs, added retry dialogs