# HG changeset patch # User Grigory Ustinov # Date 1543415129 -10800 # Node ID 80a4283a58b1979bd611be37b1f0ac3708177546 # Parent 6b56a0a0afb4473744b6d6173423bedd4ab3f7d1# Parent ddcc5dd7a805dc3b6aa7f73af28a3d620fe10140 Merge with master branch diff -r 6b56a0a0afb4 -r 80a4283a58b1 ChangeLog.txt --- a/ChangeLog.txt Wed Nov 28 17:20:22 2018 +0300 +++ b/ChangeLog.txt Wed Nov 28 17:25:29 2018 +0300 @@ -5,6 +5,7 @@ + Complete overhaul of Continental supplies + Can adjust weapon start and crate probabilities in Balanced Random Weapon + Remove rubber duck + + New air mine features + Rework team rankings + Tied teams now rank equally + Help button in main menu @@ -19,7 +20,8 @@ Game, gameplay: + Increase hedgehog limit to 64 + Remove rubber duck - + Shotgun, Desert Eagle, Sniper Rifle, Firepunch, Kamikaze, Whip and Baseball Bat can now hit air mines (and some other moving gears) ... + + Shotgun, Desert Eagle, Sniper Rifle, Firepunch, Kamikaze, Whip and Baseball Bat can now hit air mines (and some other projectiles) + + Freezer can freeze air mines when they don't move too fast + Air mines get stunned by getting shoved + Shotgun shots can now pass through portals * Fix hog being unable to walk after using sniper rifle without firing both shots @@ -75,7 +77,6 @@ + Add help button in main menu (link to Hedgewars Wiki) + Add setting to disable audio dampening when losing window focus + Rework player rankings: Losing clans are now ranked in the reverse order they died - + Add-ons now support preview images for campaign missions * Fix player rankings on round draw: Clans that died in the same turn now have the same rank * Fix rare crash when aborting video encoding in progress * Fix critical failure to cleanup teams list after rejoining game under certain conditions @@ -110,6 +111,8 @@ * Fix breakage when enabling per-hog ammo Mutant: + + Do not reduce mutant's health in Ready phase + + Play poison hurt sound when mutant is low on health + Unlock game scheme Continental supplies: @@ -122,6 +125,7 @@ + Show message when hog receives new continent ammo + Sabotaged hedgehogs also emit smoke when it's not their turn + Can switch continent in reverse order with [Precise]+[Switch] + * Sabotage deals no damage in ready phase, while attacking or retreating * Invulnerability now protects from sabotage damage * Sabotage kills hog instantly when health reaches 0 * Reliably prevent using of Lonely Cries and baseball bat specials when usage not allowed @@ -163,6 +167,10 @@ + New land objects for Beach theme * Fix repeating sun in Hoggywood theme +Content creation: + + HWPs can be nested inside HWPs (1 layer deep only) + + Add-ons now support preview images for campaign missions + Translations: + Translations kept up-to-date: German, Polish + Major translation updates: Russian, Japanese, Scottish Gaelic, Ukrainian diff -r 6b56a0a0afb4 -r 80a4283a58b1 INSTALL.md --- a/INSTALL.md Wed Nov 28 17:20:22 2018 +0300 +++ b/INSTALL.md Wed Nov 28 17:25:29 2018 +0300 @@ -76,7 +76,7 @@ - `utf8-string` - `SHA` - `entropy` - - `zlib` >= 0.5.3 and < 0.6 + - `zlib` >= 0.5.3 and < 0.7 - `regex-tdfa` - `binary` >= 0.8.5.1 diff -r 6b56a0a0afb4 -r 80a4283a58b1 QTfrontend/main.cpp --- a/QTfrontend/main.cpp Wed Nov 28 17:20:22 2018 +0300 +++ b/QTfrontend/main.cpp Wed Nov 28 17:25:29 2018 +0300 @@ -255,7 +255,7 @@ } } - if(cmdMsgState == 0) + if(cmdMsgState == cmdMsgNone) { if(parsedArgs.contains("data-dir")) { @@ -532,7 +532,7 @@ app.form = new HWForm(NULL, style); #ifdef Q_OS_WIN - if(cmdMsgState == 0) + if(cmdMsgState == cmdMsgNone) splash.finish(app.form); #endif app.form->show(); diff -r 6b56a0a0afb4 -r 80a4283a58b1 QTfrontend/res/splash.png Binary file QTfrontend/res/splash.png has changed diff -r 6b56a0a0afb4 -r 80a4283a58b1 gameServer/hedgewars-server.cabal --- a/gameServer/hedgewars-server.cabal Wed Nov 28 17:20:22 2018 +0300 +++ b/gameServer/hedgewars-server.cabal Wed Nov 28 17:25:29 2018 +0300 @@ -36,6 +36,8 @@ zlib >= 0.5.3 && < 0.7, regex-tdfa, binary >= 0.8.5.1, + +-- These dependencies are for OFFICIAL_SERVER only and do not need to be mentioned in docs yaml >= 0.8.30, aeson, text >= 1.2 diff -r 6b56a0a0afb4 -r 80a4283a58b1 share/hedgewars.appdata.xml --- a/share/hedgewars.appdata.xml Wed Nov 28 17:20:22 2018 +0300 +++ b/share/hedgewars.appdata.xml Wed Nov 28 17:25:29 2018 +0300 @@ -16,21 +16,21 @@ As commander, it's your job to assemble your crack team of hedgehog soldiers and bring the war to your enemy.

- Als Kommandant ist es deine Aufgabe, deine Topmannschaft aus Igelsoldaten aufzustellen und in den Krieg gegen deinen Feind zu führen. + Als Kommandant ist es deine Aufgabe, deine Topmannschaft aus Igelsoldaten aufzustellen und in den Krieg gegen deinen Feind zu ziehen.

Game features:

Spiel-Features: