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
14,303 Commits 30 Branches 75 Tags
09ce8cef9695cacc9562f8ca632d54ff6e9a59c7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DJWarmonger 2e20dce71f Fixed random hack that broke VCAI in recent commit. 2019-01-09 19:25:51 +01:00
DJWarmonger e996879733 Commented out some extensive logs which slowed down pathfinder. 2018-12-16 16:12:41 +01:00
DJWarmonger f4a8a1294e Optimizations based on MSVS profiler. 2018-12-16 15:46:48 +01:00
DJWarmonger 346796f4f8 Possible fix for evaluate VisitHero (compiler optimization?) 2018-08-22 12:32:48 +02:00
DJWarmonger 383c9a20af A bunch of fixes for recent branch. 2018-08-22 07:51:35 +02:00
DJWarmonger 6503830bde Important fixes: 
- AI will not always trade resources if it has better options
- Do not use reserved objects for CollectRes
 2018-08-21 13:48:19 +02:00
DJWarmonger 2f4b463459 - Fixed major bugs with building dwellings. ResourceManager doesn't support building in future turns. 
- Tweaks for trading
 2018-08-21 12:55:31 +02:00
DJWarmonger a44c792b7c Important fix for ClearWayTo in new branch. 2018-08-21 08:40:47 +02:00
DJWarmonger 35d2af2e7d Simplified CollectRes - rely on VisitObj now 2018-08-20 21:31:58 +02:00
DJWarmonger 8ec762f858 Fixed possible (?) crash in ResourceManager 2018-08-08 15:43:42 +02:00
DJWarmonger 4b602c42ff Fix for fix, ugh. 2018-08-08 14:26:21 +02:00
DJWarmonger d07a77f34b - Tweaks for GatherArmy 
- Tweaks for exploration
- Increased default priority of BuyArmy, SIGNIFICANT improvement!
 2018-08-08 12:38:32 +02:00
DJWarmonger a9ef8fe32f - Fixed Border Gates logic 
- VCAI may now walk onto removable objects when exploring
 2018-08-08 10:52:52 +02:00
DJWarmonger 6fd403d7cf Remove Capitol-related code, it's redundant now. 2018-08-07 18:44:03 +02:00
DJWarmonger a827c083d8 Remove useless code 2018-08-06 21:54:17 +02:00
DJWarmonger 4d701736f9 Important changes: 
- Fixed goal completion logic
- WIN can't be completed
 2018-08-06 20:25:39 +02:00
DJWarmonger 8eec7d71ad Little tweak - prioritize instant buildings over ones we can't afford. May be useful with multiple towns. 2018-08-06 17:42:58 +02:00
DJWarmonger 36e44adc8c rebase 2018-08-06 10:02:59 +02:00
DJWarmonger 580fed34bb Updated CMakeLists.txt 2018-08-04 22:00:28 +02:00
DJWarmonger f5ba181173 Refactoring: Move SectorMap to separate file 2018-08-04 21:59:30 +02:00
DJWarmonger 976eeb3578 Sweet Jesus 2018-08-04 16:22:24 +02:00
DJWarmonger 4a85559d4b Merge branch 'develop' of https://github.com/vcmi/vcmi into BuildingManager 
# Conflicts:
#	AI/VCAI/CMakeLists.txt
 2018-08-04 16:09:02 +02:00
DJWarmonger 6615870045 Rebase 2018-08-04 15:59:59 +02:00
DJWarmonger aa9c6d3716 Cleanup 2018-08-04 13:18:05 +02:00
DJWarmonger 9e34ef5534 AI will not try to sell reserved resources. 2018-08-04 11:51:19 +02:00
DJWarmonger 2aa0a6fe2f More fixes for trading. Seems to work now. 2018-08-04 10:20:40 +02:00
DJWarmonger a5ca32ad38 Some checks and log for CollectRes goal. 2018-08-04 09:24:43 +02:00
DJWarmonger 30f99e7cc1 Fix for Travis 2018-07-28 16:02:59 +02:00
DJWarmonger 5cd366dca3 Compile fix 2018-07-28 14:14:24 +02:00
DJWarmonger 70549197b6 Naah, revert my changes. 2018-07-28 09:08:53 +02:00
DJWarmonger e7cb8d7d17 Fixed GetObj (TRADING_POST) incorrectly set to elementar. 2018-07-28 06:47:37 +02:00
DJWarmonger a8696a9957 formatting 2018-07-27 09:22:07 +02:00
DJWarmonger 6abebeeb9f Fixed non-const reference issue. 2018-07-27 08:10:21 +02:00
DJWarmonger ea19716fb9 Fix for wander - AI sitting at town will buy troops. 2018-07-27 07:20:08 +02:00
DJWarmonger 301565b315 Updated CMake 2018-07-27 06:44:10 +02:00
DJWarmonger feb3459bd7 Oops restore. 2018-07-26 21:34:52 +02:00
DJWarmonger 5ce4e784c9 Final tweaks. Not going to add anything more to this PR. 2018-07-26 18:02:15 +02:00
DJWarmonger e5b979d4ad - ResourceManager now returns abstract goal so it can be decomposed many times 2018-07-26 16:15:37 +02:00
DJWarmonger 1450d408a2 Wandering heroes may now travel to town even if it has no army in garrison. 2018-07-26 14:37:39 +02:00
DJWarmonger b687688f5a Do not add duplicate objectives to GatherArmy pool (or any other, if it ever exist) 2018-07-26 13:29:46 +02:00
DJWarmonger 273802c92c I have no idea what I'm doing 2018-07-26 12:14:29 +02:00
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