games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity
3,590 Commits 21 Branches 65 Tags 121 MiB
8a9f2781c2
Commit Graph

279 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
d168f3eac2 * Implemented Moat functionality during siege (stops movement and deals dmg) 
* Mostly implemented battle spells:
 - Fire Wall
 - Force Field
 - Land Mine
 - Quicksands
 2012-05-18 20:50:16 +00:00
DjWarmonger
5435101182 Lots of fixes and improvements for Commander interface. 2012-05-18 19:44:15 +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
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
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
Michał W. Urbańczyk
5449546447 Advanced work on support for Quicksand and Land Mine spells. 2012-05-04 21:16:39 +00:00
DjWarmonger
bd2a0c2a2b "You have captured enemy artifact" window. All arts from commander & stacks will also be looted. 2012-05-02 08:37:11 +00:00
DjWarmonger
6f108c41df Fix for previous commit. Now artifacts from defeated hero are passed to winner. 2012-05-01 14:38:53 +00:00
DjWarmonger
2fbc57e140 1. Better way to disable stack / cursor glitches 
2. An attempt to handle looting artifacts after battle
 2012-05-01 08:52:22 +00:00
Ivan Savenko
66f5b5e2d7 - gcc compile fixes 2012-04-14 16:28:36 +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
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
5c86d32903 Cloned stack dissapear when killed. 
Fixed #864
 2012-02-18 17:39:47 +00:00
DjWarmonger
c724092028 Partial support for Clone spell. 2012-02-10 13:13:24 +00:00
DjWarmonger
9e5fcc3152 Stack artifact backup. 
Still doesn't serialize properly, though.
 2012-02-10 10:32:21 +00:00
DjWarmonger
2bddf29cbf Stack artifacts part 2, not working yet. 2012-02-04 16:34:29 +00:00
DjWarmonger
b8a5d0d430 Stack artifacts - part 1 2012-01-30 16:07:52 +00:00
DjWarmonger
1cbd7e94e4 - Extended cap or removed sign for some values that may potentially overflow 
- Fixed #851
 2012-01-26 16:48:53 +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
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
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
DjWarmonger
95f23cf20f Support for Bind ability. 2011-10-17 08:24:51 +00:00
DjWarmonger
b4d0ebf9ab Support for Mana Channeling ability. 2011-10-09 11:23:24 +00:00
DjWarmonger
5e40d3da72 Support for Enchanter ability. 2011-10-09 07:20:23 +00:00
DjWarmonger
0903d6037c New pack - BattleEffectTrigger for various one-shot effects with animation 2011-10-08 13:02:58 +00:00
Frank Zago
16c23bbf4e Fixed one bad condition; and a compile fix. 2011-10-06 00:27:27 +00:00
DjWarmonger
f1f416c890 Fixed (unnecessary?) deadlock in BattleStacksRemoved. Daemon summoning is pretty functional. 2011-10-02 13:59:12 +00:00
DjWarmonger
07b8f87fb7 Partial support for Daemon Summoning. 
It freezes for unknown reason, but still.

Minor fixes.
 2011-10-02 07:16:34 +00:00
DjWarmonger
6fdb984799 Lots of refactoring & work for creature spells. 
No new features yet, but summon elementals now work properly again.
 2011-10-01 19:56:54 +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
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
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
Michał W. Urbańczyk
3152e6d540 Fixed #771, #772 and #787. 
Some minor changes and fixes.
 2011-08-25 15:24:37 +00:00
beegee1
f609c4ad9a * Fixed #33 -> Creatures tend to stop at every hex during movement 2011-08-01 17:36:18 +00:00
DjWarmonger
5269e845fd handling of Rebirth ability for Phoenix. 
However, I've got no idea how to restore its animation to alive state.
 2011-07-08 14:54:20 +00:00
DjWarmonger
8102fd4cf0 Support for Death Blow ability. 2011-07-06 17:00:45 +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
DjWarmonger
e95ae22061 Implemented Dragon Breath, Attack All Around & Three-Headed Attack. 
Dragon Breath does not yet work correctly for all double-wide stacks, though.
 2011-07-04 19:34:49 +00:00
