games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-08 00:39:47 +02:00
Code Issues Releases Activity
6,834 Commits 21 Branches 64 Tags 117 MiB
654ca96e9d
Commit Graph

2598 Commits

Author SHA1 Message Date
AlexVinS
2cfb2e6ae0 get rid of CPlayerBattleCallback::battleCanCastThisSpell 2017-06-05 22:53:42 +03:00
AlexVinS
4d430f6ad8 get rid of CPlayerBattleCallback::battleCanCastSpell 2017-06-05 22:16:12 +03:00
AlexVinS
66cfc2fef9 CSpell::canBeCast tweaks 2017-06-05 21:30:25 +03:00
AlexVinS
e25ed4f358 [Tweak] Use unique_ptr for map header in pregame 2017-06-04 21:11:58 +03:00
Alexander Shishkin
7e1b0d71c5 Added option for saving generated maps on client side (#307) 
* new configuration option 'general.saveRandomMaps'
* maps being saved to 'userCachePath/RandomMaps'
* no deletion of old random maps
* map filename generated based on template name and random seed
 2017-06-04 20:33:28 +03:00
Arseniy Shestakov
6642816b1e Client: server port and testing options cleanup 
Now we only pass port as ui16 instead of std::string
 2017-06-04 08:49:23 +03:00
Arseniy Shestakov
4a302d4fe5 CBattleHero::clickRight: more elegant code for side detection 2017-06-03 04:28:03 +03:00
Arseniy Shestakov
4b0f702e7e Add LeaveGame netpack and avoid replying on it and CloseServer 2017-06-02 02:51:44 +03:00
Arseniy Shestakov
c7e7a4d7be Make usage of boost::interprocess optional 
If shared memory allocation failed on client server will be started without shared memory option.
Only downside of this is that server wouldn't be able to fallback to random port if default is busy.
 2017-06-02 02:44:41 +03:00
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
AlexVinS
27b853618c Fixed a few CWE-457 2016-11-27 18:17:20 +03:00
AlexVinS
c4ab962cc0 Fixed a few CWE-457 2016-11-27 17:48:18 +03:00
AlexVinS
f11c54b5e9 Wipe unused ClickableArea 2016-11-27 16:07:03 +03:00
AlexVinS
418babce81 Fixed CID 1288846 2016-11-26 22:33:08 +03:00
AlexVinS
30663f15ea Fixed CID 1288863 2016-11-26 22:12:52 +03:00
AlexVinS
7793a57b0a Fixed remaining CWE-457 in NetPacks.h 2016-11-26 20:50:07 +03:00
AlexVinS
86e33a4c45 [Refactoring] Unified SetResources NetPack API. 2016-11-26 15:14:43 +03:00
AlexVinS
a497824288 Fixed CID 1366287, CID 1366286 2016-11-25 23:12:10 +03:00
DjWarmonger
5058d5771e Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 20:54:53 +01:00
AlexVinS
86c7bab9c1 Fixed CID 1366324 2016-11-25 22:28:16 +03:00
AlexVinS
80666fb134 Tweaks 2016-11-25 22:12:22 +03:00
AlexVinS
f0963c91bb Fixed CID 1197409 2016-11-25 21:59:27 +03:00
DjWarmonger
d252265824 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 18:59:33 +01:00
DjWarmonger
9049990079 Compile fix for MSVS (compiler bug?). 2016-11-25 18:59:17 +01:00
AlexVinS
8b6543bef2 Fixed CID 1366365, CID 1288839 2016-11-25 19:58:52 +03:00
AlexVinS
6a616a5d33 Fixed CID 1366371 2016-11-25 19:36:40 +03:00
AlexVinS
663099882c Fixed CID 1366366, CID 1366367, CID 1366368, CID 1366369, CID 1366370, CID 1366372 2016-11-25 19:28:00 +03:00
AlexVinS
ac8b618a42 Fixed CID 1366373 2016-11-25 19:17:37 +03:00
AlexVinS
5dd5a0d4a8 Fixed CID 1197445, CID 1197446 2016-11-25 17:54:01 +03:00
AlexVinS
b908c70468 Fixed CID 1197487 2016-11-25 17:29:49 +03:00
AlexVinS
4e28efb8b4 Fixed CID 1288860 2016-11-25 16:09:14 +03:00
AlexVinS
f50fd6d8db Fixed CID 1366281, CID 1366282, CID 1366283, CID 1366284 2016-11-25 15:45:09 +03:00
AlexVinS
20de754141 def2bmp CLI command converted to CAnimation 2016-11-25 15:23:28 +03:00
AlexVinS
3c9695abcc Fixed CID 1366310 2016-11-25 13:58:20 +03:00
AlexVinS
db40e125eb Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359 2016-11-24 21:56:30 +03:00
AlexVinS
04d22644e5 fixed http://bugs.vcmi.eu/view.php?id=2617 2016-11-23 14:47:57 +03:00
AlexVinS
dc39fb2d14 Removed useless CPack::type field. 
* it was an ancient network protocol artifact
 2016-11-18 17:45:59 +03:00
AlexVinS
33c0bc49f6 Merge branch 'CommanderArtifacts3' into develop 2016-11-13 15:31:16 +03:00
AlexVinS
4338fc4ffb CMessage converted to CAnimation 2016-11-13 08:11:01 +03:00
Alexander Shishkin
a73ca79ed1 Merge pull request #257 from vcmi/mapHandlerRefactoring2 
Map handler refactoring, part 2.
 2016-11-12 09:20:45 +03:00
AlexVinS
9e6bd48038 fix 2016-11-10 14:38:33 +03:00
dydzio
5c07e1c432 Minor typo fixes 2016-11-10 11:51:47 +01:00
AlexVinS
b248642468 fixes and cleanup 2016-11-09 09:32:44 +03:00
dydzio
b626f9a134 Fix CCommanderArtPlace localization + minor fixes 2016-11-08 17:26:24 +01:00
AlexVinS
a8a661b159 Map handler refactoring, part 2. 2016-11-08 00:19:53 +03:00
AlexVinS
aad675a7c4 Revert "Merge branch 'p254_4' into develop" 
This reverts commit 37f68713a7, reversing
changes made to 4477b7c35d.
 2016-11-08 00:17:20 +03:00
AlexVinS
4d510c172d Terrain drawing converted to CAnimation. 2016-11-07 23:48:30 +03:00
AlexVinS
c9a3d92ff3 cleanup 2016-11-06 17:36:46 +03:00
dydzio
96fa0fb6d4 Implement giving commander artifacts back to hero 2016-11-06 13:02:00 +01:00
AlexVinS
6782136e3e Map edge drawing converted to CAnimation 2016-11-06 05:27:58 +03:00
AlexVinS
46196daa07 cleanup 2016-11-06 05:27:56 +03:00
AlexVinS
6a272d8f0c FoW drawing converted to CAnimation 2016-11-06 05:27:45 +03:00
AlexVinS
c11a660d21 Fixed and cleanup 2016-11-06 05:27:44 +03:00
AlexVinS
186cd7a163 Mao object drawing converted to CAnimation 2016-11-06 05:27:26 +03:00
dydzio
baeb3c9e55 Refactor CArtPlace + use it for commanders 2016-11-04 17:54:09 +01:00
AlexVinS
08252a1282 Merge remote-tracking branch 'remotes/dydzio/CommanderArtifacts2' into develop 2016-11-03 22:27:08 +03:00
dydzio
03620b3cbe Remove artifact assembly check for commanders 2016-11-03 19:49:55 +01:00
AlexVinS
329a537eec Plug assertion (report warning instead) on some maps start. 2016-11-03 19:15:16 +03:00
AlexVinS
9e366df70f Merge branch 'PregameCache' into develop 2016-11-03 17:10:54 +03:00
dydzio
47a72d4441 Make artifacts worn by commander visible 2016-11-03 14:25:17 +01:00
dydzio
9de5b9f02b New/load game last selection storing. Fixes #716 2016-11-02 20:10:34 +01:00
DjWarmonger
9db3bfcbf2 Merge pull request #212 from vcmi/refactoring/serialization2 
Apparently it works - both new and old saves load at least.
 2016-11-01 17:25:39 +01:00
Vadim Markovtsev
8d40a4aa95 Fix GUI disposal in creature info window 2016-10-30 22:21:26 +01:00
Vadim Markovtsev
34005228e0 Fix bugs with giving commander's badge to stacks 
1. SEGFAULT
2. Memory leaks
3. Invalid drawing
4. Fix returning artifacts
 2016-10-30 16:32:28 +01:00
Vadim Markovtsev
220e4d2030 Survive giving Commander's badge to stacks 
Used to SEGFAULT
 2016-10-30 14:27:53 +01:00
Vadim Markovtsev
79c85be93f Fix large obstacles drawing in front of the stacks 2016-10-30 04:51:35 +01:00
Ivan Savenko
256f43f467 Fixes zero-initialized fileVersion member in deserializer 2016-10-29 19:52:19 +03:00
Vadim Markovtsev
ab7a0d64eb Fix formatting 2016-10-28 23:37:20 +02:00
Alexander Shishkin
0cf5a10bd1 Merge pull request #243 from vcmi/guiCleanup 
Gui cleanup
 2016-10-28 08:53:03 +03:00
AlexVinS
f304c9b2e0 removed unused field 2016-10-27 18:35:53 +03:00
AlexVinS
ffeaef2bda fixes 2016-10-27 18:19:45 +03:00
Ivan Savenko
5b76c3f4eb Rebase of codebase changes for refactored serializer 
Some of newer fixes not yet merged there and save compatibility a bit off.
 2016-10-27 18:12:20 +03:00
AlexVinS
f32097339c Use CSDL_Ext blit for paletted sprites, use SDL blit otherwise. 
*  No solution found to blit paletted images with alpha channel with SDL
 2016-10-27 17:32:31 +03:00
Arseniy Shestakov
15b4774076 Logging: always print version of client and server in the begining 2016-10-27 17:14:20 +03:00
Arseniy Shestakov
cb3d6a24e7 Cmake: cleanup for commit hash in build version 
Since it's available in lib we don't need to include it everywhere.
 2016-10-27 17:01:29 +03:00
AlexVinS
3dddbcf2e8 try to use CAnimation for Hero path 2016-10-27 16:34:15 +03:00
AlexVinS
8505a909e1 free Graphics object on quit. 2016-10-27 16:34:13 +03:00
AlexVinS
536f36ede8 use CAnimation fro world view icons 2016-10-27 16:34:12 +03:00
AlexVinS
365c64a345 use CAnimImage for world view legend 2016-10-27 16:34:10 +03:00
AlexVinS
36ac9ac86c CAdvMapInt tweak 2016-10-27 16:34:07 +03:00
Vadim Markovtsev
da1c9cf249 Fix rebuilding everything on HEAD change 2016-10-23 16:56:53 +02:00
Vadim Markovtsev
d0beb27197 Add git commit hash into the version string 2016-10-23 15:45:47 +02:00
Vadim Markovtsev
4bcc43d3d0 Fix Mantis #2234 
CPlayerInterface instances were removed from CClient::playerint with
clear() and finish() was not called on each. Added multiple insurance.
 2016-10-22 16:22:00 +02:00
Vadim Markovtsev
d51c9a1ff0 Fix uninitialized scrolling state 2016-10-22 10:18:57 +02:00
AlexVinS
feaccead36 fixed missed initialization 2016-10-18 02:37:02 +03:00
AlexVinS
28dd12089b CSpellWindow fixes. 2016-10-18 02:15:43 +03:00
AlexVinS
a223793405 Get rid of CDefHandler in CPreGame. 
* also fixes difficulty icon in campaign screen
 2016-10-18 01:43:42 +03:00
ArseniyShestakov
eec14028fe Merge pull request #242 from dydzio0614/MapScrollCursor 
Implement adventure map scroll cursor change
 2016-10-17 16:09:01 +03:00
dydzio
22564dde4b Implement adventure map scroll cursor change 2016-10-17 14:55:55 +02:00
AlexVinS
b256c4c36d Improved creature casting GUI. 
* "F" is new hotkey for creature spells
* creature spells now have lowest priority unless F pressed
* creatures can cast NO_LOCATION spells (only with hotkey)
 2016-10-17 08:09:09 +03:00
Alexander Shishkin
4876cc178d Merge pull request #240 from vcmi/spellWindowRewrite 
Spell window rewrite
 2016-10-17 07:58:56 +03:00
AlexVinS
5346ecb6df tweak 2016-10-17 05:42:29 +03:00
AlexVinS
3bd8cde8e0 fix 2016-10-17 05:21:43 +03:00
AlexVinS
345dd913f6 use CLabel in SpellArea 2016-10-17 05:05:48 +03:00
AlexVinS
e3ee51a28f Use label object for mana 2016-10-17 04:05:33 +03:00
AlexVinS
bc2f0ba6f1 fixed spell school ordering http://bugs.vcmi.eu/view.php?id=91 2016-10-17 03:33:29 +03:00
Vadim Markovtsev
89f506658e Fix issue #2068 - maps list update 2016-10-16 22:15:37 +02:00
AlexVinS
ba5b65ff93 get rid of CDefHandler in CSpellWindow 2016-10-16 15:27:35 +03:00
AlexVinS
2a6bab119b Use CAnimImage for SpellArea 2016-10-16 13:22:07 +03:00
AlexVinS
3a52a3c663 Allow CAnimImage to share animation object. 2016-10-16 12:58:18 +03:00
AlexVinS
e6829bf271 Removed unused debug data in CAnimation. 2016-10-16 12:02:50 +03:00