Arseniy Shestakov
f1e5797834
Code style: move or add licensing information on top of every file
2017-07-14 01:26:03 +03:00
Dydzio
85eb159e58
Minor code simplify
2017-07-13 21:44:22 +02:00
ArseniyShestakov
564cf05117
Merge pull request #339 from dydzio0614/vscleanup
...
Visual Studio project files tweaks
2017-07-13 21:16:23 +03:00
Dydzio
18f2e0ed96
Invalidate unavailable tiles as obstacle candidates
2017-07-13 18:51:56 +02:00
Dydzio
ee3f6c9b88
Block appropiate hexes on ship-to-ship battlefield
2017-07-13 16:47:28 +02:00
Dydzio
7bf1b91235
Visual Studio files tweaks
2017-07-13 13:18:40 +02:00
Alex Dunn
1d735503d1
CMake: fix macOS app bundle ( #337 )
...
Currently the vcmiclient binary is left behind in the build directory.
2017-07-13 11:29:23 +03:00
Arseniy Shestakov
99d3b9e37a
CMake: add all launcher headers to CMakeLists.txt
2017-07-13 02:44:58 +03:00
Arseniy Shestakov
dbcd79c48a
Code cleanup: remove double and unneded semicolons
2017-07-12 22:01:10 +03:00
AlexVinS
09df2dcfbb
fixed possible race condition
2017-07-12 19:40:14 +03:00
AlexVinS
78885b8acc
fixed possible race condition
2017-07-12 18:51:36 +03:00
AlexVinS
a85bf3638f
fixed illegal memory access
2017-07-12 18:32:22 +03:00
AlexVinS
bc626c2446
Fixed race condition
2017-07-12 18:26:20 +03:00
AlexVinS
2c525fc76e
Attempt to fix headless tests crash.
2017-07-12 17:02:25 +03:00
AlexVinS
f1d35dd3f2
[c::b] update
2017-07-12 15:43:03 +03:00
ArseniyShestakov
a9c10633ab
Merge pull request #336 from dydzio0614/blackmarketfix
...
Fix black market behavior to match H3
2017-07-12 15:08:42 +03:00
Dydzio
252f68cb1a
Fix black market behavior to match H3
2017-07-12 01:21:00 +02:00
ArseniyShestakov
2cf7c7b234
Merge pull request #335 from dydzio0614/bug2476_fix2
...
Fix #2 for bug #2476
2017-07-11 15:40:35 +03:00
Dydzio
182210421d
Fix #2 for bug #2476
2017-07-11 14:04:43 +02:00
Arseniy Shestakov
7e9b9ccad8
AppVeyor: build all branches
2017-07-10 22:41:17 +03:00
ArseniyShestakov
fcd63cd982
Merge pull request #333 from dydzio0614/RealFullscreen
...
Add optional real fullscreen mode support
2017-07-10 21:04:24 +03:00
AlexVinS
3bc082a1c5
Reduced code duplication in CHealthTest
2017-07-10 09:30:23 +03:00
AlexVinS
e677373241
tweak
2017-07-10 08:53:29 +03:00
AlexVinS
1fe01b7254
Moved defensive stance log message building to server side.
2017-07-10 04:05:36 +03:00
AlexVinS
de01a797a6
added more tests
2017-07-09 22:31:00 +03:00
AlexVinS
2d0613b40b
Added some CHealth tests.
2017-07-09 22:15:06 +03:00
AlexVinS
ea3502ed60
Removed CStack::totalHealth()
2017-07-09 20:23:51 +03:00
AlexVinS
44fc0cb57b
Broken CHealth dependency on CStack
2017-07-09 19:49:52 +03:00
AlexVinS
f0713c1d36
Better handling of HYPNOTISED stacks in case of spellcasting
2017-07-09 16:55:10 +03:00
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
AlexVinS
00bd1bd100
formatting
2017-07-09 15:49:37 +03: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
AlexVinS
7bf8c9bd69
fixed and cleanup
2017-07-08 21:20:38 +03:00
Alexander Shishkin
88ea28ca8d
Merge pull request #334 from dydzio0614/patch-2
...
Adding myself to authors
2017-07-08 20:54:13 +03:00
Dydzio
9fb9bef272
Adding myself to authors
2017-07-08 19:48:29 +02:00
AlexVinS
4f14f22d3a
Unified CStack ammo, casts and counterattacks
...
* it is possible now to add casts and shoots OTF (f.e. with spell bonus)
Centralized stack 'ammo' loading from bonus system.
* introduced small proxy class for local bonus cache
(no need to use global cache if particular selector used on node only in one place)
* handle killing resurrected creatures
* use IBonusBearer::MaxHealth() where possible
* Fixed https://bugs.vcmi.eu/view.php?id=2486
* Possible fix for 0 HP after resurrection.
* Hack-fixed https://bugs.vcmi.eu/view.php?id=2584
* Unified CStack health API
* Use CHealth for CStack count and health points
* increased SERIALIZATION_VERSION
2017-07-08 20:29:59 +03:00
Dydzio
c377f594a5
Add optional real fullscreen mode support
2017-07-08 18:43:04 +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