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
7,159 Commits 30 Branches 75 Tags
cae8acc56afc71be2266ea918e529ef3ae9aaa60
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DJWarmonger cae8acc56a Clearing up the code as requested by FeniksFire 2018-07-19 20:39:37 +02:00
DJWarmonger 3d59420bb5 Minor optimisations. Also, shoter code. 2018-07-19 17:36:10 +02:00
DjWarmongerandGitHub 2498f917d4 Merge pull request #404 from dydzio0614/bug2846 
Thanks!
 2018-01-12 18:15:27 +01:00
DjWarmongerandGitHub c098b835ff Merge pull request #195 from vcmi/feature/ambientSounds 
And merge!

...Travis timeout issues are not my task.
 2018-01-02 20:59:54 +01:00
DJWarmonger 20ac1d6880 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2018-01-02 17:57:11 +01:00
DJWarmonger 1a1de5366a Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2018-01-02 17:36:51 +01:00
DJWarmonger b778623734 Merge branch 'feature/ambientSounds' into develop 2018-01-02 09:51:11 +01:00
DJWarmonger f523ae5545 Fixed Magic resistance display. 2017-12-30 12:25:29 +01:00
DjWarmongerandGitHub c2a0b13332 Merge pull request #371 from dydzio0614/NewAbilities 
Tested and approved. Congrats!
 2017-12-29 14:19:05 +01:00
DJWarmonger bf20b165ec Fix. Don't skip usual condition. 2017-11-04 22:50:11 +01:00
DJWarmonger 3eb5de9534 Fixed AI trying to visit tavern over and over. 
TODO: AI still can't use it, anyway.
 2017-11-04 22:45:19 +01:00
DJWarmonger edc4c01805 Fixed a case when AI could spend all money on army and not build anything in secondary towns. 2017-11-04 22:14:56 +01:00
DJWarmonger 8f42cdea67 Refactoring: use private pointer to CMapGenerator 2017-11-03 21:03:51 +01:00
DjWarmongerandGitHub e59aa9a1d8 Merge pull request #315 from misiokles/develop 
Looks like there's some bug with Travis build, but PR is ok.
 2017-06-22 22:33:00 +02:00
DJWarmonger 5a31cc831d Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 
Trying to sort out git tree.
 2017-06-16 21:49:49 +02:00
DJWarmonger 5e8fe083f2 Normalized GatherArmy evaluation. 2017-06-16 21:14:24 +02:00
DJWarmonger 9623f7caf3 - Restored MSVS project files 
- Fixed VCAI bu pointed out by Tow
 2017-06-11 08:01:41 +02:00
DJWarmonger e901fcd293 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2017-06-10 20:06:05 +02:00
DJWarmonger 4d1fb67594 Sanity check for Coverity #1366290. 
(Vector should never be empty, especially for chosen zone).
 2017-05-27 21:37:05 +02:00
DJWarmonger 346d2ac588 Possible fix for #2681. 2017-05-27 14:57:45 +02:00
DJWarmonger 58cca8e9df Fixed self-luck Icon (Thanks Zeryss). 2017-05-14 08:29:51 +02:00
DjWarmongerandGitHub 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
DjWarmongerandGitHub adaa8277b1 Merge pull request #296 from Chocimier/iss2598 
Give hero move points at day of visiting stable, fixes #2598
 2017-05-13 12:17:03 +02:00
DjWarmongerandGitHub 48702a26a4 Merge pull request #294 from dydzio0614/bug2476 
Fix bug #2476 (2nd solution)
 2017-05-02 08:16:54 +02:00
DjWarmongerandGitHub d622f37e66 Merge pull request #290 from FeniksFire/develop 
Little fix in highlight in CGarrisonSlot.
 2017-03-18 16:10:35 +01:00
DjWarmonger b06e20bba3 Compilation fixes for MSVS 2017-03-17 19:55:52 +01:00
DjWarmongerandGitHub dfb57cdc4a Merge pull request #289 from FeniksFire/develop 
Moving/dividing classes from BattleState to separate files.
 2017-03-17 19:30:58 +01:00
DjWarmonger 20700495c0 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2017-03-02 10:59:34 +01:00
DjWarmonger 84bdc5c994 Compilation fixes for MSVS. 
Apparently it doesn't like structs converted to class, needs more investigation.
 2017-03-02 10:58:14 +01:00
