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
5,372 Commits 21 Branches 61 Tags 104 MiB
ffcc5ccdd2
Commit Graph

227 Commits

Author SHA1 Message Date
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
Michał W. Urbańczyk
7dc0d6878e Rewritten battle obstacles. New file for lib: CObstacleInstance.cpp. 
Now obstacles should be placed exactly like they were in OH3. 
All problems with displaying obstacles in battlefield should be gone. They should be now matched to the single pixel. 
If there are still some discrepancies, please report them.
 2012-04-23 19:56:37 +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
Ivan Savenko
f426a48d09 - fixes for gcc-4.7 
- added missing virtual destructors (new warning from gcc)
 2012-04-08 10:34:23 +00:00
Michał W. Urbańczyk
c80d9b0a51 Possibly "fixed" #915. 
Fixed server output (printing ui8 as %d apparently breaks boost.format :/).
 2012-03-31 15:10:16 +00:00
Michał W. Urbańczyk
c698181c4c * simple mechanism for detecting desync after init 
* moving stacks in tactics phase won't affect stack queue  (part of #760)
* moved all boost headers in server to PCH
 2012-03-27 20:08:54 +00:00
Michał W. Urbańczyk
a975805ae8 Fixed #850. 2012-02-17 19:30:40 +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
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
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
Michał W. Urbańczyk
6b9e64de91 Lazy updates of hero paths. 2011-09-03 02:54:33 +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
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
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
Michał W. Urbańczyk
953a3bf165 Final changes for 0.84b: 
* no hard crash on startup when AB videos are not installed (1 byte file)
* moved some DLL_EXPORTs to resolve incomprehensible (to me) linker error occurring only with release builds.
 2011-05-26 01:03:35 +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
f7a4bb906c Several minor cleanups. 2011-05-04 02:38:58 +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
cab8f9e11d AI for neutral creatures and battles and player AIs can be different. StupidAI will handle neutrals by default. 
Fixes for issues with deserialization and handling Tactics secondary skill.
 2011-02-23 03:57:45 +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
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
ed07cfe073 Configurable duels. 2011-01-21 02:36:30 +00:00
mateuszb
957f1764d7 * some progress in StupidAI 
* refactoring of battle handling
WARNING: strange crash on entering battle
 2011-01-07 10:48:31 +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
2cf6729eee Towards duel support. 2010-12-25 01:43:40 +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
Michał W. Urbańczyk
2fe8b07f4f Little more development for duel mode. 2010-12-23 00:33:48 +00:00
mateuszb
af2c4633ad * partially done duel mode 
* program options parsing via boost::program_options
* Stupid AI - a stupid battle-only AI
* precompiled headers for server and Stupid AI on MSVC
 2010-12-22 20:14:40 +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
mateuszb
8b831c1f46 Const-transitiveness of CGI almost reached 2010-12-20 13:04:24 +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
848a00bc6f Stacks #4 -> giving creatures still needs to be fixed. 2010-12-05 23:10:02 +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
9250cc8adf Separated CStack and CStackInstance. 2010-11-20 17:36:02 +00:00
Michał W. Urbańczyk
27f83ea8c3 Further work on bonus system. 2010-11-20 00:03:31 +00:00
Michał W. Urbańczyk
4d657eaf47 Merges from trunk. Minor changes. 2010-11-18 18:07:57 +00:00
Michał W. Urbańczyk
9028684697 Disemboweling the system. 
Things are broken now.
 2010-11-13 20:26:15 +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
Michał W. Urbańczyk
c299a1cdea Fixed desync. 
Version bumped to 0.82c
 2010-10-27 11:36: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
mateuszb
608e26b453 * a few fixes for CStack.effects removal - more should come 2010-08-31 10:22:21 +00:00
DjWarmonger
30cf8b7e77 Fixes for previous commit. 2010-08-30 19:46:38 +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
59447fb85e Hero speciality will now affect Resurrection and other remaining spells. 
Minor refactoring of spell mechanics, more to come.
 2010-08-29 18:29:00 +00:00
Ivan Savenko
fd45cd0a6d - fix for #283 
- ally support: adventure map
 2010-08-13 10:46:08 +00:00
