games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
2,841 Commits 19 Branches 62 Tags 112 MiB
c071a03a8a
Commit Graph

307 Commits

Author SHA1 Message Date
DjWarmonger
d8cb3a34d3 -Fixed crash #1037 
-AI can now successfully complete several types of quests.
-Lots of tweaks for AI
TODO: fix bizarre crash when opening borderguard
 2012-07-19 09:10:55 +00:00
DjWarmonger
6a7327d38a VCAI will now not be confused by Border Gates and attempt to find Keymaster to cross them. 2012-07-18 13:23:46 +00:00
DjWarmonger
624908e403 - Fixed unserialized GrowingArtifact, causing crash 
- An attempt to teach AI completing quests
- Gathering army is now continuous, abstract goal
- Lots of fixes and tweaks in AI
 2012-07-18 10:10:14 +00:00
ddaroo
69de38bf1d Tweaks for cmake build system: data dir definitions, flags for clang (not tested), missing CQuestLog.cpp file for the client, naming convention of few binaries same for autotools and cmake 2012-07-15 16:05:41 +00:00
Michał W. Urbańczyk
edccbd4809 Rewritten many parts of query handling. Fixed several scenarios leading to a hang (including #1012). Purged boost::function from player interface (handy but impossible to serialize). VCAI will keep description for each unanswered query, so the further debugging will be easier. 2012-07-15 15:34:00 +00:00
Ivan Savenko
55c78e9f16 - ComponentBox usage in 2 windows: levelup and build screen 
- Components have selectable image size
- fixed #794
 2012-07-07 13:32:37 +00:00
DjWarmonger
10a2dfefd1 VCAI will answer CommanderGotLevel query. 2012-07-06 14:09:34 +00:00
Ivan Savenko
235cf458d7 - fixed text duplication in choice windows 
- fixed compile issues
- added unused and untested for now CComponentBox
 2012-07-02 21:51:48 +00:00
ddaroo
758fb0679e Stub for a CMake build system. 2012-07-01 14:27:41 +00:00
Michał W. Urbańczyk
fcdad0d323 Added class HeroPtr to VCAI that should replace CGHeroInstance*. HeroPtr is able to detect when the hero under it becomes unavailable. 
Hopefully fixed #954 (and all bugs caused by keeping a reference to hero that got killed: #998, #1002, #1008, #1011, #1018).
If not, assertions should pop up earlier.
 2012-06-30 23:48:40 +00:00
Ivan Savenko
613172fa45 - fixed #582, #1019 and #1022 
- linux readme tweaks
 2012-06-27 20:44:01 +00:00
Michał W. Urbańczyk
759f85767b Solved #985. 2012-06-01 16:14:33 +00:00
Michał W. Urbańczyk
4cd77a0192 Naive solution for endianess issues. Seems to allow loading a big-endian save on little-endian build. 
Fixed compile issues with CEmptyAI. Removed unnecessary methods from its.
 2012-06-01 15:59:26 +00:00
Ivan Savenko
4e92859cee - fixed crash on loading of some maps 
- minor fixes
 2012-05-30 18:37:21 +00:00
Ivan Savenko
faaf799d95 - fixed some extra warnings. Mostly harmless. 
NOTE: Please check changes in BattleState.cpp and GameHandler.cpp for possible bugs
 2012-05-28 19:29:32 +00:00
DjWarmonger
18e53a1717 - Fixed a scenario when AI could visit the town without picking troops, resulting in a lock 
- Added ench0's patch for creature range tooltip (#948)
 2012-05-22 10:15:16 +00:00
Ivan Savenko
a13a62537b - fixed crash in hero window (#963) 
- added unused for now image scaling algorithm
 2012-05-19 21:38:01 +00:00
Ivan Savenko
665837d656 - hopefully better town development for AI 
- fixed minimap blitting
- fixed crash on attacking town without moat
 2012-05-19 16:22:34 +00:00
Michał W. Urbańczyk
7116377e4e More robust fix for #957 / #938. 
AI won't try clearing way by attacking its own heroes.
 2012-05-19 00:38:25 +00:00
Michał W. Urbańczyk
c9af2bb251 Fixed #957 / #938. 
AI won't try visit objects on which another non-enemy hero stands.
 2012-05-19 00:11:20 +00:00
Michał W. Urbańczyk
d2756e8c88 Partial fix for #961. 
Minor fixes for VS project files.
 2012-05-18 22:47:54 +00:00
DjWarmonger
d491bc1c3a Commanders can level up. It's non-interactive yet. 
Printing secondary skills for Commanders.
 2012-05-18 14:02:27 +00:00
Ivan Savenko
97aeaa9f28 - moved ColorPutter's to separate SDL_Pixels.h file 
- added Channels namespace for accessing subpixels in format-independent way
- fixed several big-endian issues
- re-generated buld system
 2012-05-17 10:44:48 +00:00
DjWarmonger
416c08260a - Basic Commander window 
- First part of unified quests interface

This graphics package is needed:
http://forum.vcmi.eu/viewtopic.php?p=6943#6943
 2012-05-16 17:29:05 +00:00
DjWarmonger
b597171f91 - EXPLORE goal can now be complete soAI won't get stuck 
- AI won't try to visit tiles occupied by allied heroes by default
 2012-05-09 07:56:39 +00:00
DjWarmonger
05742afd60 Final fix. AI heroes won't loose their turn when visiting adjacent objects. 2012-05-08 09:38:01 +00:00
DjWarmonger
b316be1701 - Introduced a mechanism to set abstract goals for AI 
- Fixed new crash when AI hero lost a battle
 2012-05-08 08:10:40 +00:00
DjWarmonger
9cbbfcf258 - Fixed all bugs with battle interface. It's now more consistent. 
- Minor cleaning.
 2012-05-07 16:04:43 +00:00
DjWarmonger
ee2768ab07 - Some work for commanders 
- New creature window - visit forum for package with necessary graphics: http://forum.vcmi.eu/viewtopic.php?p=6908#6908
- More AI optimizations - heroes will be processed starting from the fastest one.
- AI will check is GATHER_ARMY object is reachable
 2012-05-07 12:54:22 +00:00
DjWarmonger
9894deee55 Little, but significant improvement in AI exploration. 2012-05-05 13:08:15 +00:00
DjWarmonger
b4c58a5644 Fixed path glitchicng. 2012-05-05 08:57:32 +00:00
DjWarmonger
7d706ba8a3 Proper solution for locking & unlocking heroes. 
However, "tiles are not neighbouring" glitches now became more visible.
 2012-05-05 06:42:18 +00:00
DjWarmonger
d6873d7570 - No battle actions will be available during tactics phase 
- Fixed moving stacks during tactics
- Fixed Genie spell targeting
- Fixed AI getting stuck at Tree of Knowledge when no resources
 2012-04-28 13:01:39 +00:00
Michał W. Urbańczyk
918452d37c Fixed #930. 2012-04-17 15:08:38 +00:00
Michał W. Urbańczyk
cd4c93318d #928 and #931 should be fixed. 
Ignoring savegames from newer versions of VCMI.
 2012-04-17 12:46:21 +00:00
DjWarmonger
aeb9cf9460 - First part of battle interface rewrite. Untested. May work or not work randomly. 
- Tweaks for AI logging.
 2012-04-16 17:12:39 +00:00
Michał W. Urbańczyk
b5526f0f54 Fixed #925. 2012-04-14 07:22:08 +00:00
Ivan Savenko
f426a48d09 - fixes for gcc-4.7 
- added missing virtual destructors (new warning from gcc)
 2012-04-08 10:34:23 +00:00
DjWarmonger
2193f8912e - Framework of new battle interface 
- Minor fixes for AI
 2012-04-04 08:03:52 +00:00
DjWarmonger
e046f06421 Small fix for previous commit. 2012-03-29 18:29:47 +00:00
DjWarmonger
81367ef6d5 - A complete solutions for reserved adventure objects 
- AI won't get stuck at School of War / School of Magic when no money
 2012-03-29 18:26:06 +00:00
Michał W. Urbańczyk
7b7ddf987a Fixed #909. 
Minor fix in using requestActionASAP (capture by val).
 2012-03-26 11:38:51 +00:00
Michał W. Urbańczyk
13f26fc3cb * Client is able to await for answers for multiple queries at the same time 
* Hackish solution allowing AI undertaking actions from event-handling thread
* Fixed crash when death stare or acid breath activated on stack that was just killed
* minor fixes
 2012-03-25 22:46:14 +00:00
DjWarmonger
a3f36ccc71 - Unified interface for visitable objects 
- AI will manage visitable objects smarter
 2012-03-14 13:02:38 +00:00
DjWarmonger
c8c4c5b682 AI heroes won't trash for objects when exploring area together. 
String logging for goal types. Fixes.
 2012-03-13 20:33:00 +00:00
DjWarmonger
9518474ec7 First attempt to replace rule-of-a-thumb behavior with actual reasoning 
- GATHER_ARMY goal replaces wander function
- Heroes will remember their own goals until they are fulfilled
- Goal search handles mutual dependency
- AI will recruit multiple heroes for exploration
- Lots of tweaks
 2012-03-13 12:47:47 +00:00
Ivan Savenko
f2f39f1497 - makefiles for fuzzylite (#911) 
- fixes for gcc compilation
- fixed #908
 2012-03-12 20:11:46 +00:00
Michał W. Urbańczyk
6db3c5bc7e * VCAI: can't request actions from action handling thread 
* Save game screen and returning to main menu will work if game was started with --start option
* GUI controls can selectively capture keyboard events. CTextInput won't capture Enter. Fixes #654.
 2012-03-11 16:29:01 +00:00
Michał W. Urbańczyk
76eb0ed429 Rewritten VCAI::pickBestCreatures. Should fix the compilation error ( http://forum.vcmi.eu/viewtopic.php?p=6605#6605 ). 2012-03-11 01:26:11 +00:00
Michał W. Urbańczyk
59681be0a4 Fixed #906. 2012-03-10 19:14:45 +00:00
DjWarmonger
88e9dec974 Fixed Thieves Guild window showing for all players. 
It needed 11 files modified... :/
 2012-03-07 14:05:54 +00:00
DjWarmonger
0793ce2c4a AI will now always pick best stacks from towns. 
It will also crash when picking stacks from objects, work in progress.
 2012-03-06 18:49:23 +00:00
Michał W. Urbańczyk
0ef1085555 Changes around FuzzyLite library based on patch by q4a. 
http://forum.vcmi.eu/viewtopic.php?p=6592#6592
 2012-03-06 16:28:32 +00:00
DjWarmonger
bdd71b4f38 AI can now use external dwellings. 
AI will weekly revisit dwellings & mills.
 2012-03-05 19:11:28 +00:00
Ivan Savenko
e7783479d2 - (linux) version bump 
- compile fixes
 2012-03-05 13:31:59 +00:00
DjWarmonger
1ea2f3d3bb Added fixed FuzzyLite library to sources. It compiles without additional settings under MVS2010 and should also compile with other tools (straightforward include structure). 
Did not add it to project files to avoid mess.

Fixed NaN / infinity issues.
 2012-03-05 12:01:41 +00:00
DjWarmonger
71e482ce7f Few tweaks for discrete values. 2012-03-04 11:19:34 +00:00
DjWarmonger
cd0ed39fbf Implemented rule-based evaluation of tactical advantage between armies. 
AI will creep more agressively and smarter.
 2012-03-04 10:43:46 +00:00
DjWarmonger
c5007f8bef Fixed #891. 
Minor tweaks.
 2012-03-03 12:42:53 +00:00
DjWarmonger
1354351a40 Fixed AI recklessly visting Utopia. 
Made algorithm asctually working. Library fixes were needed.
 2012-03-03 11:39:54 +00:00
DjWarmonger
998d8bf501 Added trivial fuzzy logic to handle creature banks estimation. 
Check http://forum.vcmi.eu/viewtopic.php?p=6570#6570 for new library used.
 2012-03-03 10:08:01 +00:00
Michał W. Urbańczyk
672468a738 Deleted GeniusAI. 2012-03-01 16:32:14 +00:00
Michał W. Urbańczyk
f2642cb62c Added VCAI and EmptyAI to the VS solution. Removed from it GeniusAI. 
Fixed #329, #884, #885.
 2012-02-29 01:31:48 +00:00
Michał W. Urbańczyk
b54489ecb7 Fixed #873 and #877. 2012-02-26 18:31:59 +00:00
Michał W. Urbańczyk
4f182744e7 * Fixed in game scenario info and save game screens 
* AI will now use tlog6 (teal color) for logs
 2012-02-22 19:22:11 +00:00
Michał W. Urbańczyk
e18419f5d2 * adventure map GUI should be properly blocked during AI turn 
* battle window will wait till all dialogs are closed
* fixed problems with AI working after the game ended
* fixed problems with overzealous redrawing of infobar
 2012-02-22 13:41:27 +00:00
Michał W. Urbańczyk
e4dc00abac * new file lib/UnlockGuard.h — unlock_guard is for unlocking a mutex for the scope time (RAII) 
* all lock/unlock and unlock/lock pairs are done by RAII guards now
* fixed two possible crashes at the end of battle when last stack was killed by spell. That should fix #749 and #752.
* fixed a very nasty race condition, eliminating possible deadlock at the start of battle when human hero has tactics
* fixed #422
 2012-02-19 21:03:43 +00:00
Michał W. Urbańczyk
0867451f26 Fixed path issues: #491, #834, #845. 
Fixed AI crash when enemy hero was teleported onto tile not visible for AI.
 2012-02-18 14:59:37 +00:00
Michał W. Urbańczyk
1abf089bc7 Missed fixed for #858 (TortoiseSVN tricked me...) 
Fixed #852.
 2012-02-16 21:46:28 +00:00
Ivan Savenko
0c3e88226f - (linux) replaced Genius with VCAI 
- gcc set to c++0x mode
- most of gcc warnings fixed
- replaced boost::assign with initialization lists (if available in compiler)
- new cheat code: vcmiarmenelos - build everything
- updated linux readme
- minor fixes, applied patch for #98
 2012-02-16 17:10:58 +00:00
Michał W. Urbańczyk
7a66c1bf2b * added an initial version of adventure AI: VCAI, more details here: http://forum.vcmi.eu/viewtopic.php?p=6508#6508 
* VCAI set as default adventure AI
* several adjustments in GUI (hourglass during AI turn), minor changes
 2012-02-14 18:04:45 +00:00
Michał W. Urbańczyk
046e54563c * fixed project files for RD configuration 
* fixed crash when creature is casting Hypnosis (ie. exped Vampire Lords)
* fixed crash when creature is casting Cure before attack (ie. exped Unicorns)
* fixed crash when creature is summoning elemental (TODO fix it)
* fixed crash when doing a bonus system operation with a hero liberated from prison (ie. entering town or battle)
* fixed deadlock when StupidAI tried to assault the turrets
* fixed never ending siege when StupidAI has to use catapult (no more deadlocks on AI-AI siege)
* fixed deadlock when a hero received a level during another player's turn (ie. when he successfully defended)
* AI can win the game by defeating all enemies if there is a specific victory condition applying only to human players
* added options to help testing adventure map AI (--onlyAI, --autoSkip and --oneGoodAI).
* many minor changes
 2012-01-03 01:55:26 +00:00
Ivan Savenko
91c0ce33f4 - re-generated build system 
- fixed several gcc issues
 2011-12-31 10:03:29 +00:00
beegee1
156aa6e4d9 * Updated class - file - handling 
* Renamed color constants
* Renamed class AdventureMapButton to CAdventureMapButton
* Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses
* Moved new creature window from GuiClasses to CCreatureWindow
 2011-12-22 13:05:19 +00:00
beegee1
2f5d6f2684 * CHexField renamed to CBattleHex 
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
 2011-12-17 18:59:59 +00:00
beegee1
cce814c41b * Final commit 2011-12-13 21:35:28 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
Frank Zago
a62634cf94 Add support for SDL 1.3 in compatibility mode. 2011-11-17 00:24:27 +00:00
Ivan Savenko
ede7fd5a7a - (linux) Fixed gcc linking issues 2011-10-31 18:00:44 +00:00
DjWarmonger
0903d6037c New pack - BattleEffectTrigger for various one-shot effects with animation 2011-10-08 13:02:58 +00:00
Frank Zago
8963293c07 Avoid soname versioning for AI libraries. These libraries are dlopened so there is no need to make them versioned at all. 
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 2011-10-06 01:21:25 +00:00
Michał W. Urbańczyk
623325ca61 Ouch. Thing was for branch only. 2011-09-27 22:03:43 +00:00
Michał W. Urbańczyk
bdd66b6537 Zmiany do Programming challenge. 2011-09-27 21:54:40 +00:00
Michał W. Urbańczyk
9621cbcaa7 * fixed crash on calculating dmg dealt by stack under Curse 
* fixed crash on sea battles (obstacles data got corrupted during conversion)
* fixed crash when StupidAI had a catapult
* minor fixes and refactorings (typename for bonus list under shared ptr)
 2011-09-06 13:59:26 +00:00
Michał W. Urbańczyk
3152e6d540 Fixed #771, #772 and #787. 
Some minor changes and fixes.
 2011-08-25 15:24:37 +00:00
Michał W. Urbańczyk
26a83d7680 http://forum.vcmi.eu/viewtopic.php?p=5956#5956 
Significant changes in project files:
* new library package required! URL: http://download.vcmi.eu/msvc-pack.7z
* created VCMI_global.props property sheet for settings common to all VCMI projects
* added configuration for x64 builds
 2011-08-15 21:53:03 +00:00
beegee1
f609c4ad9a * Fixed #33 -> Creatures tend to stop at every hex during movement 2011-08-01 17:36:18 +00:00
Ivan Savenko
b8448e4c3b - (linux) build system update 
- gcc errors/warnings fixes
 2011-07-05 11:31:26 +00:00
Michał W. Urbańczyk
b3234e8bfa * CGameInterface.h/.cpp moved from client project to lib (and, appropriately, to lib subfolder). 
* New files in lib: ResourceSet.h/.cpp -> containing new structure for managing resources logic
* Minor changes and fixes
 2011-07-05 06:14:07 +00:00
Ivan Savenko
a89895452a - (linux) fixed searching/loading of scripting libraries 
- (linux) moved AI libraries to /lib/vcmi/AI/lib*, ERM lib to /lib/vcmi/Scripting/*
- gcc compile and warnings fixes
 2011-06-28 14:19:16 +00:00
DjWarmonger
9ca5d9048a Fixed total spell immunity granted by 2212. 
Improvements for Life Drain.
 2011-06-25 15:05:01 +00:00
DjWarmonger
af8d8cbfc7 Implemented #479 2011-06-21 12:45:57 +00:00
Frank Zago
129c9d521e Warning fixes + typo. 2011-06-18 23:56:48 +00:00
ozsy1023
671e7bc3ec Modified and added some functions in BattleHelper.cpp. 2011-06-09 13:23:38 +00:00
Frank Zago
4af4f0a707 Compile and warning fixes. 2011-05-27 22:34:58 +00:00
Michał W. Urbańczyk
617e1f962e New files for lib: 
* lib/ERMScriptModule.cpp
* lib/ERMScriptModule.h
* lib/CObstacleInstance.h

More jugglery with callbacks. Moving stuff from CGameState to CGameInfoCallback. Work on unified game events interface for player (AI or GUI) and script module. Directing events to ERM interpretetr, first attempts of calling some triggers. Crashy, if there any scripts.
Some other changes, including fighting amount of includes in includes and tracking of hero visits (need further work).
 2011-05-09 22:20:47 +00:00
Frank Zago
0c3f3c67a9 Callback naming fix. 2011-05-04 02:32:35 +00:00
Michał W. Urbańczyk
b4144dc616 Callback jugglery, part 1. 
Fixed #252.
 2011-05-03 03:14:18 +00:00
Michał W. Urbańczyk
d092eaf9d1 Artifact Merchant: selling artifacts. Messy, but completes H3 town structures functionalities. 
BTW updating screen after closing marketplace is broken.
 2011-04-22 21:51:10 +00:00
Frank Zago
ecb3508690 (linux) Added configure test for the icc and clang compilers, and set some extra parameters for them. 2011-04-09 17:28:51 +00:00