lupdate-qt4/lrelease-qt4

apply variable change here as well

on linux assume datapath is always relative to cmake_install_prefix, unless you provide an absolute path; on win32/osx hardcode engine path to default installation prefixes (it gets overridden at runtime so it works even if you move the data folder)

Oops, forgot this check (fixes crash)

typo and doc

fix file association on windows too

use rev info from the just created file when configuring without mercurial

dump rev and hash in a file to be packed by cpack

adjust cpack ignored files (libraries, mobile project files and win res files are still necessary)

hopefully fix bug #523, file extension association

merge for the win

caught two frontend warnings

convert HAVE_NETSERVER to check for file existance, so that it's easier to provide missing servers

convert HW_DEV in ifdef DEBUG clauses

fix portal/hammer interaction, ban freezer from portal

keep hogs from sliding while they are being frozen

Make hogs thaw only on enemy turns, make timebox counter decrement only on your turn, adjust knock for frozen hogs, increase damage on frozen hogs, make freezer fuel only reduce when not adjusting angle.

Call act as if attack ended on last shot if switching while in mid multi-shoot. Thanks to AI for discovering this.

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.