games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
5,598 Commits 30 Branches 75 Tags
7cf2d79584aba16748ac92b73f60a1e731b0270c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DjWarmonger 7cf2d79584 Final compile fix. 2016-02-02 18:48:20 +01:00
DjWarmonger afd5b8807d Compile fix #2 2016-02-02 12:46:58 +01:00
DjWarmonger 6865f70ab8 Compile fix #1 2016-02-02 12:19:33 +01:00
DjWarmonger c78d2469c5 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-02-02 12:03:16 +01:00
DjWarmonger 4352f49a1d Merge pull request #185 from vmarkovtsev/issue/2264 
Fix 2264 learning stone & Learning skill
 2016-01-31 09:17:11 +01:00
DjWarmonger ab27464541 Merge pull request #182 from vmarkovtsev/issue/1916 
Fix 1916 water wheel reward
 2016-01-30 18:00:37 +01:00
DjWarmonger ca4e13b2dc Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-01-29 18:21:56 +01:00
DjWarmonger 9ce6f874f0 Local fixes. 2016-01-29 18:21:19 +01:00
DjWarmonger fdfe7b6b06 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-01-27 21:08:18 +01:00
DjWarmonger 327e95407e - Compile fixes part 1 
- Project settings for MSVS
 2016-01-27 21:08:08 +01:00
DjWarmonger 94ecc3f520 Compilation fix. MVS 2013 doesn't support constexpr and it's not needed either. 2016-01-27 10:13:33 +01:00
DjWarmonger fc62cabb68 Merge pull request #174 from vmarkovtsev/issue/981 
Fix CGHeroInstance::isInitialized implementation
 2016-01-27 09:43:53 +01:00
DjWarmonger f626c0f9ed Merge pull request #173 from vmarkovtsev/issue/981 
Fix 981 reset hero on hiring after retreat/surrender
 2016-01-26 21:24:22 +01:00
DjWarmonger b02bd61c83 Merge pull request #164 from vmarkovtsev/issue/1821 
Fix 1821 artifact assembly statusbar text
 2016-01-21 09:37:43 +01:00
DjWarmonger e187dd7b78 Merge pull request #158 from vmarkovtsev/issue/2389 
Merging, very good solution.
 2016-01-19 09:22:31 +01:00
DjWarmonger ac730a591c Fixed large treasure piles sometimes being uncovered. 2016-01-13 20:03:25 +01:00
DjWarmonger 8c5f93dd8f Little refactoring for object placement. 2016-01-13 19:17:12 +01:00
DjWarmonger 676f078b2e RMG will now multiply Monolith defs to ensure there are at least 100 pairs avaiable for connections. 2016-01-09 09:03:40 +01:00
DjWarmonger dd1fc47c93 Workaround for Seer Hut offset. They seem to work fine now. 2016-01-08 21:51:55 +01:00
DjWarmonger d840fb40eb Fixed crashes with RMG Seer Huts. Now they are functional. 2016-01-08 21:14:57 +01:00
DjWarmonger cdd50b1603 Version bump. 2016-01-01 20:06:38 +01:00
DjWarmonger a1f5a0a85c Removed unused code, which is not needed with new Pathfinder. 2015-12-24 11:28:14 +01:00
DjWarmonger be50d699fb Compile fixes for MSVS 2015-12-23 15:23:56 +01:00
DjWarmonger 45d183289d Merge pull request #142 from edeksumo/Fix-Defence-Ani 
Fix crash
 2015-11-24 21:37:32 +01:00
DjWarmonger 5fadb239f2 Merge pull request #134 from edeksumo/Fix-Defence-Ani 
Let's try this.
 2015-11-11 09:43:51 +01:00
DjWarmonger d95a999e23 Fixed ffmpeg compilation on Visual Studio. 2015-11-11 09:41:28 +01:00
DjWarmonger 349f16a359 Version bump. 2015-11-02 17:28:54 +01:00
DjWarmonger d7b70da27e Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-11-02 16:40:39 +01:00
DjWarmonger c047fea44c Updated changelog. To be released as VCMI 0.98e. 2015-11-02 16:39:57 +01:00
DjWarmonger 621c62b44e Don't crash when spell school level is higher than 3 (which is another bug) 2015-10-31 21:15:40 +01:00
DjWarmonger 5ef02aaf88 Updated MSVS project. 2015-10-31 15:08:13 +01:00
DjWarmonger 17071c6ec8 Merge pull request #125 from ArseniyShestakov/newMovementSystem 
Okay, time to merge this.
 2015-10-31 13:56:22 +01:00
