Arseniy Shestakov
21074e13c3
macOS: always change working directory for launcher and server
...
This make relative paths work properly when launched from DMG or from different directory.
2017-08-09 01:33:12 +03:00
ArseniyShestakov
cb40c093f8
Avoid boost::optional assignment for Boost 1.64 compatibility ( #360 )
...
Two options here: to use emplace from 1.56 or boost::make_optional.
Unfortunately Ubuntu 14.04 is using 1.54 and I'd rather not to break it.
2017-08-05 16:09:29 +03:00
ArseniyShestakov
4388e12a3a
Merge pull request #358 from Chocimier/altar
...
Fixed bugs in Altar
2017-08-05 02:25:41 +03:00
AlexVinS
2d31d5710f
[tests] Reduced code duplication
2017-08-03 15:56:45 +03:00
AlexVinS
12b42f4495
Improved map format tests
2017-08-03 13:50:54 +03:00
misiokles
c5aa403197
Fixed http://bugs.vcmi.eu/view.php?id=2730 by Anubis ( #361 )
2017-08-03 09:03:55 +03:00
Piotr Wójcik
886c8f63c6
Show stacks selected to sacrifice
2017-08-01 17:17:46 +02:00
AlexVinS
3de0fa37f8
Possible fix for https://bugs.vcmi.eu/view.php?id=2759
2017-08-01 17:00:26 +03:00
ArseniyShestakov
9d9c026c85
Code style: serialize everything on own lines for easier debugging ( #357 )
2017-07-31 16:35:42 +03:00
Piotr Wójcik
137b9cde19
Fix crash in Altar of Sacrifice, fixes #2648
2017-07-29 19:27:39 +02:00
AlexVinS
980926a7bd
Fixed https://bugs.vcmi.eu/view.php?id=2749
2017-07-27 11:58:51 +03:00
Piotr
f931b19a16
Show correct quantity of guards of dwelling, fixes #2502 ( #356 )
2017-07-26 00:00:29 +03:00
Dydzio
1c2f4bc8f6
Compilation fix for VS 2017 ( #355 )
...
Related to: https://developercommunity.visualstudio.com/content/problem/69009/compilation-error-on-msvc2015-on-boostbase-from-me.html
2017-07-25 20:58:36 +03:00
Fay
80f149e296
Better android input handling: sending notifications about CInputText changes to java so that we can display textinput overlay there; ( #354 )
2017-07-23 20:23:48 +03:00
Piotr
069f295165
Do not summon boat from another boat, fixes #2294 ( #353 )
2017-07-22 23:47:29 +03:00
Fay
747ef0d222
Fix for failing vcmi-android build; ( #352 )
2017-07-22 22:27:25 +03:00
Arseniy Shestakov
1b9daecd27
CMake: remove Boost.Test requirement
2017-07-22 03:19:17 +03:00
Arseniy Shestakov
df82380d93
AUTHORS: add FeniksFire. Again
...
Let's hope Warmonger won't remove him on merge ;-)
2017-07-20 19:00:02 +03:00
FeniksFire
b56d05b75b
Fix handling damage in bridge in fortress ( #349 )
...
Remove "Moat" obstacle on bridge hex from affected obstacles by creature,
when bridge is opened/destroyed.
Resolves: https://bugs.vcmi.eu/view.php?id=2577
2017-07-20 18:15:47 +03:00
AlexVinS
2e2642ef7a
[C::B] test project update
2017-07-20 15:46:40 +03:00
AlexVinS
303a3b670c
Merge branch 'improvingTheBattle' into develop
2017-07-20 15:46:29 +03:00
FeniksFire
d84ecb6fb2
Tests improvement
...
Delete our logger from tests.
Make correction.
2017-07-19 17:04:57 +02:00
Arseniy Shestakov
cdd9dbc7f1
Code style: avoid some ambiguous else if indentation
...
If some code intentionally want to break else if to achieve specific indentation there must be braces.
2017-07-19 03:42:26 +03:00
Arseniy Shestakov
6d9f99d4de
Code style: and one more pass on lambda expressions parameter list
2017-07-19 02:11:17 +03:00
Arseniy Shestakov
b540ab73ed
Code style: add empty parameters list to more lambda expressions
2017-07-19 01:39:38 +03:00
FeniksFire
587f59e93a
Migrating "CHealthTest" from boost to googlemock and googletest.
2017-07-18 21:04:57 +02:00
FeniksFire
704eeb25b2
Add googletest as submodule
2017-07-18 16:49:50 +02:00
FeniksFire
a71c9d0751
Migrating from boost test to google test.
2017-07-18 16:49:05 +02:00
Dydzio
8314e8234f
Fix water wheel gold amount ( #348 )
2017-07-18 15:00:30 +03:00
Arseniy Shestakov
2da3d8a563
Code style: remove senseless comments
2017-07-18 00:04:00 +03:00
ArseniyShestakov
b2f74a93cf
Code style: add empty parameter list to all lambda expressions ( #345 )
2017-07-17 15:35:57 +03:00
AlexVinS
ef73f416dc
fixed resurrection corner case
2017-07-17 02:50:38 +03:00
Dydzio
81ccecedca
Fix color change of highlighted hex borders ( #343 )
2017-07-17 01:15:05 +03:00
ArseniyShestakov
b52cfe5283
Code style: use parentheses for creating heap-based objects ( #344 )
2017-07-16 12:58:05 +03:00
AlexVinS
21c0c95049
tweak
2017-07-16 01:53:13 +03:00
AlexVinS
f1a4831813
[Spells] Get rid of SpellTargetingContext.
2017-07-16 01:43:50 +03:00
AlexVinS
7374689301
Fixed https://bugs.vcmi.eu/view.php?id=2715
2017-07-16 00:02:55 +03:00
ArseniyShestakov
a4c0ad94b1
Code style: remove default value hints in definitions ( #342 )
...
Some are outdated and this is something IDE are useful for.
2017-07-15 14:08:20 +03:00
Dydzio
0cb6515ae8
VCAI tweaks ( #311 )
...
* Add extra priority support for town capture evaluation
* Improve building algorithm
* GatherArmy: check free gold instead of total for when hiring heroes
2017-07-15 01:15:08 +03:00
Dydzio
98140aab6b
Add option to toggle monthly artifact change in black market ( #341 )
...
* Add black market art change as hardcodedFeature
2017-07-15 00:46:18 +03:00
ArseniyShestakov
ea0ceb1805
Merge pull request #323 from vcmi/CStackTweaks
...
CStack tweaks
2017-07-15 00:42:08 +03:00
ArseniyShestakov
006fa6c6df
Merge pull request #332 from FeniksFire/SmallBugFix
...
Fix handling damage from obstacles
2017-07-15 00:09:37 +03:00
AlexVinS
df13851176
fixed wrong battle result
2017-07-14 23:43:03 +03:00
AlexVinS
2fb531b6d0
Display actual moral and luck for batlle stack
2017-07-14 21:42:36 +03:00
Arseniy Shestakov
6abc88c2bf
CMake: set _WIN32_WINNT to 0x0600 for FuzzyLite 6
...
Now CMake builds will require Windows Vista or newer
2017-07-14 21:35:49 +03:00
AlexVinS
9586fd9b0a
quick fix
2017-07-14 19:14:34 +03:00
Arseniy Shestakov
98406d127d
CGMonolith: fix crash on initialization here too
2017-07-14 16:50:29 +03:00
ArseniyShestakov
77ca27b90b
Merge pull request #340 from dydzio0614/navalbattlefieldfix2
...
Add proper handling for ship-to-ship battlefield
2017-07-14 16:30:40 +03:00
Dydzio
50b0773aab
Formatting change
2017-07-14 15:24:50 +02:00
Arseniy Shestakov
4bf1c9a9a3
Campaigns: fix crash on CMap::instanceNames serialization
2017-07-14 15:37:40 +03:00
