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

set window modality for new ban dialogs

Fix warning

Bans manager

- Fix UNBAN bug - Rework BANLIST message format

Case insensitive test for banned nickname

Implement ban by nickname

GCI2012: Too many variables

GCI2012 - In-Game Chat Commands

Google Code-in: Move video preferences in settings tab Moves the video recording preferences out of the video recording page into their own tab in the settings page. https://google-melange.appspot.com/gci/task/view/google/gci2012/7968230

GCI2012: Command Line Parsing

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

use the correct symbol

Use same macro for hiding video record button and keybinding Modified my previous patch to use the already-in-place VIDEOREC macro (used previously just for hiding the button on the main menu) instead of creating another one. https://google-melange.appspot.com/gci/task/view/google/gci2012/7948213

GCI2012: Lowercase CMake functions (main files only)

Move global variables to units that use them

Google Code-in: Hide "video record" keybind option Removes the recording keybinding option using preprocessor conditions when it is unavailable. This includes when Hedgewars is being built either with the recording feature explicitly disabled or when FFMPEG/LibAV were not found. https://google-melange.appspot.com/gci/task/view/google/gci2012/7948213

Remove unused global variables

*sigh*

merge

A bit of refactoring

Use HW_TEAMCOLOR_ARRAY from frontlib

Invert S3D_DISABLED to more consistent USE_S3D_RENDERING

Merge

GCI: use player's name for the default team task: http://www.google-melange.com/gci/task/view/google/gci2012/8007227 note: these bugs were NOT introduced by this: - double confirmation on team removal - team addition fails

Fixed flib_weaponset_create creating an empty weaponset (for real this time :P)

unbreak linking pending some fix or other by koda. this is the same thing video recording still does.

Some fixes

Added default weaponset to frontlib hwconsts Now the weaponset create function can actually do what it promises and create a default set instead of an empty one :)

merge

No more crashes when running quick game