games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
2,029 Commits 19 Branches 62 Tags 110 MiB
f12aeb7fa4
Commit Graph

249 Commits

Author SHA1 Message Date
DjWarmonger
310a36c8d1 Fixed 313 & 314 :) 2010-11-15 12:51:53 +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
0f4478d8cf Hotfix for meeting window. 2010-11-04 23:28:26 +00:00
Michał W. Urbańczyk
a346708398 #610 / minor 2010-10-31 19:56:37 +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
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
Ivan Savenko
c10dac929d - New animation system: 
-- New files: hch/CAnimation.h/cpp
-- Class CAnimation capable to load file partially and/or keep data in compressed state
-- Buttons now use CAnimation instead of CDefHandler

- build system regenerated to include new files
- fixed several gcc warnings
- updated README.linux
 2010-10-18 15:08:59 +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
608e26b453 * a few fixes for CStack.effects removal - more should come 2010-08-31 10:22:21 +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
cb1a01950f Fixed #617 2010-08-29 09:00:59 +00:00
Ivan Savenko
88fd213e87 - LodHandler now will ignore file extensions. 
Special case: MSK\MSG files (they have same names as def) can be accessed as file#msk or file#msg
- some fixes
 2010-08-28 15:10:37 +00:00
Ivan Savenko
4d171bd53c -rewrote GarrisonInt with use of object capturing 
- BitmapHandler can now load images from any format supported by SDL_Image
note: file can have any possible format but extension should be .bmp or .pcx
- fixed some warnings
 2010-08-27 16:20:35 +00:00
mateuszb
6b8718b046 * partially done support for resolutions smaller than 800x600 by screen scrolling 2010-08-23 15:16:40 +00:00
DjWarmonger
6f94fcd083 Minor fix for creature Component. 
Some missing code also.
 2010-08-22 07:54:24 +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
Michał W. Urbańczyk
7e5b675cbf Fixed crash on drawing selectable component. 2010-08-18 10:58:41 +00:00
Michał W. Urbańczyk
6057ca0c0b Reverted r1752 
[breaks a few things]
 2010-08-18 10:52:30 +00:00
DjWarmonger
48b262756b Fixed #577. New BlockingDialog functionality - only accept. 2010-08-17 16:26:48 +00:00
DjWarmonger
084a0148c7 Compile fix + minor changes. 2010-08-17 15:16:08 +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
Michał W. Urbańczyk
f76e28ee95 Creature animations in 16 bpp. 2010-08-12 05:22:48 +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
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
mateuszb
3361126c55 * partially done building bonus (campaigns) 
* ERMU -> picture name mapping by Ivan (thanks)
 2010-08-02 14:29:30 +00:00
mateuszb
34c58bc966 * fixed some warnings 2010-08-02 11:06:49 +00:00
Michał W. Urbańczyk
558350c686 Fixed #564. 
Minor improvements.
 2010-07-31 01:38:12 +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
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
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
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
DjWarmonger
52c224502c Compilation fix. Creature damage will now be displayed correctly. 2010-07-16 15:52:21 +00:00
Michał W. Urbańczyk
fffef1d740 Changes towards Hill fort support. 2010-07-15 03:04:57 +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
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
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
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
Michał W. Urbańczyk
1002bd2b4f Trading Post handling. 2010-05-18 07:01:54 +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
Michał W. Urbańczyk
70fa697f8b Support for War Machine Factory. 2010-05-15 08:33:32 +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
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
943c433d3f * moved mapHandler to client folder 2010-04-06 08:59:24 +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
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
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
OnionKnight
38004fc45c Some code cleanup. 2010-03-02 23:40:13 +00:00
mateuszb
39dcf007d1 * fixed #392 and #393 2010-03-01 18:45:18 +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
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
Michał W. Urbańczyk
e6f31b7500 Compilation fixes for VC10. 
Changes towards hot-seat support.
 2010-02-20 13:24:38 +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
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
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
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
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
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
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