DjWarmongerandGitHub a75d981962 Merge pull request #282 from drizt/resolution-combobox 
Makes sense to me, thanks!
 2017-02-20 08:46:31 +01:00
DjWarmongerandGitHub 1f08878620 Merge pull request #283 from janisozaur/override 
Add `override` keyword where applicable
 2017-02-19 21:42:26 +01:00
DjWarmongerandGitHub 0fdee4fde2 Merge pull request #281 from janisozaur/clang4 
Accepted. This should be fixed in fuzzylite first, still.
 2017-02-19 21:39:01 +01:00
DjWarmongerandGitHub 2401c81d4e Merge pull request #284 from dydzio0614/Bug2640 
Great :)
 2017-02-18 21:51:50 +01:00
DjWarmongerandGitHub d23328f697 Merge pull request #278 from FeniksFire/SmallBugFix 
Simplest solutions are usually the best. Thanks!
 2017-02-11 09:27:53 +01:00
DjWarmongerandGitHub fd5b94d1f8 Merge pull request #280 from dydzio0614/KingdomOverviewFix 
Nice, thanks :)
 2017-02-10 16:37:22 +01:00
DjWarmongerandGitHub 3316136ae9 Merge pull request #279 from dydzio0614/patch-6 
Approved, thanks!
 2017-02-10 09:04:22 +01:00
DjWarmongerandGitHub 53b2add434 Merge pull request #276 from dydzio0614/patch-5 
Update year to 2017
 2017-02-07 15:38:57 +01:00
DjWarmongerandGitHub a8c39d9267 Merge pull request #274 from dydzio0614/ShooterInit 
Approved. One guy named Avatar requested it recently ;)
 2017-02-06 21:18:19 +01:00
DjWarmongerandGitHub ba9ea84718 Merge pull request #275 from dydzio0614/RangedRetaliation 
Okay, let's try this.
 2017-02-05 20:55:51 +01:00
DjWarmongerandGitHub 1e38b29add Merge pull request #273 from dydzio0614/CommanderCrash 
Ah right, I forgot about this bug :/. Thanks.
 2017-02-02 21:20:15 +01:00
DjWarmongerandGitHub c91bc25e70 Merge pull request #269 from dydzio0614/MakeWOGGreatAgain 
Okay it's time to merge this awesome branch 👍
 2017-02-02 06:57:54 +01:00
DjWarmongerandGitHub 6d37c8bceb Merge pull request #272 from dydzio0614/bug2600 
Nice, thanks :)
 2017-02-01 17:57:58 +01:00
DjWarmongerandGitHub f4c55ae3c9 Merge pull request #271 from dydzio0614/patch-4 
Fix mantis #2642
 2017-02-01 14:56:42 +01:00
DjWarmongerandGitHub a344205c13 Merge pull request #267 from FeniksFire/improvementAI 
Okay let's do this
 2017-01-26 21:38:25 +01:00
DjWarmonger 73c62f1b4c Restore cut ring around main town. 2016-12-21 22:23:55 +01:00
DjWarmongerandGitHub e54bde9d22 Merge pull request #264 from NikolayIT/patch-1 
Added few files and folders to .gitignore which should not be part of…
 2016-12-21 21:05:11 +01:00
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 6848a52ce1 Fixed heroes not unreserving Teleports, which makes them wander around it endlessly and blocking path. 
TODO: properly handle all Teleports as "visited" objects
 2016-12-19 21:46:01 +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 f18d3d9844 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-12-15 10:55:57 +01:00