Ivan Savenko
520d40cc59 - uploaded config/settings.txt from 0.82 (fix for #605) 
- fixes for #604 and #364
- ally support is mostly done:
-- exchange between heroes
-- exchange between hero\town
-- finishing the game
 2010-08-12 15:54:25 +00:00
Ivan Savenko
bdcdc89991 - University fix for #594 
- Ally support:
- - fix for non-continuous players (notes to rev 1736)
- - objects visiting and shared puzzle map
 2010-08-06 13:14:10 +00:00
mateuszb
52319f5713 * CBonusSelection will now work on CCampaignState instead of CCampaign; unfortunately there seems to be no elegant way to move that state between bonus selection screen and CGameState::init, so it's not yet moved. 2010-08-04 11:18:13 +00:00
Ivan Savenko
3c868146a6 - linux fix for BuildingHandler 
- #584 should be fixed

- first part of ally support:
-- shared FoW
-- function Callback::getPlayerRelations for team checking
 2010-08-03 12:34:06 +00:00
mateuszb
54496ddee1 * player's serialID removed (save format broken, new game seems to work) 
* building bonus (campaigns) supported
 2010-08-03 11:36:52 +00:00
Michał W. Urbańczyk
c6653949e1 Fixed #90, #581, #567. 
Broken #87
 2010-08-01 14:04:48 +00:00
mateuszb
c06de1f1ce * improved campaign handling - bonus selection screen is mostly functional 
* preliminary support for giving campaign bonuses (resources and spells, artifacts, skills for generated hero are given)
* differing the amount of resources given to AI and human players
* minor changes
 2010-07-31 13:55:05 +00:00
mateuszb
99fcb23182 * several implrovements in campaign handling 
* new cheat codes:
- vcmisilmaril - player wins
- vcmimelkor - player loses
 2010-07-30 11:29:42 +00:00
mateuszb
d3bf011270 * fixed #559 2010-07-29 12:54:30 +00:00
mateuszb
b15e8531b2 * #152 finally fixed (I hope) 2010-07-28 12:31:34 +00:00
Michał W. Urbańczyk
fffef1d740 Changes towards Hill fort support. 2010-07-15 03:04:57 +00:00
Michał W. Urbańczyk
b1a916fb15 Fixed #103 2010-07-10 02:15:49 +00:00
Michał W. Urbańczyk
94f7ee41e2 Fixed some issues with hiring heroes: #25, #232, #333 2010-07-08 05:52:11 +00:00
DjWarmonger
6869551510 Experimental support for Veil of Darkness - messing around with new bonus style. Fixed Cover of Darkness for many players. 
Minor fixes, as always.
 2010-06-07 05:28:12 +00:00
mateuszb
0ac8430b11 * support for armor of the damned 2010-05-19 18:06:16 +00:00
Michał W. Urbańczyk
1002bd2b4f Trading Post handling. 2010-05-18 07:01:54 +00:00
mateuszb
edd31ef41b * half-working boots of levitation and angel's wings 2010-05-15 15:00:19 +00:00
Michał W. Urbańczyk
bb80d4bc02 * support for build grail victory condition 
* improved formula for necromancy to match better OH3
* Support for new town structures:
- Lighthouse
- Colossus
- Guardian Spirit
- Necromancy Amplifier
- Soul Prison
 2010-05-14 02:18:37 +00:00
mateuszb
adbc142ff0 * a bit of campaign support 2010-05-08 18:56:38 +00:00
mateuszb
3c72644880 * teleportation implemented 2010-05-07 14:05:48 +00:00
OnionKnight
cc616616c1 * Creatures now guard surrounding tiles. 2010-05-06 12:13:31 +00:00
Michał W. Urbańczyk
a14606f32d New bonus system. Unified HeroBonus and StackFeature. Still early version, will need improvements and development. 
If you encounter any new crashes / bugs / unacceptable slowdowns, please PM me.
 2010-05-02 18:20:26 +00:00
mateuszb
5d3d9689e8 * luck support 
* support for distance/wall penalties & no * penalty abilities
* reworked damage calculation to fit OH3 formula better
 2010-04-06 13:19:54 +00:00
Michał W. Urbańczyk
9a632246de Changes towards better bonus system. 2010-04-03 03:33:46 +00:00
mateuszb
3a76d72b69 * support for increasing / decreasing luck / morale for allies / enemies 
* support for spell 77 (thunder-sth)
 2010-02-24 18:11:08 +00:00
mateuszb
5b0d646ddb * support for SPELL_AFTER_ATTACK, including most of spell 77 support 2010-02-23 15:39:31 +00:00
Michał W. Urbańczyk
0fdbe787dc * New file: lib/HeroBonus.cpp - updated project files for MSVC 
* Updated changelog
* Support for Lighthosues and Obelisks
* Bonus system extended on players 
* Army speed won't affect movement points when sailing
* Picking grail position (digging not implemented though, puzzle map only partially)
* Minor improvements
 2010-02-10 02:56:00 +00:00
mateuszb
ba51824710 * next part of thieves' guild window 2010-02-07 17:56:06 +00:00
mateuszb
69bed4a8d6 * small changes 2010-02-07 15:06:14 +00:00
mateuszb
5fbde49bfb * another part of thieves' guild 
* den of thieves
 2010-02-06 13:49:14 +00:00
mateuszb
bc6cba565e * next part of thieves' guild window 2010-02-04 18:40:40 +00:00
mateuszb
f5a719c2da * next part of thieves' guild window 2010-02-01 17:51:33 +00:00
Michał W. Urbańczyk
5279e2e9fc First part of support for victory & loss conditions. 
Implemented and tested are
victory:
Defeat hero
Capture town
Defeat monster
Flag dwellings
Flag mines

Lose:
Loss hero
Time expire

**

Some others may work but not has been tested yet.
I've added a new page in VCMI Status spreadsheet with status of various victory/loss conditions.
 2010-01-29 20:52:45 +00:00
DjWarmonger
711094da82 Fixed bugs 275 & 324 
+Some minor tweaks
 2010-01-01 12:15:20 +00:00
Ivan Savenko
def041a8c9 #39 and #106 - fixed cosmetic buildings behaviour 
#102 - fixed config + requirements system
#161 - extended clickable rectangle
and some minor fixes
 2009-12-29 13:40:16 +00:00
Michał W. Urbańczyk
1c32679f93 Implemented flagged garrisons passableness ( #150 ). Full support for BorderGates. 2009-12-20 17:14:14 +00:00
Michał W. Urbańczyk
a3bfde9a41 Hopefully fixed #261, #263, #246. 2009-12-01 21:05:57 +00:00
DjWarmonger
adf3c9fd4b Resolved bugs #76 and #168 which always gave same heroes in tavern. 2009-11-15 14:06:25 +00:00
mateuszb
db4ee5844f * implemented 206 and 207 from mantis 2009-11-08 14:44:58 +00:00
DjWarmonger
1683a419a3 Implemented artifact placement rules for advMap objects, but not for the random artifacts placed via editor. (feature #119) 2009-10-24 19:21:32 +00:00
Frank Zago
3cdefa2790 accesible->accessible 2009-10-16 02:09:58 +00:00
Michał W. Urbańczyk
fe7ef6bbe1 Smart map object serialization over net. 
Fixed doubling click sound on map selection.
 2009-10-06 00:32:33 +00:00
mateuszb
7382314dfd * battle should now end automatically when last stack of one of sides is killed by a spell 
* minor changes
 2009-09-28 14:21:48 +00:00
mateuszb
4dbc54f335 * minor changes (a few new consts introduced) 2009-09-25 12:33:29 +00:00
Michał W. Urbańczyk
307c20e7dc * fixed crash on clicking on the map frame 
* battle settings will be stored
* fixed calculating battle casualties
* fixed crash when clicking on enemy stack without moving mouse when we receive action
* fixed issue when splitting stack to the hero with only one creatures
 2009-09-24 13:23:52 +00:00
Michał W. Urbańczyk
ee3c318ed9 Version for development release 0.73c 
* version set to 0.73c, bumped save format version, updated changelog
* new stack queue for higher resolutions (needs new graphics!)
* improved stack ordering during battle
* many minor fixes
* temporarily disabled AI
 2009-09-20 12:47:40 +00:00
Michał W. Urbańczyk
956a87f264 * redone stack queue algorithm 
* recalculating paths only after finished movement / switching selection
* moving hero uses "new" pathfinder
* moving hero by arrow keys / numpad
* VCMI window should start centered
* fixed pairing Subterranean Gates
* fixed issues with creatures sounds after loading
* several minor changes and improvements
 2009-09-07 02:29:44 +00:00
mateuszb
1772f52554 * new spell: berserk 2009-09-06 17:46:20 +00:00
mateuszb
05b0d82769 * next part of sieges 2009-09-05 14:10:26 +00:00
mateuszb
a4df8e8831 * partial support for arrow turrets 2009-09-04 14:11:42 +00:00
mateuszb
5bfbcfb000 * next part of sieges 
* partial implementation of berserk spell (unit does not always attack the nearest creature, wrong handling of situation when nearest stack is too far)
* ballista can shoot (it was considered to be always blocked instead of always free)
 2009-09-02 14:10:19 +00:00
mateuszb
d25a5a795e * next part of sieges 2009-09-01 13:54:13 +00:00
Michał W. Urbańczyk
ca7ee8936c Implemented redesigned pathfinder. Using new info from it, implemented various adventure map cursors. 
(Paths are still calculated using the old pathfinder, it will be changed soon)
 2009-08-30 12:47:40 +00:00
mateuszb
8fac12f957 * estimating damage that will be dealt while choosing stack to attack 2009-08-29 17:09:07 +00:00
Michał W. Urbańczyk
780de79eba Further fixes. 2009-08-28 10:05:45 +00:00
mateuszb
fceeb05e16 * a bit of pathfinder interface redesign 
* a few fixes for sieges
* better wall parts' positions by Ivan
 2009-08-28 09:03:58 +00:00
mateuszb
adcfb3c020 * second part of sieges 
* minor changes
 2009-08-26 14:09:55 +00:00
mateuszb
2c7d7f4094 * first part of siege support 
* minor fix
 2009-08-24 12:55:05 +00:00
mateuszb
fe2085fe42 * support for new creature abilities: hate, spell cost decreasing, spell vulnerability 
* fixed crash when vcmiistari is applied on hero without spell book
 2009-08-23 13:41:57 +00:00
mateuszb
56fe3b0547 * jousting support 2009-08-22 15:29:30 +00:00
Michał W. Urbańczyk
66dd31fd8a * attacking and capturing towns 
* r-click popups on selected town/hero.bonus and teams in pregame
* disabled music due to bugs in SDL_mixer and smpeg (probably it was the source of reported random crashes / hangups)
* minor fixes
 2009-08-22 13:59:15 +00:00
mateuszb
c4b0bd9d7e * new spell: remove obstacle 
* minor changes
 2009-08-19 10:59:42 +00:00
mateuszb
4fc25c7b98 * corrected per-stack spell immunity handling 
* support for new artifacts: * of Legion, shackles of war
 2009-08-16 13:44:17 +00:00
mateuszb
ea6ab102a7 * support for new spells: anti-magic and elemental summoning 
* obstacles in battles should fit now the battlefield
* minor changes
 2009-08-06 14:02:21 +00:00
mateuszb
507597301f * new spells: resurrection, animate dead 
* a lot of minor fixes in battles
* resolution & depth in settings.txt reverted to 800x600 and 24bpp
 2009-08-05 12:46:08 +00:00
Michał W. Urbańczyk
310c369265 Fixed two possible block-ups in AI. Fixed possible problems with picking hero available to recruit (no more duplicates hopefully). 2009-08-05 00:05:37 +00:00
mateuszb
e4580faba8 * hopefully fixed range of wide creatures 2009-08-04 15:38:26 +00:00
mateuszb
048ab62530 * some changes in code handling movement of wide creatures in battles. It could solve a few bugs but I'm not sure 2009-08-02 14:21:18 +00:00
mateuszb
8e63c73cf8 * flaggable objects change their color on minimap when taken over 
* corrected damage inflicted by spells and ballista
* minor changes
 2009-07-30 12:49:45 +00:00
Michał W. Urbańczyk
1d816b2eb9 Further part of external dwellings handling. Still not done. 
Redone MetaString.
 2009-07-09 19:15:22 +00:00
mateuszb
85eb5c7eb9 * artifact manipulation in exchange window works (without switching artifacts between different heroes) 
* support for 3 new artifacts:
- Ring of Vitality
- Ring of Life
- Vial of Lifeblood
* restructures creature ability preparing (creature abilities are now loaded from cr_abils.txt file). It needs further work - all changes in abilities should be moved from CCreatureHandler.cpp to cr_abils.txt as it's done in this commit (I hope it's clear how it should be done as there is an example)
 2009-06-28 13:49:39 +00:00
Michał W. Urbańczyk
58c12e8d73 Reshaped some code responsible for hero list / paths. 
* Garrisoning, then removing hero from garrison move him at the end of the list
* problems with the hero window hero list should be fixed
 2009-06-11 17:21:06 +00:00
Michał W. Urbańczyk
cff70406f1 * enter can be used to open window with selected hero/town 
* fixed slider behavior when showing less maps/games than available slots
* added a few missing sounds for creatures
* fixed problems with artifacts info caused by bug in serialization
* fixed bug in Scholar's serializetion
* all stacks features will be serialized (should fix problems with missing premies from artifacts)
* proper serialization of HeroBonus, fixes some problems/crashes
* resource silos won't give resources on the first day
* fixed problems with removing artifacts when all visiblebackpack slots are full
 2009-05-30 16:00:26 +00:00
mateuszb
4f12f73cb9 * next part of stack bonus system 
* support for a few new creatures
 2009-05-24 17:35:11 +00:00
Frank Zago
73949f3367 Build fixes for linux. 2009-05-21 00:55:30 +00:00
mateuszb
429b226517 * moved a few files 2009-05-20 10:08:56 +00:00