Merge

Italian translation update

Italian engine translation update

recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on

client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS

'h' status for room admins

Reset to default colors button

- Some improvements to tr() calls - Translate some entries in russian and english translations

- Fix some warnings in frontend - lupdate

Polish settings page a bit

More consistency in terminology

merging in campaign updates - please test

Fixed grammar/vocabulary and improved balance Mission 7: Added more pickhammers so that it's harder to run out of them, added more weapons to the AI Mission 6: Removed reset possibility, added sticky mines, more weapons for AI every six turns Enter commit message. Lines beginning with 'HG:' are removed.

fix for issue #293 : "rope stuck after picking crate"

fix a segfault related to tcp servers deleting themselves without removing themselves from the internal server list first. (e.g. happens if game fails to start due to missing hwengine binary. a second start attempt will lead to a segfault, even if you correctly install the binary.)

retain frontend effects setting exiting/leaving settings

Fix some warnings

Stop messages without possible desync on load from save

I didn't want to do this since it seems less clean, but... moving the stats-fix into CheckForWin, since that function is the one sending the damage stats (whyyyy?) therefore it's not sufficient to update stats after calling it, some of the stats won't be transfered to frontend then

Show who is the room admin on join (no tested, also I don't like how it is done via server warnings, but it seems there's no other solution compatible with .17)

skip second CheckForWin if water wasn't raised after first one

fix multi-shot related game ends leading to incomplete stats, fixes issue #372

More Qt-ish code, fix couple warnings.

Unset room restrictions on player/team joins when changing room admin

More precision

forgot to add back c96ff1a053d0

fix for issue #376 (embedding barrels in ceiling)

Fix line endings, add missing amMine entry

teleport hack fixes: * don't let hogs fall into other hogs, barrels or other gears * stop animation on damage (doesn't work with invul, sadly) * don't force waiting for ground-contact in inf attack mode * fix initially placing hog right next to instant-mine causing bugs

adjust velocity when entering/exiting the 4x routine

Let's try *4 instead. Not nearly as much of a win, but might be usable.

So, unc0rr won't let me revert to pre-e496587db93e, but reverting db731c523653 makes the rope less-sticky-enough to actually be usable in an ordinary game without my screaming at the monitor as I drown for the nth time...

if this doesn't work I shall cry like a lady

I assumed NO_VIDEOREC would be set if ${FFMPEG_FOUND} was false. doesn't seem to be the case.

engineclean returns

Not sticky rope

perf tweak

LAND_HEIGHT/LAND_WIDTH need setting later now

Correct snow fall/rotation (matching visual gear)

Oops

Rope fix without hacks.

oops

remove checks from c4272519b128, ed7fecd0f5fd just hides 'em instead.

hide health bars of dead teams

Differentiate videos from demos - navigating between them was too confusing. BTW, why is this on the front page, instead of next to the demos button?

fix parsing of 'if': identifiers can also contain underscores

fix parsing of 'if'

clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas

* don't build moc for campaign.h * added campaign.{h,cpp} to hedgewars.pro

oops

use old approach for printing gl extentions for pas2c (less complex/no StrUtils dependencies)

min -> qMin

don't query/print GL_AUX_BUFFERS if video recording is disabled

print all GL_EXTENSIONS properly to logfile (should a;sp fix build on systems with compiler/lib versions that can't implicity cast PGLubyte to PChar)

Allow adjusting bitrate so that I can get a somewhat usable webm video. The audio is still tinny and unlistenable. Configuration option for that might be helpful, or just adjusting defaults in the wrapper.

add 'a classic fairytale' campaign to cmake install

dos2unix newline fixes on 7 (video recording-)merged files

Move some options to the second page so first page doesn't look ugly on low resolution

neglected stuff

Checking merge against latest trunk