Fine, merge :-\

Send JOINING message in response to FOLLOW. Actual join may still fail due to room restrictions. Not tested.

Fix the checker after some testing

New checker of engine messages which is aware of glued together messages

Also convert teams to complete game config. The whole feature is still untested at all.

Fix official server build

- Handle mapgen-specific parameters - Convert ammo set into engine messages

Converter from game parameters to engine commands, not finished yet

Some work on loading replay and interaction with checker

/quit <msg> and /part <msg>

Don't confirm hogs number to room admin when no constraint hit

Fix server crasher

Initial theme selection is now random. Theme prompt now has a search input and no longer uses FlowLayout. (Resolves issue #520)

Start work on the checker. Not it could connect to the server and... crash it.

this should not be exposed

- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second. - Send empty packet only if there was no other synced message within last second. This should reduce traffic load: less bytes and less packets (less packets is very good for the server too).

Trying to prevent audio mute from endlessly spamming. Untested.

Hedgeroid: Removed reference to obsolete libphysfsrwops.so It is now compiled as part of libphysfs.so

Merge

trying to prevent sticking. PS. code is hard to read when drunk.

Made map preview a random/edit button again. Changed how I fixed a bug in r06541556df53. Removed newline delimiters used in maps' desc.txt. The description label actually auto-wraps :)

forgot this one

Fix Hedgeroid argc/argv parameter passing to the engine

check datadir instead

Move libjnidispatch to jni/ and copy it to libs/ on build This should fix the build issue where this file is missing after a clean.

this might possibly appease the shoppa players

Fix physfs compilation for android (still getting runtime link errors though)

fix EndGame call. w/o a proper exit, demos weren't being saved

Merge

Added roomnameprompt.h/cpp. Sorry 'bout that.

Merge

Added roomnameprompt.h/cpp. Sorry 'bout that.

issue #518

Use Data.ByteString.copy on receive buffer to allow it free no longer used memory

Reorganized layout and appearance of rooms list page. Creating a new room uses a dialog prompt for the room name, which is preset to whatever your last room name was. Removed dotted rectangle around selected cell in rooms list. Removed bug where gamecfgwidget would be in master mode when joining a game as a slave. Can now join selected room when return is pressed. Can also move room selection while room search box has focus.

Also rooms per version stats

Allow navigating backwards chat widget log while new lines are being added

add support for clang 3.3 (although there has to be a better way for this) and output right version number

shut a few frontend warnings out

update FindGLEW to use the same variables as in later CMake files and make sure to include its headers before compiling c stuff

shorten the library label a little bit

Fix sources so pas2c written in haskell could render them again

credits where credit is due

update branch

remove trailing whitespaces from share too

whitespaces and tabs again

some whitespaces from ios files

complete tabs and trailing whitespace formatting on frontend

Not needed anymore

Don't resend "team quit" message when client closes engine, then quits room: - Fixes server crashes when client had more than one team in game - Fixes game freeze when half of players quit game

uConsole on a diet

- Also pass unknown cmds to the server when in room - Fix some warnings

small cleanup

big indentation/whitespaces cleanup

Some fixes

small cleanup, fix ancient warning (the "itPlay" one)

Fix finding player's another clan

Aesthetic improvements to chat widget. Also fixed the ghosting issue in a few areas by using repaint(). Restored "random" button next to "seed" button in mapcontainer widget when in hand-drawn mode.

Oops, got too excited

Fix crashers