1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Commit Graph

734 Commits

Author SHA1 Message Date
mateuszb
f004cbff3f * fixed #550 2010-07-28 10:09:15 +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
Michał W. Urbańczyk
2b899d5777 Fixed #544. Final fix for #493. 2010-07-26 20:56:39 +00:00
Michał W. Urbańczyk
dc936d5686 Fixed #543 and #547. Fixes for marketplace. Combined artifacts will again give bonuses from their constituents. 2010-07-26 15:37:58 +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
ff078dc440 Fixed #522 (probably), #529, #540.
Version to be released as dev build 0.81b
2010-07-24 11:46:04 +00:00
Michał W. Urbańczyk
4e9e3fce73 Minor improvements for the Hill Fort. 2010-07-23 12:13:03 +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
2f996f14ba Exchanging artifacts between slots should work again nicely. Minor fixes. 2010-07-21 19:50:15 +00:00
Michał W. Urbańczyk
90faf3fbdc Little missing piece - opening on adv maps spells from hero / exchange / kingdom windows. Minor fix. 2010-07-21 10:20:32 +00:00
Michał W. Urbańczyk
931949e349 A bunch of spellbook-related fixes: #91, #454, #462, #526, #527, #536 2010-07-21 10:09:29 +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
cd9ab4cc62 VCMI won't crash with invalid video file (should fix #92). 2010-07-20 10:46:38 +00:00
Michał W. Urbańczyk
0e9eb1ab2d Fixed #534, minor correction. 2010-07-20 09:16:48 +00:00
Michał W. Urbańczyk
cedf6d812c Half-done Altar of Sacrifice. (Sacrificing creatures should work) 2010-07-20 06:05:45 +00:00
Frank Zago
c9439b1621 Removed some c++0x extensions. 2010-07-17 22:53:04 +00:00
Frank Zago
eecfa0f2bd (g++) Compilation fixes. 2010-07-17 01:19:16 +00:00
DjWarmonger
52c224502c Compilation fix. Creature damage will now be displayed correctly. 2010-07-16 15:52:21 +00:00
mateuszb
a7d3c5fbca * minor cleanups 2010-07-16 14:22:18 +00:00
mateuszb
565d474364 * fixed #519 2010-07-15 17:13:17 +00:00
mateuszb
af52f308a2 * fixed #438 and crash on ZMM170S.DEF 2010-07-15 16:21:53 +00:00
mateuszb
bb5d765247 * fixed #485 2010-07-15 11:28: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
9febb357ff Fixed #504. More logging for #419. 2010-07-14 01:08:27 +00:00
Michał W. Urbańczyk
88e1636250 Fixed #15, #224, #370, #516
Minor changes.
2010-07-13 05:25:40 +00:00
Michał W. Urbańczyk
fa4ee94cf9 Fixed #484. Preliminary support for bonus limiters/ 2010-07-12 10:20:25 +00:00
Ivan Savenko
bb7615309f - Implemented Portal of Summoning (Dungeon) 2010-07-10 16:50:23 +00:00
Michał W. Urbańczyk
3af697b91a Support for Favourable Winds. 2010-07-09 04:29:11 +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
d3c6270980 Fixed a few potential crashes.
Minor improvements.
2010-07-07 02:29:07 +00:00
Michał W. Urbańczyk
88b4d69afa Minor fixes. 2010-07-06 02:40:42 +00:00
Michał W. Urbańczyk
d0ff61807d Obtaining town instance pointer via cb. Plz, don't access gamestate directly from player interface! Everything has to go via callback.
Commented out giving starting artifact - new artifact randomization make it crashing. Please fix it.

