AlexVinS
fc1938c341
fix
2017-10-08 11:03:12 +03:00
Hao Hu
9cc2464cf6
Fixing bugs for external dwelling bonus of Golem Factory ( #382 )
...
* Fixing bugs for external dwelling bonus of Golem Factory.
[Problem]
The occupied Golem Factory on adventure map doesn't give
the player corresponding weekly growth bonus.
[Solution]
1. Add the dwelling (of multiple generators) to a player's dewelling set.
2. Created helper function to calculate external dwelling bonus
points.
[Test]
Manual testing on the map, works fine.
https://bugs.vcmi.eu/view.php?id=2789
2017-10-07 17:42:33 +03:00
ArseniyShestakov
185631e94a
Merge pull request #383 from godric3/text_fixes
...
Text fixes
2017-10-06 17:20:55 +03:00
godric3
f03a0b1151
fix #2731 , now no morale, and no luck texts show properly
2017-10-05 17:13:49 +02:00
godric3
e3f0126e41
Removed unnecessary code, fix #2737
...
bonus value is added to desciption inside Bonus
2017-10-05 16:50:39 +02:00
godric3
2a22d9ec12
Add terrain overlays morale and luck bonuses description, fix #2740
2017-10-05 14:53:39 +02:00
godric3
7d8adcc083
Add missing artifact name in wagon text, fix #2763
2017-10-05 14:52:51 +02:00
AlexVinS
891eb5771a
Use hero battle victory and failure animations
2017-09-27 17:35:30 +03:00
Arseniy Shestakov
ec2bef40fb
CServerHandler: avoid crash without interprocess memory
...
Even if shared memory wasn't disabled we shouldn't crash without it.
It's important because Snap packages don't have access to /dev/shm.
2017-09-18 10:46:58 +03:00
Fay
1ee4e232fa
Removed unnecessary full screen redraws in swipe mode; ( #381 )
2017-09-18 08:27:03 +03:00
Arseniy Shestakov
ae13123129
CPlayerInterface: don't stop hero movement on embark / disembark
...
When hero have free boarding bonus there no reason to stop movement.
2017-09-16 10:42:27 +03:00
Dydzio
1162923d93
update VS files
2017-09-13 02:04:37 +03:00
AlexVinS
270e1b75ce
Support for creature 2-hex attack, alternate death and cast animation types
...
* margin option .json animation
* Use ranged attack animation for spell cast if there is no cast animation, display cast animation only on active casting.
2017-09-12 19:51:54 +03:00
Arseniy Shestakov
494872937a
CGuiHandler: use std:atomic to sync breaks in event handling
2017-09-11 12:18:16 +03:00
Arseniy Shestakov
986fc08b1e
CGuiHandler: use SDL_PushEvent in fakeMouseMove to avoid crashes
...
Somehow this worked on other platforms, but on macOS it's cause constant crashes.
2017-09-11 12:18:16 +03:00
Henning Koehler
feba7e1979
tactics distance increased to 1 + bonus ( #375 )
2017-09-10 00:26:56 +03:00
Dydzio
eab8e8f869
Fixed "commit merge" fail
2017-09-09 21:27:22 +02:00
Dydzio
14c07afd3c
Merge branch 'develop' into NewAbilities
2017-09-09 21:04:40 +02:00
Dydzio
3eef689005
Add TERMINATOR ability support, small fixes
2017-09-09 21:01:12 +02:00
Arseniy Shestakov
940c8a0b82
CMake: add $ORIGIN into RPATH for single-directory installation
...
End up that single-directory installation is useful for Snap package.
2017-09-08 03:43:44 +03:00
ArseniyShestakov
d01ecbba90
Merge pull request #372 from vcmi/guiCleanup2
...
Gui cleanup2
2017-09-07 02:46:54 +03:00
AlexVinS
c30d9f2fd6
Fix
2017-09-06 15:50:59 +03:00
Henning Koehler
a7104377d6
fixed CREATURE_TYPE_LIMITER for creatures without a stack instance ( #374 )
2017-09-06 15:27:26 +03:00
AlexVinS
3bbff27127
Wiped CDefEssential
2017-09-06 15:13:28 +03:00
Arseniy Shestakov
610740011c
CMake: print useful debug information on every build
...
That way we don't need to ask more questions regarding system where build failed.
2017-09-06 13:15:49 +03:00
Dydzio
7cbd9acd67
Add BLOCK_MAGIC_BELOW bonus
2017-09-06 00:03:32 +02:00
Dydzio
59764d8349
Implemented SHOOTS_ALL_ADJACENT
2017-09-05 23:45:31 +02:00
Dydzio
5c17e172b6
Revert some changes, update WIDE_BREATH
2017-09-05 22:29:31 +02:00
AlexVinS
6cd0dd9843
Use CAnimation for creature projectiles
2017-09-05 20:04:17 +03:00
AlexVinS
05bb8b13e9
Use CAnimation for battle creature animation
2017-09-05 18:59:26 +03:00
AlexVinS
78b86224a0
Use CAnimation fro custom battle effects
2017-09-05 17:21:44 +03:00
AlexVinS
882e279818
Use CAnimation in CBattleInterfaceClasses
2017-09-05 16:44:27 +03:00
AlexVinS
69c6643893
More CCursorHandler style tweaks
...
# Conflicts:
# AI/FuzzyLite
2017-09-05 15:25:49 +03:00
AlexVinS
9423555015
Declare ownership of CCursorHandler::dndObject
...
# Conflicts:
# AI/FuzzyLite
# client/gui/CGuiHandler.cpp
2017-09-05 15:25:31 +03:00
AlexVinS
a8d25ea7b2
CHeroWindow tweaks
...
# Conflicts:
# AI/FuzzyLite
# client/windows/CHeroWindow.cpp
2017-09-05 15:22:48 +03:00
AlexVinS
ce4b206472
More complete support of .def format
2017-09-05 14:32:52 +03:00
AlexVinS
3a9d73da23
[c::b] Update project, fixed build
2017-09-05 14:31:34 +03:00
ArseniyShestakov
ca066841f1
Merge pull request #370 from vcmi/issue/2780
...
Issue/2780
2017-09-05 01:21:58 +03:00
Dydzio
d2e9848443
Fix RANGED_RETALIATION bug
2017-09-04 23:35:48 +02:00
Dydzio
4cab76900f
Add SYNERGY_TARGET and [wip]-SHOOTS_ALL_ADJACENT
2017-09-04 23:32:24 +02:00
ArseniyShestakov
898f2908d8
Merge pull request #369 from henningkoehlernz/skill_mod
...
Allow modding of secondary skills via skills.json
2017-09-05 00:20:40 +03:00
AlexVinS
2f7968b803
Fixed wrong animation paths
2017-09-04 18:41:22 +03:00
AlexVinS
b964a53abe
Fixed battle animation
2017-09-04 17:52:36 +03:00
Henning Koehler
31ca4db8bd
fixed manual control for arrow towers
2017-09-05 00:30:43 +12:00
AlexVinS
df34a2cc96
Dirty hackfix for https://bugs.vcmi.eu/view.php?id=2780
2017-09-03 23:38:15 +03:00
Henning Koehler
bbc087b723
updated authors and changelog
2017-09-04 00:25:37 +12:00
Henning Koehler
37df5c9d88
reworked mod loading to follow standard approach
2017-09-03 23:49:36 +12:00
Arseniy Shestakov
d7f76fc433
README: add more text and provide links to instructions on wiki
2017-09-02 16:25:42 +03:00
Henning Koehler
cd35ece10c
fixed DLL_LINKAGE for << operators
2017-08-31 10:29:25 +12:00
Henning Koehler
233ead5671
fixed Estates description to match original format
2017-08-31 09:44:01 +12:00
