c3e6195cc9
CServerHandler: one more small fix when server is crashed
2017-08-13 23:17:56 +03:00
9c7c47c754
CServerHandler: for now don't stop client if server crashed
...
Currently server stable enough and only crash on shutdown.
It's certainly more annoying to crash on end of game than get freeze.
Unfortunately it's crash on shutdown almost every time on macOS.
2017-08-13 23:09:23 +03:00
1a1d7c27cb
Travis CI: download MXE packages with -q --yes instead of -qq
...
MXE server is slow and downloads could take more than 10 minutes.
2017-08-13 22:22:57 +03:00
fad2a0a3fb
Fix memory leak and remove some garbage files added in last commit
2017-08-13 22:15:25 +03:00
cd98dd0b89
CGuiHandler: make terminate_cond non-static
...
Static variable might be not yet initialized by the time it's used inside CGuiHandler constructor.
This fix let us avoid crash that occur when built with Xcode 8.2.1
2017-08-13 21:54:07 +03:00
5067e73c30
Merge pull request #364 from vcmi/newLogApi
...
Finished conversion to new logging API
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
2017-08-12 16:55:18 +03:00
0868164147
(int) -> static_cast<int>
2017-08-12 15:43:41 +03:00
8c0fab1dcf
fixes
2017-08-12 14:36:37 +03:00
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
f2de6d1122
fix
2017-08-11 17:38:28 +03:00
a8a3230798
Logging cleanup (server).
2017-08-11 16:50:00 +03:00
046e1a7c29
Prepared JsonNode for new logging API.
2017-08-11 16:27:42 +03:00
64d9dadd64
Logging cleanup.
2017-08-11 15:47:50 +03:00
c293589c07
A bit more logging cleanup
2017-08-10 23:47:58 +03:00
143ff682bc
Logging cleanup
2017-08-10 21:59:55 +03:00
96eb9c0ac7
tweak
2017-08-10 20:57:36 +03:00
85e952f25f
Logging cleanup 3
2017-08-10 20:17:10 +03:00
61e241308d
Logging cleanup
2017-08-10 19:52:05 +03:00
18b8e1c7ad
Tweaked CBonusTypeHandler
2017-08-09 12:18:49 +03:00
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
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
4388e12a3a
Merge pull request #358 from Chocimier/altar
...
Fixed bugs in Altar
2017-08-05 02:25:41 +03:00
2d31d5710f
[tests] Reduced code duplication
2017-08-03 15:56:45 +03:00
12b42f4495
Improved map format tests
2017-08-03 13:50:54 +03:00
c5aa403197
Fixed http://bugs.vcmi.eu/view.php?id=2730 by Anubis ( #361 )
2017-08-03 09:03:55 +03:00
886c8f63c6
Show stacks selected to sacrifice
2017-08-01 17:17:46 +02:00
3de0fa37f8
Possible fix for https://bugs.vcmi.eu/view.php?id=2759
2017-08-01 17:00:26 +03:00
9d9c026c85
Code style: serialize everything on own lines for easier debugging ( #357 )
2017-07-31 16:35:42 +03:00
137b9cde19
Fix crash in Altar of Sacrifice, fixes #2648
2017-07-29 19:27:39 +02:00
980926a7bd
Fixed https://bugs.vcmi.eu/view.php?id=2749
2017-07-27 11:58:51 +03:00
f931b19a16
Show correct quantity of guards of dwelling, fixes #2502 ( #356 )
2017-07-26 00:00:29 +03:00
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
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
069f295165
Do not summon boat from another boat, fixes #2294 ( #353 )
2017-07-22 23:47:29 +03:00
747ef0d222
Fix for failing vcmi-android build; ( #352 )
2017-07-22 22:27:25 +03:00
1b9daecd27
CMake: remove Boost.Test requirement
2017-07-22 03:19:17 +03:00
df82380d93
AUTHORS: add FeniksFire. Again
...
Let's hope Warmonger won't remove him on merge ;-)
2017-07-20 19:00:02 +03:00
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
2e2642ef7a
[C::B] test project update
2017-07-20 15:46:40 +03:00
303a3b670c
Merge branch 'improvingTheBattle' into develop
2017-07-20 15:46:29 +03:00
d84ecb6fb2
Tests improvement
...
Delete our logger from tests.
Make correction.
2017-07-19 17:04:57 +02:00
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
6d9f99d4de
Code style: and one more pass on lambda expressions parameter list
2017-07-19 02:11:17 +03:00
b540ab73ed
Code style: add empty parameters list to more lambda expressions
2017-07-19 01:39:38 +03:00
587f59e93a
Migrating "CHealthTest" from boost to googlemock and googletest.
2017-07-18 21:04:57 +02:00
704eeb25b2
Add googletest as submodule
2017-07-18 16:49:50 +02:00
a71c9d0751
Migrating from boost test to google test.
2017-07-18 16:49:05 +02:00
8314e8234f
Fix water wheel gold amount ( #348 )
2017-07-18 15:00:30 +03:00
2da3d8a563
Code style: remove senseless comments
2017-07-18 00:04:00 +03:00
b2f74a93cf
Code style: add empty parameter list to all lambda expressions ( #345 )
2017-07-17 15:35:57 +03:00
