games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Code Issues Releases Activity
2,203 Commits 19 Branches 61 Tags 108 MiB
79a453f442
Commit Graph

537 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
02e4ef507e Stacks #5: giving creatures, practically finished (many fixes needed). 2010-12-12 23:44:16 +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
69b97e0a51 Little more changes. 2010-12-09 23:10:28 +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
efedb1a55a * minor cleanup 2010-12-04 19:15:20 +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
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
cdf7b2b4d9 Bonuses now use pointers. 
Things are very broken.
 2010-11-18 22:06:56 +00:00
DjWarmonger
310a36c8d1 Fixed 313 & 314 :) 2010-11-15 12:51:53 +00:00
DjWarmonger
f758d13a22 One more file. 2010-11-15 07:16:29 +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
OnionKnight
8ad159af53 Fixed bug #539. 2010-11-05 14:43:14 +00:00
DjWarmonger
1f2e9bf9c2 Added important fix reverted in r1817. 2010-10-31 07:11:28 +00:00
Frank Zago
dbe38a7062 A few bug fixes and arious warning fixes: unused code/variables, out of order initializations, ... 2010-10-30 21:53:41 +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
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
DjWarmonger
2c43707661 More fixes for weeks & growths. 2010-10-02 09:43:22 +00:00
DjWarmonger
02d7fa35b7 A number of fixes. Banks serialization, doubling spell effects, week of plague. 2010-10-02 07:10:38 +00:00
mateuszb
9356ba15ef * minor improvements for campaigns 2010-09-04 14:49:15 +00:00
Frank Zago
4b8be22fb6 Several compile/link fixes. 2010-09-04 14:47:39 +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
01776b6a04 Support for MAXED_SPELL special (Melodia, Daremyth) 2010-08-29 19:03:10 +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
DjWarmonger
6005e7a6ee Implemented fixed set of creatures that can get week of double growth. Minor fix. 2010-08-29 07:49:04 +00:00
mateuszb
fc79b9b6cf * partial implementation of hero crossover 
* minor fixes to resolution handling
* other minor fixes and changes
 2010-08-28 14:52:20 +00:00
DjWarmonger
c7f8f0a967 Support for creature weeks and Deity of Fire is now complete. 2010-08-26 07:23:08 +00:00
Ivan Savenko
dc2f3cf181 - some fixes for town events 
- #190 - InfoWindow components adjusted vertically
- #194 - correct sex for heroes in battles
 2010-08-25 14:57:58 +00:00
DjWarmonger
ea966a3d21 Creature weeks now work fine. Castle interface still needs to be updated. 2010-08-25 08:40:50 +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
DjWarmonger
6f94fcd083 Minor fix for creature Component. 
Some missing code also.
 2010-08-22 07:54:24 +00:00
mateuszb
d681afe1c1 Changes towards campaign support. 2010-08-20 13:34:39 +00:00
mateuszb
6ebfe25f86 * compile fixes & minor changes (I hope they are correct, SComponent::setSurface didn't return any value and failed to compile - I'm not sure if I return proper value). 2010-08-19 15:24:32 +00:00
Ivan Savenko
d732565002 - blocked retreating from castle. Escape Tunnel implemented. 
- fixed crash when player have no hero (like castle defence)
- minor fixes
 2010-08-19 11:03:33 +00:00
Ivan Savenko
8319e5e703 - town events implemented 
- merged CustomImagecComponent into SComponent
- moved some subID-related code from CastleInterface
 2010-08-18 14:24:30 +00:00
DjWarmonger
3f31f6d33d Pyramid fixes: #287, #403, #572, #575. It's config is now stored in bankconfig.txt 2010-08-18 13:42:46 +00:00
DjWarmonger
6c3ad7fcae Fixed #565. Creature components will not get description if they quantity is set to zero. 2010-08-17 15:50:17 +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
a95bb9d916 * fixed 576 
* new cheat code: vcmiforgeofnoldorking - hero gets all artifacts except spell book, spell scrolls and war machines
 2010-08-05 09:47:12 +00:00