DjWarmonger 01730ec98a A little TODO 2016-12-12 22:52:18 +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
DjWarmonger 90d39ca2af Fix CID 1197519 2016-12-12 19:13:43 +01:00
DjWarmonger eaf14f6429 Should fix #2624. 2016-11-29 22:07:35 +01:00
DjWarmonger 72a36b92d6 Fixed regression. 2016-11-29 18:11:52 +01:00
DjWarmonger 67d5cee05e Fixed CID 1366402 2016-11-29 17:19:41 +01:00
DjWarmonger 81e7164ef2 Fixed CID 1366401 2016-11-29 17:12:10 +01:00
DjWarmonger 8058cb3cad Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-28 21:53:33 +01:00
DjWarmonger ffc511054e Do not visit Eye of The Magi. 2016-11-28 21:45:41 +01:00
DjWarmonger 9b5af484b7 Fixed AI getting stuck at blockVisit objects (Tavern, Borderguards/gates etc). 2016-11-28 19:29:11 +01:00
DjWarmonger a1b7c9d8d2 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-28 12:07:30 +01:00
DjWarmonger 76c4ef32c2 Re-evaluate goal after hero move to make AI more consistent. 2016-11-27 18:10:20 +01:00
DjWarmonger 169334f877 VCAI: do not buy heroes with single creatures for GatherArmy 2016-11-26 18:03:09 +01:00
DjWarmonger 3c3b973597 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-26 17:41:45 +01:00
DjWarmonger 58ac31375b Fixed CID 1197636. 2016-11-26 17:41:34 +01:00
DjWarmonger 5058d5771e Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 20:54:53 +01:00
DjWarmonger 4789262200 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 19:54:44 +01:00
DjWarmonger a86edca7d8 Fixed CID 1288882 2016-11-25 19:54:28 +01:00
DjWarmonger 2ac72bf75b Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-11-25 19:37:29 +01:00
DjWarmonger 56b201e7e8 Fixed CID 1366289 and 1366290. 2016-11-25 19:32:54 +01: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
DjWarmonger 092a0c305b MSVS project update. 2016-11-25 18:17:40 +01:00
DjWarmonger db13d7a708 Version 0.99 updates. 2016-11-01 18:25:09 +01:00
DjWarmongerandGitHub 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
DjWarmongerandGitHub 76408e9de0 Merge pull request #226 from vmarkovtsev/develop 
Looks like I could approve this one ;)
 2016-10-01 18:15:15 +02:00
DjWarmongerandGitHub e77d408e92 Merge pull request #222 from dydzio0614/HeroBattleWindow 
Looks OK to me, thanks! :)
 2016-09-28 21:06:59 +02:00
DjWarmongerandGitHub 8a1b22c45d Merge pull request #219 from dydzio0614/patch-2 
Update secondary skill handling. Fix issue 2307
 2016-09-20 13:42:14 +02:00
DjWarmongerandGitHub 264c71c58a Merge pull request #218 from vmarkovtsev/fix-morale-widget 
Nice and clean fix.
 2016-09-19 20:44:13 +02:00
DjWarmonger 6122186efa Removed old template duplicated by new package. 2016-09-04 13:31:04 +02:00
DjWarmonger d2bd749b4f MSVS project fixes. 2016-09-04 13:30:11 +02:00
DjWarmonger f686e4fe80 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-08-30 08:05:30 +02:00
DjWarmonger 6791350975 Compile fix (operator = is ambiguous). 2016-08-30 07:50:38 +02:00
DjWarmongerandAlexVinS d188b86a50 As suggested by AVS, I made CBonusYSstemNode noncopyable. However, it is copied somewhere in the code, but I can't find it with MVS: 
http://stackoverflow.com/questions/3757219/how-to-locate-boostnoncopyable-errors
 2016-08-18 15:03:57 +03:00
DjWarmonger dea39b8497 Complete solution for Subterranean Gate placement. 2016-08-15 21:37:38 +02:00
DjWarmonger 7600f8cf08 Quick fix - stop spawning Subterranean Gates at the edge of the map. 2016-08-14 08:36:15 +02:00
DjWarmonger f995756973 First part of Subterranean Gates rework. Fixes #http://bugs.vcmi.eu/view.php?id=2450 2016-08-13 19:48:44 +02:00
DjWarmonger 8186fcae99 Removed some legacy code, work in progress. 2016-08-13 12:42:45 +02:00
DjWarmonger 2a9ddadedd Fixes. Everything works now. 2016-08-12 21:40:22 +02:00
DjWarmonger 9b58450cb0 Part 3 - first working draft, cut generation time by half. 2016-08-12 19:16:21 +02:00
DjWarmonger d1255f0d67 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-08-12 17:52:17 +02:00
DjWarmonger 452027cd8d Handle ObjectInfo via pointer to avoid expensive copy. 2016-08-11 10:49:19 +02:00