1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

2489 Commits

Author SHA1 Message Date
Arseniy Shestakov
cc163c4e05 Refactoring of networking code on server and client
* Avoid server crash on dummy connect / disconnect.
* Avoid server crash when host left from PreGame.
* Server print it's state with name when it's waiting for connection or in pregame.
* Server will use random port if specified port is busy.
2017-06-02 02:44:39 +03:00
Arseniy Shestakov
db5a52a0f8 Multiplayer: gracefully handle player loss unless it's a host
We don't want server to shutdown after just one of players lost the game.
2017-05-31 08:04:26 +03:00
AlexVinS
009bfb8211 cleanup 2017-05-28 17:27:16 +03:00
AlexVinS
fa6a7bd1b5 Fixed CID 1375682 2017-05-28 15:06:12 +03:00
AlexVinS
f5cdaece6f Fixed CID 1375687 2017-05-28 14:40:36 +03:00
AlexVinS
1c95c51ffb Fixed CID 1375685 2017-05-28 14:40:36 +03:00
AlexVinS
df3574b50f Fixed https://bugs.vcmi.eu/view.php?id=2685 2017-05-27 17:07:11 +03:00
AlexVinS
a85b4cf2a5 * WIP on event condition format
* Hero portrait serialization
* Fix town spells serialization

