games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity
3,682 Commits 21 Branches 61 Tags 104 MiB
4a71442c80
Commit Graph

255 Commits

Author SHA1 Message Date
Ivan Savenko
e4c88d5088 - moved ParseBonus to JsonNode.cpp (linkage errors) 
- fixes to CMakeLists - vcmi can be compiled and started with cmake
- gcc\clang warnings fixes
 2012-07-19 18:52:44 +00:00
DjWarmonger
4c0537c420 - AI will now wander with all the heroes that have spare movement points. It should prevent stalling. 
- Fixed #1030
 2012-07-19 16:29:29 +00:00
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
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
DjWarmonger
b86706d58c Commander can now die in a battle and will be automatically rised when visiting town. 2012-07-17 08:52:27 +00:00
DjWarmonger
b28da1a5d3 - Quest log minimap now has clickable icons 
- Border guard & border gate inherit Quest interface
- Lots of tweaks
 2012-07-08 16:36:20 +00:00
DjWarmonger
32d1a08470 Pointer serialization for CQuest. 2012-07-08 08:42:03 +00:00
DjWarmonger
7fbf89ffc8 Rearragned Seer Huts & Quests. More work on Quest Log descriptions. 2012-07-08 06:33:41 +00:00
DjWarmonger
49d2ba1982 Quest Log is partially functional. TODO: update quest after completion. 2012-07-07 08:45:45 +00:00
Ivan Savenko
50e8bc1704 - build system update 
- compile fix for quests (vector can't be used to store const data)
- fixed several "unitialized" warnings
 2012-07-06 20:19:54 +00:00
DjWarmonger
12511d8fee First part of new Quest Log, including common quest interface. 2012-07-06 19:12:04 +00:00
Ivan Savenko
47945383da gcc-4.5 compatibility 2012-06-23 17:19:50 +00:00
Frank Zago
bc4f856bfc Put Warrior's Tomb into the switch statement and properly set the sound returned. 2012-06-07 03:02:30 +00:00
Ivan Savenko
6f6cd6814e - fixed wrong battlefield (#961) 
- minor tweaks
 2012-05-19 11:47:26 +00:00
Ivan Savenko
45c2809a40 - pregame will use same resolution as main game 
- disabled most of now unused code for changing resolution
- added missing spell effect sounds
- adventure map spells sounds
- remaining fixes for big endian systems
 2012-05-18 17:35:46 +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
Ivan Savenko
46f48f0676 - bugfixing: 
-- fixed #942 and #898
-- removed dublicated code in dwelling loading, #900 is fixed
-- fixed roads rendering for #895
 2012-05-11 19:03:40 +00:00
DjWarmonger
82f3bc8135 - Commanders will now be properly intialized 
- Commanders show in the battle
 2012-04-28 11:41:20 +00:00
DjWarmonger
96d198758c - More commanders 
- Improved finding closest tiles on battlefield
 2012-04-22 17:38:36 +00:00
Michał W. Urbańczyk
017013a5a4 Throwing runtime_errors instead of string (or even char*) objects. 2012-04-22 07:32:45 +00:00
Michał W. Urbańczyk
722ec55384 Redid stack artifacts. Broken save compatibility. Added serializer support for boost::variant and sending CStackInstace* over network by implicitly passing IDs. Moved seeds and checksum to StartInfo. Various minor changes. 2012-04-14 02:20:22 +00:00
Michał W. Urbańczyk
d55d48b978 Diagnostics for #924. 2012-04-10 02:30:43 +00:00
Michał W. Urbańczyk
9f6270a1f7 Fxied #306 and #856. 2012-04-08 02:14:20 +00:00
DjWarmonger
a3f36ccc71 - Unified interface for visitable objects 
- AI will manage visitable objects smarter
 2012-03-14 13:02:38 +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
Michał W. Urbańczyk
d0e259864e * Replaced boost::shared_ptr with std::shared_ptr. 
* Brought shared_ptr and unique_ptr and their factories (make_shared, make_unique) to the global scope. 
* Removed excessive usage of shared_ptr in bonus system interface. 
* Fixed bonus system limiters/caching interactions. That covers #823, #859 and a number of rare edge-cases. 
* Implemented multiple-step limiters applying, fixing hasAnotherBonusLimiter  and allowing transitional dependencies between bonuses. 
* Bonus system should be slightly faster, since we cache limited bonuses. Some rare usages (limiting query against a foreign node) however can't use caching.
 2012-03-06 16:59:55 +00:00
DjWarmonger
3e351f029c Fixed creeps regenerating casualties from won battle at the start of new week. 2012-03-06 08:39:05 +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
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
Ivan Savenko
fd625fe87d - enabled fix for #866 2012-02-21 14:18:58 +00:00
Ivan Savenko
354b9e7fb3 - fixed #793 and #865 
- fixed #866 but may result in performance decrease
- (deb) removed vcmi-doc package
 2012-02-21 14:08:42 +00:00
DjWarmonger
5e14d17ed3 Fixes for r2543. 2012-02-20 09:50:49 +00:00
Michał W. Urbańczyk
a975805ae8 Fixed #850. 2012-02-17 19:30:40 +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
DjWarmonger
56c56f81e3 Fixed #849. Fixed buying artifacts for free. 
Minor tweaks.
 2012-01-28 11:42:15 +00:00
Ivan Savenko
b72a19cdb1 - fix for creature banks (was broken several revisions ago) 2012-01-23 00:02:10 +00:00
Ivan Savenko
dbc603b7d7 - fixed crash on opening spellbook during enemy turn 
- fixed last known localization issue (bank configs)
- diplomacy and new weeks\month mechanics should be identical to H3
- minor fixes
 2012-01-19 14:33:22 +00:00
Ivan Savenko
3fcf8b6f4b - minor mechanics fixes, corrected handling of 2nd upgrades (like pirates from hota) 2012-01-13 14:18:32 +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
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
Ivan Savenko
0f2e00c780 -(linux) Moved all (I hope) files created by VCMI to ~/.vcmi to prevents crash on launch from read-only directory 
- minor fixes for #362 #835 #836
 2011-11-01 12:58:01 +00:00
yupsi
828a3f0776 Fixed #427 (custom quest messages). 2011-10-16 19:24:05 +00:00
Frank Zago
c4b8039c1e Added a missing rturn in CGameHandler::isAllowedExchangeForQuery. Fixed several typos. 2011-09-24 01:15:36 +00:00
Michał W. Urbańczyk
6ef44bde5a Work on pathfinder: torn the code out from CGameState into a separate class. It can use Subterranean Gates and Boats. Removed code for handling Fly spell effect. It didn't work as supposed anyway. 2011-09-19 20:50:25 +00:00
Frank Zago
479a714dbf Better fix than r2381. 2011-09-13 03:31:17 +00:00
Frank Zago
c46cb29446 sex is uninitialized (a virgin ?). Fixed a typo. 2011-09-13 01:46:11 +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
bb1bdcb0a7 * fixed crash on visiting Sirens 
* fixed race condition on the new turn,  #729 should be gone
* fixed crashes in AI-only game mode
 2011-09-06 09:59:06 +00:00
Michał W. Urbańczyk
8b7a2f179c * Server will strictly require answering the queries before taking any actions. Let me know, if this causes any freezes. 
* Fixed crash on new week after we lost battle with neutral monster but killed the top stack (merging failed then).
* minor changes
 2011-09-06 06:00:32 +00:00
Frank Zago
c03a5eb4d2 Created bankconfig.json from bankconfig.txt. 2011-09-03 18:32:37 +00:00
Frank Zago
11b50ca176 Created ressources.json from resources.txt. 2011-09-03 14:26:39 +00:00
Frank Zago
029b77e7c4 Created dwellings.json from cregens.txt. 2011-09-03 14:14:43 +00:00
Michał W. Urbańczyk
5072bda7e6 Fixed the stables crash #799. 2011-09-02 05:44:53 +00:00
Michał W. Urbańczyk
18444fc72f Rewritten code handling growth to eliminate duplication and make it conformant to OH3 mechanics. Proper support for Statue of Legion. 
Displaying shield over minimap during AI turn.
 2011-08-26 20:32:05 +00:00
beegee1
55e7959fd9 * Bonus system caching updated, partially rewritten, much more robust, thread-safe 
* Adjusted projectile speed, trebuchet canon speed
 2011-07-13 18:39:02 +00:00
DjWarmonger
9ca5d9048a Fixed total spell immunity granted by 2212. 
Improvements for Life Drain.
 2011-06-25 15:05:01 +00:00
beegee1
5fdb5aa494 * Improved battle and bonus system performance (significantly faster in debug build, tip: use vs 2008, turn of hex field presentation) 
* Implemented caching for the bonus system
 2011-06-25 13:53:15 +00:00
DjWarmonger
a60fd00e22 Fixes for Pandora Box texts. 2011-06-25 09:28:28 +00:00
DjWarmonger
7dce558e28 More fixes. Estates skill is now handled as a Bonus. 2011-06-24 18:16:28 +00:00
DjWarmonger
bdce46ab60 Minor refactorings, fixes & improvements. 
Moved CArtifactSet to ArtHandler. ObjectHandler is already too messed.
 2011-06-24 17:43:02 +00:00
DjWarmonger
3f85ca4504 Fixes for necromancy. 2011-06-23 13:50:13 +00:00
DjWarmonger
5f53531f4b Fixed crash on joining units that we already have in our army. 2011-06-23 10:12:35 +00:00
DjWarmonger
423fd2ffb7 Fixed #756 
Extended range (ui64) for army strenght.
 2011-06-21 09:31:08 +00:00
DjWarmonger
f4f2af664f Fixed #744 2011-06-01 05:10:28 +00:00
Michał W. Urbańczyk
2d61fab7e9 * Probably fixed #655. 
* Fixed #736, #737.
* Fixed crash on loss/victory.
* Fixed crash on loading some AB maps.
* Fixed crash on loading map where victory/loss condition objective hero was placed inside the town.
* Fixed crash on loading map when neutral Dungeon has built Portal of Summoning.
* Mutex protecting GS will be used to prevent changes in GS when GUI might read it.
* Little more securities around moving hero and ending turn, still needed more.
 2011-05-29 23:49:25 +00:00
DjWarmonger
968080a890 Fixed #734 2011-05-29 12:36:38 +00:00
Michał W. Urbańczyk
3ca95ef5ed Fixed #730: 
* crash on +5 growth week 
* crash on spawning wandering creatures on double growth months
(how come that has not been found in previous build?)

More logging for #729-like issues.
 2011-05-28 01:02:28 +00:00
Michał W. Urbańczyk
8e57dba850 Fixed #658 and #699. 
Checking for water availability won't cause spurious warnings. New creature window enabled for testing.
 2011-05-25 14:48:49 +00:00
Michał W. Urbańczyk
072bb5884b Fixed #728. 
Fixed issue with game loading.
Minor fixes.
 2011-05-24 23:17:57 +00:00
DjWarmonger
d4c2e55a00 Fixed #421 & #480. Some work on animations & sounds. Minor changes. 
TODO: Interface should check game state before it's changed by triggered abilities of creatures.
 2011-05-15 06:37:57 +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
DjWarmonger
7e9033c44f Fixed #668 and #718. 
Hero is now properly attached to his special.

Compile fix for ERM Parser.
 2011-04-23 09:57:51 +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
DjWarmonger
6a8e3f1b57 Neutral creatures are now correctly split into stacks & merged after a battle. 
TODO: find relation to adventure map tile
 2011-04-14 07:58:19 +00:00
DjWarmonger
57d292ba67 Partial support for splitting neutral stacks. Can't go further until interface is fixed. 2011-04-10 08:33:53 +00:00
Ivan Savenko
0f605256e9 - added new files to build system 
- minor gcc fixes
- updated castle interface code, added missing parts including #380
- buildings enum in global.h
 2011-04-07 17:54:08 +00:00
Michał W. Urbańczyk
95efcc7cb5 Fixed #305, #707, #708. 2011-03-19 00:06:54 +00:00
Michał W. Urbańczyk
39120fe4a5 Spell scroll improvements, fixing #689, #690, #691. 
CArtPlace now uses common CInfoWindow for r-click popup (with or without a custom component), old CMessage::genWindow no longer needed.
 2011-03-12 21:55:31 +00:00
DjWarmonger
f7bd5e75cb Fixed 563 & 701. 
It's not nice to write same piece of code twice.
 2011-03-08 13:27:32 +00:00
Michał W. Urbańczyk
7dbf105f6e Surrendering and related artifacts (Statesman's Medal, 
Diplomat's Ring, Ambassador's Sash).
 2011-03-05 16:38:22 +00:00
Michał W. Urbańczyk
03fdd22b1a Version set to 0.83c, to be released as development build. 
Code reorganizations in bonus system, allowing defining bonusNode-like classes.
Fixed some issues with artifact handling (proper updating of GUI when moving, minor fixes). 
Restoring battle AI for neutrals after loading game.
 2011-02-27 19:58:14 +00:00
Michał W. Urbańczyk
236345e61d Fixed #674, #675, #676, #677. 2011-02-25 17:57:30 +00:00
mateuszb
ba7eb6ce49 * bug 492 fixed 
* boost::filesystem version set to 2 (should work with all relatively new versions of boost)
 2011-02-24 15:05:21 +00:00
Michał W. Urbańczyk
a46ad0b7ef Next set of fixes, mostly for deserialization. 2011-02-22 09:47:25 +00:00
Michał W. Urbańczyk
4c9edd3f06 Many fixes around bonus system. Some basic propagation mechanism (not clever but works). 2011-02-21 04:13:00 +00:00
mateuszb
519a4186de * fixed bugs 470 and 523 
* minor improvements
 2011-02-20 18:32:39 +00:00
DjWarmonger
a5a493bfc1 Stack experience more or less handled. Neutrals get 10K xp every day. 2011-02-13 13:11:09 +00:00
DjWarmonger
252cee96f5 Partial Stack Exp operations. Can't really test it as battle is unplayable atm. 2011-02-12 18:48:11 +00:00
mateuszb
fcdc3f0bdd Various changes, including exprank limiter and development towards Tactics secondary skill support. 2011-02-12 16:12:48 +00:00
Michał W. Urbańczyk
ab20e024c0 Various fixes and improvements around kill hero and kill monster quests. A few minor unrelated fixes. 2011-02-11 12:27:38 +00:00
DjWarmonger
f96b394b01 Threat level texts are now stored in separate config file. 2011-02-07 14:39:17 +00:00
Michał W. Urbańczyk
c6db92c0be More development around bonus system: building hierarchy, managing morale bonuses. Fully functional Spell Scroll and Angelic Alliance artifacts. Fixed recruiting hero and moving hero to garrison. 2011-02-04 14:58:14 +00:00
Michał W. Urbańczyk
a75a37008f Practically finished combined artifacts changes, many other fixes. 2011-01-28 02:11:58 +00:00
Michał W. Urbańczyk
e6d577c233 Mostly done combined artifacts. 
[assembling, disassembling, moving, picking]
 2011-01-23 23:49:17 +00:00
Michał W. Urbańczyk
3fde9e45df Partially redone combined artifacts. 2011-01-22 03:43:20 +00:00
Michał W. Urbańczyk
ed07cfe073 Configurable duels. 2011-01-21 02:36:30 +00:00
mateuszb
2451c0dea6 * a bit better stack reversing 
* FoWChange uses unordered_set instead of set
 2011-01-20 17:25:15 +00:00
Michał W. Urbańczyk
898ad292ea A few fixes for artifacts. 2011-01-18 18:56:14 +00:00
Michał W. Urbańczyk
28550c85fd Merged Ivan's changes in trunk ( r1918 ) 2011-01-15 20:07:16 +00:00
Michał W. Urbańczyk
401b364ad7 Partially functional artifact screen. 
[TBD compound artifacts, backpack arranging, "live" modifying values, many details]
 2011-01-06 20:00:19 +00:00
Michał W. Urbańczyk
ebb9c84da9 Artifacts, updated map loading. 2010-12-30 14:41:46 +00:00
Michał W. Urbańczyk
c9189119b9 Little more work on artifacts. 2010-12-29 21:04:22 +00:00
Michał W. Urbańczyk
471c23ba71 Compile fixes, more work on new artifact system. 2010-12-26 14:34:11 +00:00
mateuszb
4929cf9782 * enum for secondary skills 
* THex for battle positions
* towards removal of battleGetStackByID

TODO:
investigate the necessity of putting implementation of BattleAction CGlobalAI::activeStack( const CStack * stack ) in CGeniusAI.cpp
 2010-12-23 20:18:10 +00:00
mateuszb
49083c4e5a * ConstTransitive CGI more or less done 
* hch contents distributed to more appropriate folders
 2010-12-20 21:22:53 +00:00