1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

701 Commits

Author SHA1 Message Date
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
mateuszb
6d6fe748d0 * compilation fix 2010-01-31 12:10:13 +00:00
Ivan Savenko
6f0f6564d7 - partial implementation of kingdom overview:
-- moved some kingdom overview values to config
-- small fix to garrison window
-- small fix to button class
2010-01-30 19:08:26 +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
mateuszb
23a32ebf7a * fixed bug #20
* minor changes
2010-01-29 16:19:12 +00:00
mateuszb
b0a587ff08 * fixed #282, #295 and partially #299 2010-01-28 17:23:01 +00:00
Ivan Savenko
6fbcdf63eb Small compile issues in previous revision 2010-01-28 16:28:55 +00:00
Ivan Savenko
c6408f5b4b - Full support for Mystic Pond (Rampart)
- Fixed converHordes issue
- Partial implementation of kingdom overview window
2010-01-28 16:15:46 +00:00
mateuszb
3648a6189b * fixed #325 2010-01-28 14:14:43 +00:00
mateuszb
1708894790 * compilation fix under VC++
* fix for a bug that prevented from loading a map (convertHordes cannot be called before town field is set)
* normalized line endings in CBitmapHandler.cpp
2010-01-28 13:56:48 +00:00
DjWarmonger
88e42828da Added missing (?) includes from last revision. 2010-01-26 11:56:29 +00:00
Ivan Savenko
0f22ba0c0f - First part of kingdom overview window (not a 100% stable)
- Implemented town buildings: dwarven treasury, ballista yard, partially - mystic pond
2010-01-25 21:25:14 +00:00
Frank Zago
3ec6cfd115 (linux) Meved version to 0.75 (at last) and regenerated the makefiles. 2010-01-25 03:19:55 +00:00
Frank Zago
7affd71443 (linux) Saved games are not in the data directory. 2010-01-25 03:09:42 +00:00
Michał W. Urbańczyk
226935fd89 More missing virtual d-tors. GCC should be pleased.
Moved some code.
2010-01-02 01:48:44 +00:00
Ivan Savenko
58d1ec7ac5 2010-01-01 18:54:31 +00:00
Michał W. Urbańczyk
5be449b6ca Fixed crash on closing. Fixed #326. Max movement points values follow H3 more closely. Minor fixes. 2009-12-31 11:04:29 +00:00
OnionKnight
ef5b1ca1de * Fixed bug #112
* Improved the security checks for ExchangeArtifact and SetArtifact, but have also come to realize that SetArtifact  is inherently broken and can be used for cheating. :(
* Preliminary work for combination artifacts, it's now possible to identify artifacts that are combined and what they're made up of.
* Happy New Year!
2009-12-30 15:33:28 +00:00
Michał W. Urbańczyk
5d74e61e3e Hopefully fixed compilation. Unified line endings. 2009-12-30 07:49:25 +00:00
DjWarmonger
63ba552d87 -Fixed Pyramid bug and incorrect behaviour of specific banks
-Commited some old scraps of better InfoWindow with scrollbar
2009-12-29 17:13:40 +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
eb6f7fffc9 Support for smart pointer serialization. Fixed creature banks serialization. Minor fixes. 2009-12-29 01:07:17 +00:00
Michał W. Urbańczyk
01831e912a Fixes for adventure AI: battles where AI is the attacker should work, fixed drawing AI heroes under FoW.
Restructured thread structure: no new thread on yourturn, instead of that introduced update() method called by thread dispatching GUI events. 

Further changes are planned.
2009-12-28 04:08:24 +00:00
Michał W. Urbańczyk
f4dd78507c Patch from Ivan ( http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=4089#4089 )
"I've noticed that on town screen left-bottom info panel doesn't behave like in H3 and it looks that I fixed this as well as some connected issues:
-all elements now response like in H3 on mouse moves\clicks
-town status bar was not cleaned when nothing is selected
-growth calculation was a bit wrong (in case of town with grail)
-in H3 legion statue effect does not include effect of its components - only global +50% "
2009-12-23 01:46:15 +00:00
Michał W. Urbańczyk
6c4b4f21bc * Implemented rivers animation. Thanks to GrayFace for giving range of colors in palette to be shifted.
* Hopefully fixed all issues with bliwWithRotate functions family. If there are any artefacts on terrain drawing, let me know.
* Fixed drawing of objects shadows.
2009-12-22 21:53:50 +00:00
OnionKnight
9dad83590b Fixed bug 129 2009-12-22 07:48:54 +00:00
Michał W. Urbańczyk
1c32679f93 Implemented flagged garrisons passableness ( #150 ). Full support for BorderGates. 2009-12-20 17:14:14 +00:00
mateuszb
4780bcd1a6 * fix for bug 272, 176 and (probably) 273 (creatures cannot be attacked with catapult, position of explosion of catapult shot seems to be fixed for non 800x600 resolutions) 2009-12-20 13:35:59 +00:00
mateuszb
08c7541076 * fix for bug 288 (and maybe other related bugs) 2009-12-20 11:49:43 +00:00
Michał W. Urbańczyk
d037bec1be Fixed #229, #290.
Fixed problems with accessing shared memory sometimes occurring after application has previously crashed.
2009-12-19 12:31:57 +00:00
OnionKnight
cc79f1e2bd Forgot to save the vcproj file, so it didn't get changed with the last revision. 2009-12-12 03:32:18 +00:00
OnionKnight
39a752c408 Fixed issue with Windows 7 DPI upscaling. 2009-12-12 03:26:09 +00:00
Frank Zago
a04b9ffa0c Fixed position of system buttons. Added placeholders for load and restart butttons. 2009-12-11 04:52:51 +00:00