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

Try to be friendlier to small screen sizes. Use 800x600 if width/height of 2/3rds is smaller than 800x600 (things don't look smaller than that size), use desktop size if it is for some reason smaller than 800x600

uint32_t -> quint32

Fix linux build broken in ra1577759bf62 (probably)

Fix non-osx build broken in ra874d00df4a4. Dudes... :(

Fix windows build broken in raf97cdbb7713

cmake set variable and typo

GCI2012: Autoupdate Button in Settings

cmake verbosity/documentation/cleanup/formatting

Implement some more callbacks

partially revert r1fba650c2aa4 on misc/physfs/CMakeLists.txt which randomly set true and false variables

Delete poller when game is over

less linking needed, raise minimum_osx_version when videorec is enabled

Merge with default

hides the 'email' prompt on the feedback page (as that doesn't work, so it's a misleading/useless feature), makes the "please add your email" text a little nicer and more noticeable, and makes the "feedback" and "downloadable content" buttons on the main menu a little bit larger, and more clickable.

Some fixes

Unbreak build

Unbreak build

removing the optimisation that caused (most likely) the lua crashes on osx

removing the optimisation that caused (most likely) the lua crashes on osx

strip available ram entry, add notice for entering email