mateuszb
aac1c0b4e7 * cleaner code is better :) 2011-07-03 19:10:36 +00:00
DjWarmonger
51943e5f1e Partial support for Death Cloud & Magog's Fire Ball. 
Lots of refactoring is needed to handle this and multiple-target attacks.
 2011-07-02 16:49:22 +00:00
DjWarmonger
af8d8cbfc7 Implemented #479 2011-06-21 12:45:57 +00:00
Michał W. Urbańczyk
9775f88045 Version bump. 
Initial support for IF:M elements and string formatting.
Various minor changes related to ERM interpreter.

The following script should be functional now:
ZVSE
!?PI;
!!DO1/0/6/1&v2777<>1:P0;

!?FU1;
!!IF:M^Hello world number %X16!^;
 2011-06-10 23:50:32 +00:00
Michał W. Urbańczyk
0dbd7ee3c8 Fixed #739 and #742. 
Version set to 0.85.
 2011-06-01 18:26:44 +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
mateuszb
94166b83aa * some changes 2011-05-22 18:46:52 +00:00
DjWarmonger
b02527566c Fixed some battle logs. 2011-05-13 10:45:36 +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
Ivan Savenko
61af4c745e - recursive directory parser for LodHandler - for creature abilities and new main menu images 
- fixed screen updating on closing window
- minor fixes
 2011-04-23 10:27:44 +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
mateuszb
ab4418917a * artillery skill fixed 2011-02-24 15:33:03 +00:00
DjWarmonger
a5a493bfc1 Stack experience more or less handled. Neutrals get 10K xp every day. 2011-02-13 13:11:09 +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
3fde9e45df Partially redone combined artifacts. 2011-01-22 03:43:20 +00:00
mateuszb
824d2b52db * more or less fixed spells 
* certain hero specialties are still broken
 2011-01-20 19:57:12 +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
mateuszb
56ec829049 * minor refactoring 
* minor improvements in battle interface
 2011-01-09 17:41:46 +00:00
Michał W. Urbańczyk
471c23ba71 Compile fixes, more work on new artifact system. 2010-12-26 14:34:11 +00:00
mateuszb
b3fd14b524 * splitted CGameState into general game state and battle game state 
* added missing fields to serialize in CHero
 2010-12-25 19:23:30 +00:00
Michał W. Urbańczyk
b15ac97c62 Half done refactoring of CHeroWindow. 2010-12-16 22:32:53 +00:00
Michał W. Urbańczyk
e301256f92 Adjusted player interface to new set of stack operations. 
Const transitive ptr.
 2010-12-14 21:55:23 +00:00
Michał W. Urbańczyk
f7f917845c Merged changes from trunk ( r1885 ) 2010-12-14 18:08:21 +00:00
mateuszb
3989afd153 * more const-correct interface 2010-12-13 20:16:18 +00:00
Michał W. Urbańczyk
fc6d6e02a3 More fixes for stacks, some basic macro-based logging for bonus graph operations. 2010-12-11 23:11:26 +00:00
Michał W. Urbańczyk
f020562570 Merged changes from trunk. 2010-12-05 23:26:56 +00:00
Michał W. Urbańczyk
848a00bc6f Stacks #4 -> giving creatures still needs to be fixed. 2010-12-05 23:10:02 +00:00
mateuszb
6f56b5bb30 * a few more consts 2010-12-04 19:44:23 +00:00
Michał W. Urbańczyk
fdb541d81e Stacks #3 -> towards new system of stack operations. 2010-11-27 20:17:28 +00:00
Michał W. Urbańczyk
7c3f3d20c3 Stacks #2 -> towards new system of stack operations. 2010-11-27 01:46:19 +00:00
Michał W. Urbańczyk
32ce20af15 Moving stack system to pointers, part #1 2010-11-22 00:34:46 +00:00
Michał W. Urbańczyk
bce805dacc Restored Warmonger's changes to artifacts system. 
They will be subject of my further work, along with next part of bonus system.
 2010-11-10 00:06:25 +00:00
Ivan Savenko
923fed7dc1 - fix for bonuses in campaign screen 
- fixed gcc warnings
- build system updated
 2010-10-25 19:37:21 +00:00
Michał W. Urbańczyk
daeb3af67a Early changes towards MP support. 
It's possible to connect several clients (running on localhost) and enter MP pregame. The actual MP game still not playable. (though it can be started)
 2010-10-24 11:35:14 +00:00
