merge

rewritten findffmpeg.cmake

replace sdl mixer/image version checking with something more robust

rewritten FindOggVorbis.cmake

fail if sparkle not found consciously

oups

rework FindSparkle.cmake

use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.

At multiple requests, change ice to be turn based. This is a more modest adjustment of existing code, that can be fairly easily flagged or reverted if desired. It also allows scripts to extend freezing, and preserves fire melting.

escape return and be more friendly with translations

add link to GPLv2 notice in about page

uniform revision info in about page

add version info to frontend output too

version variables confom to naming convention

oooooops forgot SHAREPATH is still used somewhere

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.

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.

quick and dirty and inefficient example of Tiy's suggested terrain sampling. Still needs moving to uLandGraphics

Fix issue #537 (empty team created on startup)

savesurf

Fix issue #507 (not highlighting friends joins)

This and the "retain freezing" stuff could probably use a flag.

too aggressive?

prevent drilling into hogs w/ drill rocket

Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster.

Restore freezing hedgehog for shotgun, sniper rifle and deagle to make unc0rr happy. You'll still be able to get away after throwing cleaver and sticky bomb tho.

close thei branch

Messing around w/ Freezer

Support 'registered only' room flag in frontend

on windows fpc-linking is the funniest of all

Add freezing hogs with icegun

oops. forgot this one.

moar docs update

Add change ice gun image

Allow switching away from any weapon when during multishoot.

upd doc

Add frozen land texture

This change from r0cd63b963330 caused more troubles than solved. Also fix some warnings.

due to popular demand, add a compile time switch to manually select whether to build the internal physfs (default) or not

Add land freezing

Global notice with /global command. Can now warn users when doing server restart.

documentation

Oh, and # too to prevent occasional game hang when N is followed by #

perform a version check before including physfs (maybe there is a better place for this?) and allow overriding automagic search

Flush buffer on N command

disable unneeded physfs archives (as of bug #529)

Try to prevent hedgehogs number in team desync

this should hijack the linker name and always pick the bundled physfs when another version is already prsent

Merge

blindly updated Android build files for new physfs

Merge

updated ios project files for the new phys build system

Merge

Workaround queued signals problem in netclient instead. Should fix everything.

this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib

Updating Italian translation. In progress, as usual.

Unbreak build

workaround static physfs static linking on linux

We need this to fix hedgehog numbers desync (workarounded in previous revision)

and now compile and link properly

Fix stupid mistake which made checker desync almost always

update cmake files to use the two libraries independently

Found another possible source of desync, trying similar workaround on this

split extras and src

Forbit guest checkers

use standard library prefix

Workaround hGetContents blocking all threads with my own version of the function

reopen and update branch

Workaround desync issue if I correctly understand its roots (barely tested)

fix compiling on osx when you have multiple linkers installed

Some fixes

pretty sure esc here is just a holdover from past, and has no use in rearranged implementation.

Parse engine output to deside whether simulation ran to the end

Clear player's clan info on room join

Disallow kicking the opponent in duel

Update Hedgeroid to current JNA version, remove workaround for a bug they fixed.

Catch exceptions when moving files

No NFData instance for ByteString when ghc >= 7.6

Sort checked files into dirs

- Ensure that team file exists before saving into it (same fix as for hedgewars.ini, due to bug in Qt) - Fix build with .pro file

Some more work on checker

- Fix check for void message - Disable sound in checker

Fix build

Ehm... probably this will improve situation with desyncs

Pass hogs names and hats

Fix order of messages

restore prior modifier. I think the damage dealt is appropriate to intended uses

Some more Italian translation... still in progress.

- Add forgotten ammo definitions - Fix addteam arguments

Bring back full log strings for commands, just a bit sanitized

Hack checker to run engine with record file received (uses hardcoded paths)

Prevent 'black team color' error

Oops, forgot path

Cleaver tweaks based on feedback. Nerf damage, shrink radius. This means cleaver will embed into ground quite a bit further.

oops. more specific ammo tests. maybe could use a few more properties

Allow moving after firing cleaver. This changes multishoot behaviour quite a bit. Needs a lot of testing.

Credit links now yellow instead of blue.

Remove Structure from localisation

Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue #522.

Removed in-lineedit labels such as "search:" and "room name:" due to size issues with localization and platform differences.

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

ios, show fps when debugging

update sound preferences in ios settings ('sound' means 'sound effects' instead of 'sound enabled')

restored ios project file, updated Game() interface, tweaked arg parsing, updated log writing, minor warnings

On pagenetgame, when window is too small the map/game options becomes a tabbed interface to allow for a few lines of chat to always be visible. Restored HWForm's min height to 580. Fixed the 2px alignment issue with the map list and map previews' top edges that unC0Rr was whining about. <3