DjWarmonger 94f8e1e9e4 Merge pull request #127 from vcmi/moreCatchingSectors 
Cache SectorMap where possible and update when necessary.
 2015-10-26 21:31:17 +01:00
DjWarmonger 1e36f3cecd Cache SectorMap where possible and update when necessary. 2015-10-26 16:38:17 +01:00
DjWarmonger 2a59cb6191 Fixed #2308 - AI didn't attack enemy heroes at all. 2015-10-25 11:55:50 +01:00
DjWarmonger 768b1ca289 More consitent code. 2015-10-25 11:16:43 +01:00
DjWarmonger 87f838f286 AI should poke inaccessible Quest Guards less often. 2015-10-25 08:39:03 +01:00
DjWarmonger 520e42bcd7 Fixed #2317 2015-10-25 08:21:15 +01:00
DjWarmonger c47c08aa01 Replaced iterators with auto & loop. 2015-10-25 07:07:01 +01:00
DjWarmonger 4e444abf66 Few more uses of cached visibleTiles. 2015-10-24 20:46:55 +02:00
DjWarmonger 63ca9202e4 Reverted old MapHandler::hideObject to avoid weird crash. 2015-10-24 19:03:11 +02:00
DjWarmonger a6ea0981b6 Merge branch 'develop' into mutexRelax 2015-10-24 18:30:43 +02:00
DjWarmonger eb0af0096e Fixed #2072. 2015-10-24 18:16:57 +02:00
DjWarmonger 61692ba168 Possibly fixed #1583 and other issues concerning players capturing towns. 2015-10-24 18:03:00 +02:00
DjWarmonger 3c4f7ec126 Fixed #2311 2015-10-24 17:15:21 +02:00
DjWarmonger 641aa13526 Some fixes for previous commit. 2015-10-24 17:02:00 +02:00
DjWarmonger 716c324695 Don't give a turn to player who is about to lose (days without town). 2015-10-24 16:21:30 +02:00
DjWarmonger abe88ea890 - Refactoring legacy code 
- Some checks for #2311
 2015-10-24 15:09:46 +02:00
DjWarmonger 8c9f8f22d9 Merge pull request #123 from ArseniyShestakov/mantis-1230 
Okay, now we shouldn't get broken savegames. Merging.
 2015-10-17 08:31:44 +02:00
DjWarmonger abe02247b5 Fixed bank randomization. 2015-10-02 17:28:33 +02:00
DjWarmonger 2733927527 Version bump. 2015-10-01 17:22:07 +02:00
DjWarmonger d6f6e9dc9e 0.98d release 2015-10-01 11:06:38 +02:00
DjWarmonger f81b46088a Fixed #2218 2015-09-29 11:01:59 +02:00
DjWarmonger 6b45f323ea Fixed logic regression from previous commit. 2015-09-23 21:38:16 +02:00
DjWarmonger 971f6d1c1f Removed WoG dependency for random artifacts. WoG version in repository updated. 2015-09-23 21:14:41 +02:00
DjWarmonger e2165a33a0 - Updated MSVS project 
- Artifacts added via mods now work correctly without WoG
 2015-09-23 19:34:12 +02:00
DjWarmonger def56051fc Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-09-23 19:03:48 +02:00
DjWarmonger 2851832f0c Fixed logs. 2015-09-20 14:02:52 +02:00
DjWarmonger 57637dd71a Added some checks & logs for empty def names, but it only delays the crash. 2015-09-20 13:02:13 +02:00
DjWarmonger e14faea181 Merge branch 'develop' of https://github.com/vcmi/vcmi into mutexRelax 2015-09-20 09:46:52 +02:00
DjWarmonger 32f3f9d76d Fixed high CPU usage by mapHandler::hideObject 2015-08-31 11:07:35 +02:00
DjWarmonger fe2a72f543 Minor optimization. 2015-08-31 10:08:50 +02:00
DjWarmonger afe65d1264 Relaxed some locks in VCAI. 2015-08-31 09:18:24 +02:00
DjWarmonger 1c14dbf7b2 Cache SectorMaps to evaluate multiple goals -> huge performance boost 2015-08-31 08:25:33 +02:00
DjWarmonger a3ce1521e5 Cache visible tiles within SectorMap for quicker access. 2015-08-31 07:39:03 +02:00
DjWarmonger 904a66764c Optimization to getPlayerTeam functions, not very successful :/ 2015-08-30 21:42:19 +02:00
DjWarmonger 70801309bd Optimization for CGameInfoCallback:getPlayer function. It also seems to be called more often than needed. 2015-08-30 20:51:22 +02:00
DjWarmonger cdad9f88b7 Relaxed Mutex of Logger. Attempt to optimize format function. 2015-08-30 19:26:19 +02:00
DjWarmonger 2012d53dd6 Fixed issues with exchanging combo artifacts (#2132). 2015-08-30 15:15:04 +02:00
DjWarmonger 6af8db2c69 Fixed logic discrepancy for (in)visible objects. Fixes #2224, #2225 and possibly more. 2015-08-30 09:14:54 +02:00
DjWarmonger a8c9727a5b Merge pull request #116 from DavidZeni/issue/2137 
Okay, thank you for your contribution :)
 2015-08-29 22:10:24 +02:00