mateuszb
844d170b4f * Town portal implemented 2010-08-04 13:41:01 +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
34c58bc966 * fixed some warnings 2010-08-02 11:06:49 +00:00
mateuszb
4fb50260c3 * fixed 592 2010-08-02 10:59:47 +00:00
Michał W. Urbańczyk
4140711b6d Version set to 0.82. 
Updated changelog.
Fixed crashes on losing.
 2010-08-01 14:46:19 +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
Ivan Savenko
c1f0b956f4 bugfixing: 
#124 - level-up code will now use ping-pong mode
#145 - switched skills positions, 1st skill will be selected
#545 - replaced images in  reward dialog of seer hut
 2010-07-28 22:39:56 +00:00
mateuszb
67f9d6d630 * fixed #551 2010-07-28 12:54:45 +00:00
Ivan Savenko
e025a43cb0 - some fixes for Castle Gate and Hill Fort 
- removed unavailable in Hill Fort upgrades from cr_upgrade_list.txt
- fixed bug in upgrading creatures
- workaround to make VCMI work with Russian language files (possibly fixed 289)
 2010-07-26 23:20:21 +00:00
Ivan Savenko
a00e5cc177 - implemented scholar skill 
- fixed some remaining building issues (#361)
- Portal of Summoning will now be present in fort window
- some fixes for Thieves Guild window (partial #386)
 2010-07-25 22:47:59 +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
cedf6d812c Half-done Altar of Sacrifice. (Sacrificing creatures should work) 2010-07-20 06:05:45 +00:00
DjWarmonger
49beed4e42 Support for secondary skill specialities. Lots of changes, may be buggy. 2010-07-17 17:02:11 +00:00
mateuszb
a7d3c5fbca * minor cleanups 2010-07-16 14:22:18 +00:00
mateuszb
1c15ee34e5 * fixed #533 2010-07-15 14:53:06 +00:00
Michał W. Urbańczyk
fffef1d740 Changes towards Hill fort support. 2010-07-15 03:04:57 +00:00
Michał W. Urbańczyk
70bfd7ceb7 Minor (unnecessary copying of vector) 2010-07-12 10:56:57 +00:00
Michał W. Urbańczyk
49b7fc590d Fix for Portal of Summoning. (ID is type of object, id is position of object instance in the map vector of object instances) 
Most correct way of getting visitable position ;)
 2010-07-12 10:42:51 +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
Michał W. Urbańczyk
94f7ee41e2 Fixed some issues with hiring heroes: #25, #232, #333 2010-07-08 05:52:11 +00:00
DjWarmonger
fb7771fcc2 Minor tweak. Stables will now upgrade Cavaliers to Champions. 2010-07-07 12:20:15 +00:00
DjWarmonger
74364865ff Minor fixes. Support for resource generation special. 2010-07-06 10:02:38 +00:00
Ivan Savenko
e4fcfd7044 - Skeleton transformer implemented 2010-07-03 12:00:53 +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
DjWarmonger
1159750bb6 Support for #448. Few code tweaks. 2010-06-29 09:59:14 +00:00
DjWarmonger
12f6d5a380 Redesigned artifact randomization. 
Fixed #119, #128, #433, #493
 2010-06-28 05:07:21 +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
DjWarmonger
dcf10e978f Removed unnessessary code from previous commit. 2010-06-25 08:34:14 +00:00
DjWarmonger
08da1692cf Several fixes for Whirlpool and stack removal. 
Sea Captain's Hat is also supported.
 2010-06-25 08:19:39 +00:00
DjWarmonger
db2bde9ae2 Support for Aurora Borealis 2010-06-19 10:42:30 +00:00
DjWarmonger
a53be2d382 Minor tweaks for hiding tiles, now it belongs to CGObjectInstance class. 2010-06-19 09:13:10 +00:00
mateuszb
ea150305a2 * a few fixes for darkness; more are needed 2010-06-13 13:59:59 +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
Michał W. Urbańczyk
39eb87924e Fixed #473, #475, #477 2010-05-31 21:14:15 +00:00
Michał W. Urbańczyk
585bc8ae6b Fixed #458 and #460 2010-05-27 21:29:56 +00:00
Michał W. Urbańczyk
3111a904ae Several minor fixes. 2010-05-26 21:59:58 +00:00
Michał W. Urbańczyk
8bda10b695 * Freelancer's Guild support (both town structure and adventure map object) 
* fixed crashes on r-click on hero in tavern and adv map
* fixed descync issue
* allow free movement FROM guarded tile
 2010-05-26 09:47:53 +00:00
mateuszb
6541e89f90 * support for orb of vulnerability 
* updated changelog
 2010-05-21 16:43:07 +00:00
mateuszb
76f61fa09e * implemented hourglass of evil hour 2010-05-20 11:06:40 +00:00
mateuszb
f36918eb7e * [previous commit adds support for golden bow too] 
* support for ammo cart
* partially written support for orb of vulnerability
 2010-05-20 10:54:24 +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
71b73bad53 * mostly working hero flying and water walking; support for artifacts: 
- Angel's Wings
- Boots of levitation
and spells
- fly
- water walk
 2010-05-16 13:42:19 +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
70fa697f8b Support for War Machine Factory. 2010-05-15 08:33:32 +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
29a720f938 * fixed SPELL_AFTER_ATTACK 
* fixed #452
 2010-05-11 17:09:08 +00:00
OnionKnight
87e66fff31 * Changed artifact handling so bonuses from constituent artifacts in combinational ones are added implicitly. 
* Discovered bug when attacking guarded visitables. Needs to wait before battle is over.
 2010-05-09 19:10:59 +00:00
mateuszb
adbc142ff0 * a bit of campaign support 2010-05-08 18:56:38 +00:00
Michał W. Urbańczyk
921bddc35e Some changes to the market window, sending resources to other players. 2010-05-07 22:10:32 +00:00
mateuszb
3c72644880 * teleportation implemented 2010-05-07 14:05:48 +00:00
mateuszb
dbbbaa1e18 * life drain implemented 
* fixed #134
* fixed damage calculation formula
 2010-05-07 12:29:41 +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
Michał W. Urbańczyk
993036e4a1 New non battle stack class. (Base for future improved bonus system, stack exp / arts) 
Fixed #443
 2010-04-02 02:07:40 +00:00
mateuszb
8b561ca00c * fix for 444 2010-03-26 19:14:39 +00:00
Michał W. Urbańczyk
80f49badc9 Implemented Scuttle Boat and Dimension Door spells. 
Fixed #417 and #418.
Moved / refactored some code. Minor fixes.
 2010-03-20 22:17:19 +00:00
Michał W. Urbańczyk
ad841f7fea Implemented Summon Boat spell. 2010-03-10 23:16:30 +00:00
mateuszb
ac7bc76b7b * implemented first aid kit including first aid secondary ability 2010-03-07 17:40:33 +00:00
OnionKnight
a96b21d06d Fixed bug #416 2010-03-03 02:19:14 +00:00
OnionKnight
38004fc45c Some code cleanup. 2010-03-02 23:40:13 +00:00
Michał W. Urbańczyk
eec43d3c58 Version set to 0.80. (real, fixed release) 
Hopefully fixed #412, #413, #414
 2010-03-02 20:12:32 +00:00
Michał W. Urbańczyk
9e6d3a4453 Version set to 0.8. (not release yet, waiting for a few more fixes) 
* fixed possible crash on visiting Obelisk
* fixed #394, #391, #395, #373
 2010-03-01 18:22:22 +00:00
Ivan Savenko
32b6b9cb17 - Full support for scholar skill 
- Some code for #366
- Fixed R-click issue from rev 1516
 2010-02-28 10:01:36 +00:00
OnionKnight
dc2a0730e6 * Fixed duplication issue when transferring artifact to backpack. Really should be no bugs left now for the artifact screens. 
* Tweaked artifact assembly to behave a bit more like H3; right-clicked artifact becomes the assembled one if it's in the right spot.
* Fixed so the backpack won't scroll when selecting the last artifact in the backpack.
 2010-02-28 02:44:37 +00:00
OnionKnight
ad3371b4c0 It's now possible to assemble and disassemble artifacts. 
There is some strange behavior when right-clicking on the artifact screen outside the slots though, all slots then get  right-click handling and display the assembly dialog for whatever it finds.
 2010-02-27 01:05:39 +00:00
mateuszb
4171a1959f * new spell: fire shield 2010-02-26 15:52:48 +00:00
OnionKnight
0086bbbe8c Any bugs when transferring artifacts should be fixed now. 2010-02-25 00:17:52 +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
Michał W. Urbańczyk
0a950c508b Grail digging and construction. 
Minor fixes.
 2010-02-24 13:03:36 +00:00
mateuszb
5b0d646ddb * support for SPELL_AFTER_ATTACK, including most of spell 77 support 2010-02-23 15:39:31 +00:00
mateuszb
b2aa0e5930 * partial support for grail digging 2010-02-21 15:03:30 +00:00
Michał W. Urbańczyk
e6f31b7500 Compilation fixes for VC10. 
Changes towards hot-seat support.
 2010-02-20 13:24:38 +00:00
OnionKnight
ab75f4b1f8 Some work on artifact assembly. 2010-02-16 14:39:56 +00:00
Michał W. Urbańczyk
96819379c5 Fixed #109, #352, #359. 
Possibly also #344, #353.
Allowed switching heroes with l-click when another hero is selected. (works for not accessible heroes)
 2010-02-13 04:47:31 +00:00
mateuszb
8637b021cc * (hopefully) full reading of h3c 
* minor changes
 2010-02-12 15:04:01 +00:00
Michał W. Urbańczyk
e79507ab0d Resolved #349, #336 / #350 2010-02-12 07:49:17 +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
OnionKnight
790a77c280 Locks for combination artifacts largely implemented, only one or two bugs when moving them around in a certain way. Artifact assembly still remaining. 
To make sure these artifacts get (un)equipped properly the functions CArtHandler::equipArtifact and CArtHandler::unequipArtifact should be used instead of modifying artifWorn manually.
 2010-02-08 21:17:22 +00:00
DjWarmonger
53365af90e Last part of Seer Hut & Quest Guard code: 
1.Required artifacts & army are now taken on completion.
2.Hoover tooltip.
3.Fixed bugs.
 2010-02-07 16:05:27 +00:00
mateuszb
69bed4a8d6 * small changes 2010-02-07 15:06:14 +00:00
mateuszb
b670979cab * compilation fix 2010-02-06 13:55:39 +00:00
mateuszb
5fbde49bfb * another part of thieves' guild 
* den of thieves
 2010-02-06 13:49:14 +00:00
Ivan Savenko
fa735b6a67 - partial implementation of scholar skill (spell exchange works, but no message) 
- some fixes
 2010-02-06 13:27:58 +00:00
OnionKnight
137ab65a13 Fixed artifact screens so only local changes are made. Some ugly const casting, for now. 2010-02-05 22:28:31 +00:00
Ivan Savenko
3aefb896fe - Created config file for true type fonts (disabled by default) 
- Implemented buildings with bonuses for defending hero (glyphs of fear, fountain of fortune, some grails)
- Minor fixes
 2010-02-04 15:50:59 +00:00
DjWarmonger
ce00ceaf08 Next part of Seer Hut code, including large number of Components, packs and help functions. 
Mapa now contains separate vector of monsters to avoid linear search trough all objects.
 2010-02-02 17:05:03 +00:00
Michał W. Urbańczyk
49e56e3749 7 days without castle loss condition. Minor fixes. 2010-02-01 23:30:03 +00:00
Michał W. Urbańczyk
172b3b0158 Further loss improvements. 2010-02-01 19:19:42 +00:00
Michał W. Urbańczyk
94fa59cf45 * Compilation fix (missing includes, do not remove) 
* New settings.txt file (needed for kingdom overview to work)
* Last remainings of h3m format: hero placeholders parsing
* Minor improvements
 2010-02-01 17:07:46 +00:00
Michał W. Urbańczyk
8552fd2fb0 Fixed some crashes with std loss condition. 2010-01-30 15:00:05 +00:00
Michał W. Urbańczyk
6803d08c6c Further victory conditions supported: 
Transport artifact
Find artifact
Gather army
Gather resource
Build city
 2010-01-30 12:46:15 +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