AlexVinS
8c0fab1dcf
fixes
2017-08-12 14:36:37 +03:00
AlexVinS
15138c23de
Finished conversion to new logging API
...
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
2017-08-11 23:06:27 +03:00
AlexVinS
64d9dadd64
Logging cleanup.
2017-08-11 15:47:50 +03:00
AlexVinS
c293589c07
A bit more logging cleanup
2017-08-10 23:47:58 +03:00
AlexVinS
143ff682bc
Logging cleanup
2017-08-10 21:59:55 +03:00
AlexVinS
85e952f25f
Logging cleanup 3
2017-08-10 20:17:10 +03:00
AlexVinS
61e241308d
Logging cleanup
2017-08-10 19:52:05 +03:00
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
Piotr Wójcik
886c8f63c6
Show stacks selected to sacrifice
2017-08-01 17:17:46 +02: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
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
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
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
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
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
ArseniyShestakov
ea0ceb1805
Merge pull request #323 from vcmi/CStackTweaks
...
CStack tweaks
2017-07-15 00:42:08 +03:00
AlexVinS
2fb531b6d0
Display actual moral and luck for batlle stack
2017-07-14 21:42:36 +03:00
Arseniy Shestakov
f1e5797834
Code style: move or add licensing information on top of every file
2017-07-14 01:26:03 +03: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
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
2c525fc76e
Attempt to fix headless tests crash.
2017-07-12 17:02:25 +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
ArseniyShestakov
fcd63cd982
Merge pull request #333 from dydzio0614/RealFullscreen
...
Add optional real fullscreen mode support
2017-07-10 21:04:24 +03:00
AlexVinS
1fe01b7254
Moved defensive stance log message building to server side.
2017-07-10 04:05:36 +03:00
AlexVinS
7bf8c9bd69
fixed and cleanup
2017-07-08 21:20:38 +03: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
ArseniyShestakov
3634af10ba
Merge pull request #330 from dydzio0614/AmountBoxTweaks
...
Tweak battle creatures amount box hiding
2017-07-08 15:54:18 +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
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
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
Victor Luchits
310f6e27cb
Workaround ffmpeg linking problems
2017-07-04 03:31:13 +03:00
AlexVinS
dbaf3cb023
Cleanup & formatting
2017-07-04 01:32:40 +03:00