DjWarmonger ee08e6be79 Merge pull request #115 from bwrsandman/creature-garisson-tooltip 
Looks good to me, merging.
 2015-08-26 15:51:07 +02:00
DjWarmonger 237d3f2624 Refactoring: random spells 2015-08-12 16:40:08 +02:00
DjWarmonger 3863756009 Version bump. 2015-08-01 18:37:14 +02:00
DjWarmonger 2dfcead9ef - Updated MSVS project 
- Updated changelog to 0.98c
 2015-08-01 17:49:12 +02:00
DjWarmonger c5691cbeb1 Compile fix - srsly? 2015-07-18 20:47:09 +02:00
DjWarmonger 50b7b8e47b Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-07-18 20:15:17 +02:00
DjWarmonger e9654ef487 Fixed issue when player starting towns were wiped. 2015-07-18 20:14:45 +02:00
DjWarmonger f9781ffb47 Creature abilities won't spawn in random Pandora Boxes. 2015-06-10 14:27:53 +02:00
DjWarmonger 9e7b459882 Partial solution to #2206 
TODO: add serialized field that contains custom guard config
 2015-06-05 11:28:14 +02:00
DjWarmonger 3f1bc7e21c One more case for Subterranean Gates 2015-06-04 09:42:39 +02:00
DjWarmonger 927dfa5565 Added correct connections for Subterranean Gates 2015-06-04 09:02:56 +02:00
DjWarmonger 63d6cf168f - Solved problems with sealed-off objects for once and all. 
- Refactoring
 2015-06-03 21:57:22 +02:00
DjWarmonger 923437bf76 Corrected offset check for required objects. 2015-06-03 19:38:53 +02:00
DjWarmonger 55c1a7eade Clear unused tiles to make more space for roads. 2015-06-03 15:16:11 +02:00
DjWarmonger 48efa2450a Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-06-03 07:00:46 +02:00
DjWarmonger 2dd813c35d Merge pull request #107 from vcmi/rmgTemplatesAsMods 
Rmg templates as mods
 2015-06-03 07:00:08 +02:00
DjWarmonger 6874b01912 Merge pull request #107 from vcmi/rmgTemplatesAsMods 
Rmg templates as mods
 2015-06-02 20:33:01 +02:00
DjWarmonger a96b80be50 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-06-02 20:31:55 +02:00
DjWarmonger 84beb6cdac Merge pull request #106 from vcmi/rmgTemplatesAsMods 
Okay, looks stable for now.
 2015-06-02 20:31:30 +02:00
DjWarmonger e21b2d9cbd Attempt to use A* algorithm for required objects. 2015-06-02 20:29:37 +02:00
DjWarmonger d0e68cf430 Merge remote-tracking branch 'remotes/origin/develop' into rmgTemplatesAsMods 2015-06-02 20:28:05 +02:00
DjWarmonger 5d067416a1 Merge pull request #106 from vcmi/rmgTemplatesAsMods 
Okay, looks stable for now.
 2015-06-02 17:45:20 +02:00
DjWarmonger a68b58d969 - Use straight paths for some connections 
- More fixes for template schema
 2015-06-02 16:40:32 +02:00
DjWarmonger d6225f50e1 Fixes for template schema. 2015-06-02 15:26:33 +02:00
DjWarmonger 8b1641d498 Generate main towns for zones with no player present. 2015-06-02 09:30:56 +02:00
DjWarmonger 1389ae0ea3 Fix Travis build 2015-06-02 07:01:38 +02:00
DjWarmonger c6f714db9c Fixed generation of CPU teams. 2015-06-01 21:57:43 +02:00
DjWarmonger 34a59a2788 - Fixed issues with number of players selection 
- Added new template for testing multiple players
 2015-05-27 18:58:14 +02:00
DjWarmonger 6890ae9f02 - Fixed improper use of playersCount. Now RMG can generate maps up to 8 players, with CPU players only as well. 
- Fixes for template scheme
 2015-05-27 11:30:46 +02:00