games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity
6,554 Commits 21 Branches 65 Tags 121 MiB
1d1519db5c
Commit Graph

3360 Commits

Author SHA1 Message Date
DjWarmonger
4b3a878c00 Fix for passability. 2016-12-21 13:37:19 +01:00
DjWarmonger
a0596ebecf Add clearance under town to ensure passability. 2016-12-21 10:43:24 +01:00
DjWarmonger
cc452bdfa9 Improved road routing so they can go under any passable object. 2016-12-21 10:10:37 +01:00
DjWarmonger
f78b524731 - Remove obstacle in front of player-owned towns 
- Allow obstacles to touch town object
 2016-12-20 15:23:47 +01:00
DjWarmonger
e37c35e439 Zone guard will cause object be placed as far away from it as possible in both zones. 2016-12-20 11:58:39 +01:00
DjWarmonger
ee3aec55f2 Correct implementations of A* algorithm. Seemingly fixes #2496, it's also faster. 2016-12-15 16:29:23 +01:00
DjWarmonger
63d33a1e7c Extract priority queue construction for reuse. 2016-12-15 12:58:16 +01:00
DjWarmonger
4102546977 Corrected road generation - they will be straight whenever possible. 2016-12-15 12:36:47 +01:00
DjWarmonger
27ff9efd4b Fixed #1713 2016-12-12 21:38:12 +01:00
DjWarmonger
80d5f7b4a4 Updated project files to MVS 2015 (in fact, it's trivial). 2016-12-12 19:14:45 +01:00
dydzio
c45a256816 Further fix for mantis #2599 2016-12-10 13:34:58 +01:00
AlexVinS
7126bd61a4 Fixed CID 1197343 2016-12-05 03:12:11 +03:00
AlexVinS
478890df5f Fixed CID 1366431, CID 1366430 2016-12-05 02:55:05 +03:00
Dydzio
a77863145a Regression fix - enemy hero info crash 2016-12-03 09:52:19 +01:00
AlexVinS
36598d8695 Fixed CID 1197474, CID 1366358 2016-11-28 19:35:33 +03:00
AlexVinS
394d6e0677 Fixed random crash on resurrection 2016-11-28 19:35:31 +03:00
AlexVinS
c23d3ac83c Fixed CID 1366432 2016-11-28 03:59:03 +03:00
AlexVinS
60bd54c9b3 Changed playerToSide return type to signed 2016-11-28 03:33:39 +03:00
AlexVinS
2a62ca9522 Fixed CID 1197353 2016-11-28 02:50:43 +03:00
AlexVinS
609c6f81bd Fixed a few CWE-457 2016-11-27 22:37: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
c4ab962cc0 Fixed a few CWE-457 2016-11-27 17:48:18 +03:00
AlexVinS
8b4f1fc938 Fixed CID 1288850 2016-11-26 22:24:16 +03:00
AlexVinS
30663f15ea Fixed CID 1288863 2016-11-26 22:12:52 +03:00
AlexVinS
96bc191480 Fixed CID 1366296 2016-11-26 21:45:58 +03:00
AlexVinS
c9e564bed8 Fixed CID 1366332 2016-11-26 21:14:21 +03:00
AlexVinS
7d2874bf12 Fixed CID 1366292 2016-11-26 21:11:21 +03:00
AlexVinS
121dd6c63a Fixed CID 1366333 2016-11-26 21:06:34 +03:00
AlexVinS
0a4e5fcdca Fixed CID 1366337 2016-11-26 20:54:07 +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
DjWarmonger
5058d5771e Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 20:54:53 +01:00
AlexVinS
47085e8d78 Fixed CID 1366361 2016-11-25 22:20:40 +03:00
DjWarmonger
4789262200 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 19:54:44 +01:00
AlexVinS
dc1015fac9 Fixed CID 1197411 2016-11-25 21:51:27 +03:00
DjWarmonger
2ac72bf75b Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 19:37:29 +01:00
AlexVinS
d81c611ad7 Fixed CID 1197423, CID 1197567 2016-11-25 21:35:47 +03:00
DjWarmonger
56b201e7e8 Fixed CID 1366289 and 1366290. 2016-11-25 19:32:54 +01:00
AlexVinS
a8cadfe25c Fixed a few CWE-457 in NetPacks.h 2016-11-25 21:04:38 +03:00
AlexVinS
384c5827ae Fixed CID 1197490, CID 1197491 2016-11-25 17:21:27 +03:00
AlexVinS
ca13bb8412 Fixed CID 1366375, CID 1197633 2016-11-25 17:04:30 +03:00
AlexVinS
5a3854a8de Fixed CID 1288852, CID 1243202 2016-11-25 16:51:31 +03:00
AlexVinS
4ba3c6fecc Fixed CID 1288855 2016-11-25 16:40:11 +03:00
AlexVinS
6d3259909e Fixed CID 1288858 2016-11-25 16:17:38 +03:00
AlexVinS
fa4e00573f Fixed CID 1366350 2016-11-25 15:34:38 +03:00
AlexVinS
692d23e580 Fixed CID 1366376 2016-11-25 13:38:26 +03:00
AlexVinS
bd4040245f Fixed CID 1288859 2016-11-24 22:34:42 +03:00
AlexVinS
db40e125eb Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359 2016-11-24 21:56:30 +03:00
AlexVinS
52c610bbb0 Silence "X doesn't have a base stack!" warning (fixed version) 2016-11-18 18:35:05 +03:00
AlexVinS
2af7331088 Revert "Silence "X doesn't have a base stack!" warning" 
This reverts commit 6d13c8938c.
 2016-11-18 17:49:55 +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
ebb88f4133 There no point for struct MetaString and struct Component to have CPack as base 2016-11-18 16:58:22 +03:00
AlexVinS
6d13c8938c Silence "X doesn't have a base stack!" warning 2016-11-18 15:52:45 +03:00
AlexVinS
931656f24a possible fix for http://bugs.vcmi.eu/view.php?id=2612 2016-11-18 14:27:20 +03:00
AlexVinS
f8bf2c3746 Fixed http://bugs.vcmi.eu/view.php?id=2611 2016-11-18 12:56:58 +03:00
AlexVinS
713403a0e4 Cleanup 2016-11-13 13:15:36 +03:00
AlexVinS
4ff4e41e81 fixed typo 2016-11-13 13:13:41 +03:00
AlexVinS
2aa8c79a2c fixed boost::optional load, regression from https://github.com/vcmi/vcmi/pull/212 2016-11-13 11:46:26 +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
dydzio
5c07e1c432 Minor typo fixes 2016-11-10 11:51:47 +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
46196daa07 cleanup 2016-11-06 05:27:56 +03:00
AlexVinS
f538aae95e Partial fix for http://bugs.vcmi.eu/view.php?id=2590 2016-11-02 14:52:02 +03:00
DjWarmonger
db13d7a708 Version 0.99 updates. 2016-11-01 18:25:09 +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
DjWarmonger
aa0c745202 Compile fixes for MSVS. 2016-11-01 16:48:34 +01:00
AlexVinS
dad0569bc7 Relaxed cast requirements for Quicksand 2016-10-31 15:38:53 +03:00
Arseniy Shestakov
e79c522c4b Serializer refactoring: fix FileStream usage for game loading 
Miss this one rebase. Without this one non-English characters in paths to saves cause issues.
 2016-10-30 15:46:44 +03:00
Ivan Savenko
a1cca251ec Possible fix for selection of incorrect method for serialization of vector<bool> 2016-10-30 11:42:53 +02:00
Vadim Markovtsev
99a3a58cbb Add commander resurrection info window upon entering town 2016-10-29 21:55:00 +02:00
Arseniy Shestakov
e13f98e38e Compilation fix for VS2015 suggested by Ivan and tested by @dydzio0614 
It's compiled without it by Clang / GCC, but not MSVC++
 2016-10-29 21:29:25 +03:00
Ivan Savenko
256f43f467 Fixes zero-initialized fileVersion member in deserializer 2016-10-29 19:52:19 +03:00
Vadim Markovtsev
9f967b4d7a Fix formatting 2016-10-29 17:00:12 +02:00
Arseniy Shestakov
ba5ad286cd Serializer refactoring: fix paths to work in Visual Studio 2016-10-28 13:52:42 +03:00
Vadim Markovtsev
c696746017 Fix some compilation warnings 2016-10-28 08:07:05 +02:00
AlexVinS
3a040c1730 Updated project files 2016-10-27 19:18:52 +03:00
Arseniy Shestakov
ba1929728a Drop old now unused serializer files 2016-10-27 18:44:00 +03:00
Arseniy Shestakov
5f1254a29e Apply some of Vadim's changes 
I intentionally didn't transfer changes in CLoadIntegrityValidator since not really agree with them.
 2016-10-27 18:39:17 +03:00
AlexVinS
8f349b5105 CTypeList: Apply changes from a50a32405d 
Use weak_ptr for TypeDescriptor cross-links. Fixed total TypeDescriptor memory leak.
 2016-10-27 18:12:30 +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
Ivan Savenko
3d1b1f4ba8 Add files for rebased serializer refactoring done by Ivan 2016-10-27 17:26:22 +03:00
AlexVinS
1ccb0d98be Disabled git version of C::B projects 2016-10-27 16:27:10 +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
baa7a84db3 Fix memory corruption during loading artifacts from mods 2016-10-22 10:00:55 +02:00
Alexander Shishkin
4876cc178d Merge pull request #240 from vcmi/spellWindowRewrite 
Spell window rewrite
 2016-10-17 07:58:56 +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
153af6e07b cleanup 2016-10-16 02:47:03 +03:00
AlexVinS
f760e22707 Fixed two recursive infinite loops in case of alternate buildings. 
* introduced in https://github.com/vcmi/vcmi/pull/211
 2016-10-15 04:19:47 +03:00
AlexVinS
cf143cd257 Hack-fix crash in CGTownInstance::genBuildingRequirements related to alternate town buildings 
* this disables features of #211, but actual problem may be deeper inside logical expressions
 2016-10-14 23:46:24 +03:00
Vadim Markovtsev
76ac9991ed Format code 2016-10-12 17:22:35 +02:00
AlexVinS
552f28c10b fix 2016-10-11 21:25:22 +03:00
AlexVinS
ef9bff9006 fixes related to http://bugs.vcmi.eu/view.php?id=2520 2016-10-11 20:04:30 +03:00
AlexVinS
9834db1b7d simplified CGScholar::onHeroVisit 2016-10-11 20:04:28 +03:00
AlexVinS
4173a5064c Fixed http://bugs.vcmi.eu/view.php?id=2545 2016-10-11 20:04:27 +03:00
AlexVinS
24585cde87 complete fix for http://bugs.vcmi.eu/view.php?id=2507 2016-10-11 18:19:42 +03:00