1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

6660 Commits

Author SHA1 Message Date
FeniksFire
43d324b561 Fix handling damage when stack wait in moat.
Currently stack don't take any damage from moat when he stay in same
place.
2017-07-09 15:07:20 +02:00
FeniksFire
ce09da783a Fix taking double damage from the same moat.
When stack move to the double moat in the fortress, he will be damaged
twice. I fixed it like in original h3, now stack will be damaged once a
time.
2017-07-08 21:44:26 +02:00
FeniksFire
45a63e003c Fix: getting additional damage from destination obstacles
When the stack was selected to pass through 2 field in moat, first hex
stopped him but then he got also additional damage from destination
obstacle.
2017-07-08 17:40:27 +02:00
ArseniyShestakov
3634af10ba Merge pull request #330 from dydzio0614/AmountBoxTweaks
Tweak battle creatures amount box hiding
2017-07-08 15:54:18 +03:00
Alexander Shishkin
b5fb7acffe Merge pull request #331 from dydzio0614/patch-1
Update ChangeLog
2017-07-08 13:18:20 +03:00
Dydzio
2e47078ab9 Update ChangeLog 2017-07-08 12:04:18 +02:00
ArseniyShestakov
d0e603a418 Merge pull request #329 from viciious/cmake_msvc
Change output path for cmake builds
2017-07-08 12:31:46 +03:00
Dydzio
2d6f964d65 Amount box support for stacked war machines 2017-07-07 19:04:29 +02:00
Dydzio
ae2323672a Tweak battle creatures amount box hiding 2017-07-07 18:11:05 +02:00
Victor Luchits
36b8541ab5 MacOS build fix 2017-07-07 15:20:52 +03:00
Victor Luchits
5468365ed6 Set zip compression level to 'Maximum' 2017-07-07 13:08:53 +03:00
Victor Luchits
06c1df9901 Change minizip library output path to match vcmi 2017-07-07 13:08:53 +03:00
Victor Luchits
295b031dba Fix appveyor scripts to work with new output paths 2017-07-07 13:08:53 +03:00
Victor Luchits
30cc2f6a01 Change the output path for cmake so all files go into the same root directory 2017-07-07 13:08:53 +03:00
AlexVinS
4d204095cf fix 2017-07-07 02:55:23 +03:00
Alex Dunn
38693d83a1 macOS: use HTTPS for appcast (#325) 2017-07-06 22:48:14 +03:00
Alex Dunn
3915d6c312 macOS: use HTTPS for downloads (#326) 2017-07-06 22:47:56 +03:00
Alex Dunn
489fdaefb7 client: only copy libminizip when not provided by the system (#328) 2017-07-06 09:26:41 +03:00
Alex Dunn
34058f1396 macOS: turn Sparkle off by default (#327) 2017-07-06 09:09:30 +03:00
Arseniy Shestakov
fab6f409f6 Fix 2017-07-04 22:07:24 +03:00
Arseniy Shestakov
6084950f31 CMake: restore Android build 2017-07-04 22:06:00 +03:00
AlexVinS
5f1fadf71c Fixed https://bugs.vcmi.eu/view.php?id=2706 2017-07-04 11:21:22 +03:00
Arseniy Shestakov
e024c4f7b1 AppVeyor: add notifications to Slack #notifications channel 2017-07-04 04:30:37 +03:00
Arseniy Shestakov
cb669dcca4 AppVeyor: add status badge README.md 2017-07-04 04:08:13 +03:00
Arseniy Shestakov
823e28fe69 AppVeyor CI: small path fix 2017-07-04 03:46:15 +03:00
Arseniy Shestakov
eed36c3b7c Merge pull request #320 from viciious/msvc
AppVeyor integration
2017-07-04 03:41:18 +03:00
Victor Luchits
5cf512e0fe Add appveyor.yml 2017-07-04 03:34:19 +03:00
Victor Luchits
30643feb66 Do not treat warnings as errors for fuzzylite 2017-07-04 03:31:13 +03:00
Victor Luchits
271fcb746d We need zlib headers for minizip, which comes in through the filesystem 2017-07-04 03:31:13 +03:00
Victor Luchits
310f6e27cb Workaround ffmpeg linking problems 2017-07-04 03:31:13 +03:00
Victor Luchits
b681db3947 Add appveyor_toolchain.txt 2017-07-04 03:30:59 +03:00
ArseniyShestakov
b670bcb46f Merge pull request #313 from vcmi/spellCastQuery
Spell cast query
2017-07-04 02:43:22 +03:00
AlexVinS
dbaf3cb023 Cleanup & formatting 2017-07-04 01:32:40 +03:00
FeniksFire
8577445b10 Simple fix: http://bugs.vcmi.eu/view.php?id=2366 2017-07-03 22:41:16 +03:00
AlexVinS
dfbc9cea8a Hack-fixed icon position 2017-07-03 22:01:03 +03:00
Arseniy Shestakov
01a1353fe1 Cleanup: remove old editor code and adjust related project files
It's useless and will fail build if accidentally enabled in CMake.
For anyone interested it's always available in git history.
2017-07-03 21:59:57 +03:00
AlexVinS
6dd89efc9a tweaks 2017-07-03 21:43:05 +03:00
AlexVinS
a65befaa08 Moved town portal logic to mechanics class 2017-07-03 21:43:04 +03:00
AlexVinS
3d1a84875e Queries refactoring
* Moved SUMMON_BOAT special case to mechanics
* Partially moved Town portal logic to mechanics class
* Added generic query reply to CCallback
* Redesigned Queries so that base API do not depends on CGameHandler
* Got rid of CGameHandler::castSpellRequest
* Removed CGameHandler::castSpell
* Added new Query type for town portal dialog (not used yet)
2017-07-03 21:43:04 +03:00
AlexVinS
f463dc2fa3 fixed war machine spawning 2017-07-03 21:42:17 +03:00
ArseniyShestakov
5dfb7a5771 Merge pull request #317 from vcmi/attackerOwned
Refactored CStack::attackerOwned to CStack::side
2017-07-03 16:19:54 +03:00
AlexVinS
3ce238e4d3 Tweak 2017-07-03 13:40:22 +03:00
Alexander Shishkin
d8545d9c3b Merge pull request #321 from viciious/nodecompare_fix
Fix NodeComparer::operator() to provide strict weak ordering
2017-07-03 13:11:46 +03:00
AlexVinS
e4c14c4cc2 avoid assertions in stack position checks 2017-07-03 12:59:33 +03:00
Arseniy Shestakov
c059f95e2e CClient::loadGame: pass correct save version for BinaryDeserializer
Fix loading crashes that appear after duel mode removal.
2017-07-03 05:11:58 +03:00
Victor Luchits
e9e311f142 Fix NodeComparer::operator() to follow strict weak ordering rules
This fixes annoying assertion failures in MSVC builds
2017-07-02 22:59:41 +03:00
Arseniy Shestakov
a1c2307f61 README: add link to Slack invite page 2017-07-02 18:09:33 +03:00
ArseniyShestakov
b9112b82a0 Merge pull request #319 from dydzio0614/vsfix
Improve VS build filters file + precompiled header path fix
2017-07-02 13:45:27 +03:00
Dydzio
ef2ff0c752 Precompiled header path also needs fix 2017-07-01 20:05:10 +02:00
Dydzio
f61398b0ee improve VS build filters file 2017-07-01 19:29:27 +02:00