also have uTouch follow the new NewTurn policy

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

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

strip available ram entry, add notice for entering email

GCI2012: Google Issue Login

GCI2012: Google Issue Login

will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build

will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build

updated frontend translation

updated frontend translation

fix some comments and add basic doxygen file

fix some comments and add basic doxygen file

GCI2012: Corrected headers for generate documentation (doxygen)

GCI2012: Corrected headers for generate documentation (doxygen)

fix build on linux for me ( the uint32_t releated breakage )

fix build on linux for me ( the uint32_t releated breakage )

GCI2012: Refactor Authors Page

GCI2012: Refactor Authors Page

tinker around the info delivery...

GCI2012: Sound Option, Hear Only Music

GCI2012: Embed System Info

tinker around the info delivery...

Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two). Still need to figure out why isSEBackup is used and if my changes affect it.

GCI2012: Embed System Info

Merge

Cleaned up frontend options a bit and added a couple WhatsThis messages.

Command to delegate room to other player

Removed redundant "enable"s on checkboxes and variable names.

Change room name if room admin is kicked

Command to delegate room to other player

Stop syncing when recieved 'o' message

Change room name if room admin is kicked

Send "ROUND_FINISHED" to room clients when server thinks so

Stop syncing when recieved 'o' message

Better check for bans

Send "ROUND_FINISHED" to room clients when server thinks so

Show others if spectator is in game

Better check for bans

Show who's in game to spectators

Merge

Show others if spectator is in game

"Registered users only" room flag

Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two). Still need to figure out why isSEBackup is used and if my changes affect it.

Show who's in game to spectators

Cleaned up frontend options a bit and added a couple WhatsThis messages.

kinda treat graves like hedgehogs for the purpose of looking up hog info

"Registered users only" room flag

Removed redundant "enable"s on checkboxes and variable names.

GCI2012: Remove Quit Prompt On Mouse Click

kinda treat graves like hedgehogs for the purpose of looking up hog info

backout rea7541f77944 since development of frontlib is on another branch

GCI2012: Remove Quit Prompt On Mouse Click

don't set stereomode when stereo is disabled

don't set stereomode when stereo is disabled

GCI2012: Fix Cancelling Video Uploads

GCI2012: Fix Cancelling Video Uploads

readd this debug line, commented out, could be useful

readd this debug line, commented out, could be useful

can reopen engine again...

can reopen engine again...

third merge, yay

Made user data path default to '.'.

second merge

Register flib_gameconn callbacks

first merge

merge from default

Made user data path default to '.'.

Create hedgewars.ini if not exists manually, as QSettings uses QTemporaryFile for that, and QTemporaryFile doesn't respect custom file engines.

GCI2012: Navigation Output

GCI2012: Convert uMobile into a Callback Record

don't allow resizing videorec widgets

GCI2012: Move Video Preferences in Settings Tab

Merged changes from upstream.

Move video description text underneath thumbnail to prevent the layout from resizing.

Fix crashes and wtf behaviour introduced in r0b8beacff8a5

Merged with upstream.

Unbreak build with freepascal < 2.6.0

Fixed crash that occured after recording a video (pagevideos' config wasn't set).

caught a few more possible glitches in engine cmakefile

Merged koda's fix for the hwengine bug. eG: --

MERGE

Make video recording options have fixed size and merge with spinbox->combobox change.

Fix check for file existance

Merged changes from upstream.

- Disable in-room bans - Actually check for banned nickname

fix compiling engine (bug introduced in r33868aea694c)

GCI2012: Find Out What is Causing This Problem (frontend leaks on OS X)

unify default videorec values loading/reloading, fix setting index/value from previous commit

GCI2012: Check for Non-Standard Recorder Framerate

resize the qt window to fill 2/3 of the screen size (no more crammed widgets on first launch) and always center it

Merged changes from upstream. HK: changed QTfrontend/ui/page/pageadmin.h

fix mask only

GCI2012: User/Pass Single Prompt

GCI2012: Move Freepascal discovery code into a CMake module

Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file

Fix QSettings problems: - Reopen file in ReadOnly mode if it was open in ReadWrite mode and is being read. This is needed for stupid QSettings which opens file in ReadWrite mode just to call readAll() on it. - Implement setSize(0)

Some fixes

shorten tip

Google Code-in: Center help text field Modifies the grid layout slightly so that the help text which appears when hovering over certain elements is centered with respect to the window, even when there are more buttons on one side. https://google-melange.appspot.com/gci/task/view/google/gci2012/7968226

Fix more errors. It compiles!

also this can be deleted

Merge

Merge

Fix some stupid errors I caused

minor xcodeproj update

use High() to avoid future out of bounds in uSound

Make user folder default to global folder in hwengine

Refactor Freepascal module.

oups

Move noexecstack flags to Freepascal module and refactor.

remove unneeded @2x images

Move code for Freepascal to separate CMake module.

GCI2012: Remove Structure Weapon Code

Make user folder default to global folder in hwengine