* Added support for float exponential part in Json
* Added support for int64 in Json
* Added basic Hero definitions serialization
* Added rumors serialization
* Advanced player info serialization.
* Added Disposed heroes serialization, (!) not covered with tests yet
* Added Local event serialization
* Added Pandoras box serialization
* Added Seer hut reward serialization
* Added CQuest serialization
* Added API for map object instance names serialization.
* Added random dwelling options serialization
* Advanced town options serialization
* Advanced hero options serialization
* More map format tests
* A lot of fixes, cleanup and refactoring
2017-05-27 00:23:19 +03:00
Dydzio
5127061e28 Commander skill description support (#266)
* Added commander skill description support

* Add support for ZNPC00.txt not found
2017-05-26 22:58:33 +03:00
Fay
b5daa24982 Android support (#299)
* AI libs registering shenanigans on android;
* Fixed resolution aspect + mouse event scaling;
* Proper server init/deinit (through android IPC);
Enabled threaded init in CMT;
* Prevented a deadlock in logger on some devices;
* Fixed frozen intro frame after interrupting the video;
Added android progressbar displaying during initial data loading;
* Hacky fix for choppy animations during heroes movement (should look better now, but it's definitely not a good solution);
* Changes/fixes for new android launcher building process;
* Fixed app hang after getting SDL_QUIT when activity was destroyed;
* Functioanal, configurable advmap swiping support;
* VCMI changes cleanup;
Added few missing VCMI_ANDROID guards on swipe mechanics;
* Removed unneeded sleep in server startup code for android;
* Removed android ioapi hack (fixed in newest ndk);
* Removed unused android's library loading logic;
* Added android's swipe option to settings schema;
* Moved NO_STD_TOSTRING to be defined in global.h instead of build files;
2017-05-25 20:57:20 +03:00
AlexVinS
f370cdf1c7 Possible fix for https://bugs.vcmi.eu/view.php?id=2678 2017-05-25 20:09:38 +03:00
ArseniyShestakov
bdb0db819d Merge pull request #300 from Chocimier/iss1761
Correctly display visiting army in kingdom overview, fixes #1761
2017-05-23 03:53:11 +03:00
Piotr Wójcik
76acc29d6c Correctly display visiting army in kingdom overview, fixes #1761
Do not modify CIntObject::pos, according to its doc
2017-05-22 22:34:05 +02:00
DjWarmonger
1b7420264f Merge pull request #295 from Chocimier/iss1293
T hotkey select first town when last is active, fixes #1293
2017-05-13 18:22:28 +02:00
Piotr Wójcik
e4d3cdca09 Simplify 2017-05-13 16:57:15 +02:00
FeniksFire
d390dff54d Fix game crash after autofight.
Vcmi makes crash when I turn on autofight in the battle and wait until I
close result battle window.
2017-05-13 09:54:03 +02:00
Piotr Wójcik
cc02001836 T hotkey select first town when last is active, fixes #1293 2017-05-11 20:49:17 +02:00
DjWarmonger
48702a26a4 Merge pull request #294 from dydzio0614/bug2476
Fix bug #2476 (2nd solution)
2017-05-02 08:16:54 +02:00
dydzio
944edaf0bb Fix bug #2476 2017-03-27 23:47:26 +02:00
FeniksFire
19a9f05b80 Fix garrison highlight in city (#292) 2017-03-23 22:48:35 +03:00
Dydzio
88952aefff Restart button fix (#288) 2017-03-19 16:58:46 +03:00
Arseniy Shestakov
09d593e59b CBattleInterface: avoid freezes on end of battle. Fix issue 1897 2017-03-19 05:15:31 +03:00
FeniksFire
cde8542475 Oversight. 2017-03-18 14:25:17 +01:00
FeniksFire
dd5660ff08 Simplifity code. 2017-03-18 14:21:41 +01:00
FeniksFire
d045f59a11 Little fix in braces #2. 2017-03-18 07:58:40 +01:00
FeniksFire
68c618cb99 Little fix in highlight in CGarrisonSlot. 2017-03-17 21:24:55 +01:00
FeniksFire
3de891b4b4 Moving/dividing classes from BattleState to separate files. 2017-03-17 16:48:44 +01:00
Arseniy Shestakov
d4091db172 CInfoBar: only pop up when adventure map interface is on top 2017-03-14 00:03:15 +03:00
FeniksFire
46a06ce184 Change the year from 2016 to 2017 in help description. 2017-03-10 19:28:01 +01:00
dydzio
8a2b47d967 Fix for bug #2435 2017-02-10 12:19:35 +01:00
DjWarmonger
a8c39d9267 Merge pull request #274 from dydzio0614/ShooterInit
Approved. One guy named Avatar requested it recently ;)
2017-02-06 21:18:19 +01:00
dydzio
141e5ad032 Implement "emergency" projectile init attempt 2017-02-03 23:25:46 +01:00
dydzio
81a00f59d1 Basic fix for bug #2635 2017-02-02 19:17:15 +01:00
Dydzio
6c8ef79727 Merge branch 'develop' into MakeWOGGreatAgain 2017-02-01 23:14:36 +01:00
dydzio
3e285c2004 Add santa gremlin missing creature ability, fix shooter init bug 2017-01-26 20:53:28 +01:00
Michał Kalinowski
4d39f652bf Making more detailed options when choosing AI in launcher: http://
bugs.vcmi.eu/view.php?id=2369
2017-01-17 12:34:28 +01:00
Dydzio
79c101a56d Remove leftover commander artifact code 2016-12-31 21:29:47 +01:00
DjWarmonger
80d5f7b4a4 Updated project files to MVS 2015 (in fact, it's trivial). 2016-12-12 19:14:45 +01:00
AlexVinS
8f7b0dac45 Fixed CID 1197332 2016-12-05 06:00:32 +03:00
AlexVinS
45ae1ef165 Fixed CID 1197342 2016-12-05 03:17:03 +03:00
AlexVinS
d003abea6f Fixed CID 1197624 2016-12-05 02:52:34 +03:00
AlexVinS
204ee37ae4 boost/program_options has only 2 uses, and unlikely will be used more -> removed form Global.h. 2016-11-28 21:38:17 +03:00
AlexVinS
7d29365e4a Fixed CID 1243197 2016-11-28 02:50:45 +03:00
AlexVinS
2dd6a47764 try to plug a few coverity false positives 2016-11-28 02:50:41 +03:00
AlexVinS
9094c99759 Fixed CID 1366403 2016-11-28 02:50:40 +03:00
AlexVinS
312793efd9 try to plug a few coverity false positives 2016-11-27 23:41:17 +03:00
AlexVinS
c0ed22c99e Fixed CID 1366398. 2016-11-27 22:14:41 +03:00
AlexVinS
3216422307 Fixed a few CWE-457 2016-11-27 22:07:01 +03:00
AlexVinS
abe4beebc6 Fixed CID 1197516 2016-11-27 19:13:40 +03:00
AlexVinS
6196ae7fca Fixed a few CWE-457 2016-11-27 19:00:16 +03:00