New control - CTextBox - for multi-line text with optional slider. Used it for map description and info windows. Related changes. Fixes #22 and #96.
2010-07-06 02:10:26 +00:00
Ivan Savenko
e4fcfd7044 - Skeleton transformer implemented 2010-07-03 12:00:53 +00:00
DjWarmonger
88f0ee0682 Added missing include for previous commit. Use of undefined type again. 2010-07-01 06:05:00 +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
Ivan Savenko
2a99bc76da - part of castle gate handling (need to make server-client interaction)
- minor fixes ( 361, 507, 466 )
2010-06-26 10:01:26 +00:00
Michał W. Urbańczyk
e2fd2bbe04 Fixed #446 and #219.
Version bumped.
2010-06-24 12:10:45 +00:00
DjWarmonger
2ed69d3f4d Support for Cover of Darkness 2010-06-06 06:05:39 +00:00
DjWarmonger
b118060304 Major optimization of getVisBitmap() 2010-06-03 05:38:59 +00:00
Michał W. Urbańczyk
eb42048fbc Reverted r1596 2010-06-01 19:05:30 +00:00
mateuszb
d3aa5b6820 * possibly fixed problems with crashes on winning resources in creature bank 2010-06-01 17:40:15 +00:00
Michał W. Urbańczyk
124f0dd401 Possible deadlock fixed. 2010-05-31 23:53:35 +00:00
Michał W. Urbańczyk
39eb87924e Fixed #473, #475, #477 2010-05-31 21:14:15 +00:00
Michał W. Urbańczyk
9af18cf487 Fixed #464 and #467 2010-05-31 20:38:14 +00:00
Michał W. Urbańczyk
abf54deaa3 Fixed #459 and #465.
Fixed crash on closing creature info window when upgrade was possible ( http://forum.vcmi.eu/viewtopic.php?p=4669#4669 ).
2010-05-30 11:48:24 +00:00
Michał W. Urbańczyk
c55397f3ab Version set to 0.8b - for dev release.
Minor.
2010-05-26 22:54:00 +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
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
0ebad5bed6 * fixed calling heroBonusChanged when artifact is unequipped; please fix hero screen without const_casts on hero (no mechanically important variable should be changed locally) 2010-05-16 12:34:48 +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
Frank Zago
df151cceba Various compile and warning fixes. 2010-05-12 02:32:56 +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
DjWarmonger
931cebdb04 Some conflicts resolved, minor changes. 2010-05-03 06:25:19 +00:00
Michał W. Urbańczyk
7ad7a36363 Fixed crash on battle end. 2010-05-02 23:36:08 +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
Frank Zago
c331aaf2f4 Updated makefiles. 2010-04-07 03:42:59 +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
mateuszb
943c433d3f * moved mapHandler to client folder 2010-04-06 08:59:24 +00:00
mateuszb
de69d6f639 * minor speedups 2010-04-04 08:47:00 +00:00
Frank Zago
d2d076cd23 Added command line parser. 2010-04-03 22:06:50 +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
Michał W. Urbańczyk
be42b7ff62 Solution file for VC9. Minor. 2010-03-27 22:00:55 +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
658a560698 * 437 fixed 2010-03-09 11:19:08 +00:00
Michał W. Urbańczyk
3699786ab0 Little more work on pregame. Fixed some leaks.
Fixed: #80, #159, #234, #235, #319, #320, #430
2010-03-07 22:56:51 +00:00
mateuszb
ac7bc76b7b * implemented first aid kit including first aid secondary ability 2010-03-07 17:40:33 +00:00
Michał W. Urbańczyk
85f463e479 Several fixes for pregame:
Fixed #240, #255, #397, #411
2010-03-05 22:51:09 +00:00
mateuszb
c4ae0c4cf2 * KING1 / KING2 / KING3 support
* ability 78 support
2010-03-03 11:18:08 +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
mateuszb
c3cf16df19 * fix for #404 2010-03-02 11:40:29 +00:00
Michał W. Urbańczyk
0b824585e2 Implemented #390. 2010-03-01 19:04:07 +00:00
mateuszb
39dcf007d1 * fixed #392 and #393 2010-03-01 18:45:18 +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
Michał W. Urbańczyk
d7ba3571bd Fixed crash on opening thieves guild window when player has no heroes.
Fixed #384, #385, maybe #381
2010-02-28 12:39:38 +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
Frank Zago
3459819a8f Compile fix. 2010-02-27 15:59:21 +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
Michał W. Urbańczyk
9588e39e84 To be released as 0.75d. Fixed town list with hotseat. Fixed colouring hero window. Minor fixes. 2010-02-26 11:18:09 +00:00
mateuszb
b52ed2aa8e * fix for scenario options preview after the game is started 2010-02-25 13:51:30 +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
Michał W. Urbańczyk
d7a1898676 Many fixes, mostly related to hot-seat. 2010-02-22 13:30:46 +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
mateuszb
acbfa7a6b9 * fix for finishing battles in hot-seat 2010-02-19 16:19:44 +00:00
mateuszb
d53e4d7c1a * (hopefully) fixed battle interface in hotseat mode
* fixed a bug when defending player (human) attacks in battle with two-hex unit from top-right or bottom-right direction
2010-02-19 16:02:34 +00:00
mateuszb
80d42a5313 * next part of campaigns. Now all campaigns all available via custom campaign menu.
* puzzleMap now works
2010-02-18 14:09:16 +00:00
mateuszb
921b5e0c09 * missing change 2010-02-18 12:44:59 +00:00
mateuszb
db755622b3 * next part of campaign support 2010-02-18 12:34:44 +00:00
mateuszb
968148c4dc * next part of bonus selection screen (including Ivan's config) 2010-02-16 17:28:56 +00:00
Michał W. Urbańczyk
4035155969 Mostly finished pregame part of hot-seat mode. 2010-02-16 16:35:24 +00:00
OnionKnight
ab75f4b1f8 Some work on artifact assembly. 2010-02-16 14:39:56 +00:00
Frank Zago
a6aa36c5a9 Compile and warning fixes. 2010-02-16 05:01:15 +00:00
mateuszb
5db0c9da16 * generally finished custom campaign selection screen
* minor fixes
2010-02-15 13:28:33 +00:00
Ivan Savenko
f250880c69 - minor fixes (363, 365, 371) 2010-02-15 13:19:13 +00:00
mateuszb
448c2e7225 * next part of campaign support
* a few fixes for .h3c reading
2010-02-15 12:12:21 +00:00
Michał W. Urbańczyk
49b99f470f More hot-seat GUI in pregame. 2010-02-15 11:37:47 +00:00
Michał W. Urbańczyk
da87d25d21 Started making hot-seat GUI. Accompanying changes to rest of GUI. 2010-02-15 06:54:57 +00:00
Michał W. Urbańczyk
78f54ffcd3 Fixed game loading.
Release 0.75d
2010-02-13 21:45:46 +00:00
mateuszb
40d50aaaa1 * a bit of custom campaign selection screen 2010-02-13 16:26:47 +00:00
Ivan Savenko
5eef9cde44 - fixed 355, 356, 360
- fixed bug in map handling (random creatures in random town\hero)
2010-02-13 15:56:34 +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
51946e60a5 Fixed #351.
Fixed grail placement.
Fixed crashbug with removing monster on RoE map.
Version set to 0.75d
2010-02-12 00:53:25 +00:00
mateuszb
a975c54f86 * most of .h3c reading 2010-02-11 14:12:22 +00:00
Michał W. Urbańczyk
dd92dfed86 Fixed #82
This version will be released as dev build 0.75b
2010-02-11 04:24:37 +00:00
Michał W. Urbańczyk
42fade07dc Fixed #13 and #339 2010-02-10 21:31:54 +00:00
Michał W. Urbańczyk
c1cb2c223f Fixed #46, #323, #328 2010-02-10 03:21:23 +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
d0bf334394 * reading of .h3c headers
* a bit of readNormalNr deduplication
* minor changes
2010-02-09 13:48:14 +00:00
Frank Zago
ba80ba4f6e Compile fix + updated makefile. 2010-02-09 02:17:38 +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
mateuszb
4d9d54735f * campaigns, part 1
* minor changes
2010-02-08 14:38:06 +00:00
mateuszb
ba51824710 * next part of thieves' guild window 2010-02-07 17:56:06 +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
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
mateuszb
5fe80d89ef * warning fixed (use of an uninitialized variable) 2010-02-05 10:54:59 +00:00
mateuszb
bc6cba565e * next part of thieves' guild window 2010-02-04 18:40:40 +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
Ivan Savenko
3dbeaa5ef8 - Moved most of text output to original fonts
- Temporary disabled ttf output
2010-02-02 16:24:53 +00:00
Michał W. Urbańczyk
49e56e3749 7 days without castle loss condition. Minor fixes. 2010-02-01 23:30:03 +00:00
mateuszb
f5a719c2da * next part of thieves' guild window 2010-02-01 17:51:33 +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
mateuszb
9c404c5c14 * compilation fix 2010-02-01 13:52:17 +00:00
Frank Zago
cf03071de5 g++ compile fix. 2010-02-01 05:45:44 +00:00
Ivan Savenko
ddd0786739 forgot to fix line endings and one file 2010-01-31 23:30:47 +00:00
Ivan Savenko
eefdd686de - Almost finished kingdom overview window
- modified garrison to allow placing it in 2 rows
- some fixes to hero and exchange windows
2010-01-31 23:22:25 +00:00
mateuszb
0f21d9c762 * first part of Thieves' Guild window 2010-01-31 18:41:22 +00:00