add neglected merge

Fix team file path

Fix water on ice setting

Eh, two players condition seems to make more sense than two clans here

Fix DrawLine bug

lol nemo, lol

tweaks to sea ice appearance

Possibly fixed issue #533.

Resolves issue #528. Fixed platform-specific order of buttons on seed prompt and new room prompt. Fixed height of back button on all pages -- now aligns to bottom. On pagemain, feedback and dlc buttons no longer fixed size.

my turn to do a neglected merge for someone else

Review the list of synced messages in isSyncedCommand. Fixes issue #546.

Made pressing the button in mapContainer only randomize things if client is master. Fixes issue #545. Also synchronized themes. Fixes issue 547.

avoid floating point desync, other script tweaks

So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)

Safety check. The main place this can be a problem is on a mild bowl w/ multiple hogs. Could possibly add a hog collision check in here.

split version information in engine too

drop useless option, automatically set revision and debug info

split cVersionString into its three separate components (version, revision, hash) and apply the new values sensibly on the frontend (esp. title, info and feedback)

mysterious merge

support WARNING message status on cmake 2.6 (bug #524)

correct copyright header on files i added

use NETGAME_DEFAULT_PORT macro across frontend sources

move weapons line away from hwconsts.h so that modifying it doesn't needlessly recompile everything, introduce a way to try documenting which weapons each number represents

add icegun everywhere (default, crazy, 1oe) with a qt prob delay crate of 2

close branch

add 'One of Everything' in the weaponsets, from nemo's idea

merge icegun branch w/ default

Merge

Draw ice on water

Make refactoring. Remove DrawIce function

small update of german engine translation

aaagh. remove dead code. again.

Apologies if jaree had done something similar, but didn't see anything in repo pull. This removes Land[] mixed w/ LandPixels[] and streamlines things a little

physfs strikes back

define ice edge colour

enable asm only on intel/amd machines

remove dead code

merge physfslayer in default

Draw ice on water

.hgignore

pull icegun into default. it has a few issues, but, pretty close. that way more people will play with it.

merge w/ default

huh. how'd we end up needing a merge here...

Separate setting and drawing ice

Make little refactoring

Check is lanscape already ice

put ice colour in uVariables, add check for land that is already ice

Change shape of ice to round

Don't calculate edges of map as edges of landscape

Check bounds of landscape in drawice procedure

forgot this loop

graphics tweak. flag a couple more overeager setall HH

ice texture still needs moving to uLandGraphics and circle drawing

Merge

workaround for frequent AllHH active call in hedgehog step

add hiragana/katakana ranges to CJK check.

More fiddling w/ sliding

*sigh* somehow misplaced this. this should have been rd9627d65edf7

slight tweak to colours

add some missing wrapping.