Michał W. Urbańczyk
aa131bbf15 Reverted r1811, r1812, r1813 2010-10-24 11:23:43 +00:00
DjWarmonger
b75cf89f86 Partial support for customizable artifacts and Spell Scroll. Still doesn't work, though. 2010-10-03 17:52:11 +00:00
DjWarmonger
0f314e106c Artifacts will now be handled by pointers. 
Assembling & disassembling combos may be buggy, but it's already been before.
 2010-10-03 07:07:53 +00:00
mateuszb
4ba3c68ced Chenges (networking for PG, minor fixes) 2010-09-03 18:42:54 +00:00
DjWarmonger
bfe266a377 Moved battle effects to bonus system. May be buggy. 
Moved creature damage to bonus system, simplified its handling. Some changes and tweaks.

Support for Adela's bless.
 2010-08-30 18:06:17 +00:00
DjWarmonger
c7f8f0a967 Support for creature weeks and Deity of Fire is now complete. 2010-08-26 07:23:08 +00:00
DjWarmonger
630dc7f7f2 Next part of creature weeks code. 2010-08-24 14:26:57 +00:00
DjWarmonger
70a158ba55 Fixes for random creature spawns. VCMI will display info about different weeks (though they are not supported yet). 2010-08-22 18:21:45 +00:00
mateuszb
d681afe1c1 Changes towards campaign support. 2010-08-20 13:34:39 +00:00
DjWarmonger
6f022e02bb Fixed #583. Minor fixes. 2010-08-15 16:24:58 +00:00
Michał W. Urbańczyk
d79fa527a7 Implemented abandoned mine. Minor fixes. 2010-07-31 00:26:34 +00:00
Michał W. Urbańczyk
a981dfd1fd Refugee Camp supported. 2010-07-23 21:05:49 +00:00
Michał W. Urbańczyk
8487653a8e Sacrificing artifacts. [Code is one giant workaround but should work good enough.] Updated changelog. 2010-07-23 12:02:15 +00:00
Ivan Savenko
215dc95acb - implemented Hill Fort (minor issue - you can do ANY upgrades, including archers to sharpshooters without Gelu and so on) 
- fixed some g++ errors in macroses
- minor tweaks
 2010-07-22 00:32:45 +00:00
Michał W. Urbańczyk
7ae02b7c5a Fixed #471. 
Bonuses from artifacts are now inherited. Some work on artifacts set GUI. CArtifactsOfHero now operates on its own hero copy when picking artifact. Still more fixes are needed though.
 2010-07-20 18:34:32 +00:00
Ivan Savenko
5dc444cd2b - University is finally implemented, both town and map objects 2010-07-20 14:08:13 +00:00
Michał W. Urbańczyk
88e1636250 Fixed #15, #224, #370, #516 
Minor changes.
 2010-07-13 05:25:40 +00:00
Ivan Savenko
bb7615309f - Implemented Portal of Summoning (Dungeon) 2010-07-10 16:50:23 +00:00
Michał W. Urbańczyk
1e30045541 Support for Tavern on adv map. 2010-07-08 23:03:27 +00:00
DjWarmonger
24b47ce006 General tweaking of specialities for general consistency. 
Values now grow with level. Warning: they affect entire hero himself, not the specific type of creature.
 2010-07-08 19:10:26 +00:00
Michał W. Urbańczyk
94f7ee41e2 Fixed some issues with hiring heroes: #25, #232, #333 2010-07-08 05:52:11 +00:00
Ivan Savenko
60c90af39c #41 - Implemented Castle Gates 
#375, #376 - fixed recruit window 
#362, #377 - fixed town window
 2010-06-30 19:27:35 +00:00
Michał W. Urbańczyk
21a05d73cb Black Market and Artifact Merchant (only buying artifacts) support. 2010-06-27 16:03:01 +00:00
Michał W. Urbańczyk
ec6342d9a7 Serializer will now smartly send over network CArtifact* and CHero*. Unified handling of items stored in vector. 
Started making support for Black Market / Artifact merchant.
 2010-06-26 16:02:10 +00:00
mateuszb
ea150305a2 * a few fixes for darkness; more are needed 2010-06-13 13:59:59 +00:00