games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity
1,952 Commits 20 Branches 62 Tags 110 MiB
ba7eb6ce49
Commit Graph

821 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
4434a73651 #630, ofstream doesn't have constructor from std::string on older compilers. 2010-11-07 12:14:31 +00:00
Michał W. Urbańczyk
d715510bee Version bump. 
Fixed a stupid typo, thankfully not very breaking.
 2010-11-06 14:43:48 +00:00
Michał W. Urbańczyk
5d1111019c Fix for garrison issue. 
To be released as second hotfix.
 2010-11-05 21:44:11 +00:00
Michał W. Urbańczyk
30ae49864a Workaround for the font issue. 2010-11-05 20:48:54 +00:00
Michał W. Urbańczyk
0f4478d8cf Hotfix for meeting window. 2010-11-04 23:28:26 +00:00
Michał W. Urbańczyk
1c8d909433 Hotfix for loading game. 2010-11-03 11:34:25 +00:00
Michał W. Urbańczyk
5004c1188b Since filename extensions are omitted, GARRISON.TXT was hiding GARRISON.BMP. I've added a crude workaround (ignore the first file since it's not used). 
Fixed #613.
 2010-10-31 21:29:39 +00:00
Michał W. Urbańczyk
a346708398 #610 / minor 2010-10-31 19:56:37 +00:00
Michał W. Urbańczyk
dc5370ad6e Fixed #585 and #588. 2010-10-31 19:17:26 +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
e83b9fa8fa Fixed battles for network MP. 2010-10-30 19:26:39 +00:00
Michał W. Urbańczyk
0e12c1419e Not very nice fix for campaigns. 2010-10-30 14:53:23 +00:00
Ivan Savenko
923fed7dc1 - fix for bonuses in campaign screen 
- fixed gcc warnings
- build system updated
 2010-10-25 19:37:21 +00:00
Michał W. Urbańczyk
e301f8e048 Reenabled campaigns. Workaround for crash when button graphic is not available. 2010-10-24 21:29:18 +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
6cadd47f0d Fixes for artifact system - instances are serialized and synchronized. However, still some serializer issue prevents Scroll from working. 2010-10-09 18:38:32 +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
DjWarmonger
47c8ee2e13 Statue of Legion constituents are now properly handled by GUI. 2010-09-26 05:21:09 +00:00
DjWarmonger
717141ab0b Statue of Legion is finally functional. 
You can see my attempt to create very generic handling of global effects, but I abandoned it since no other items might actually use it.

However, Statue's constituents are buggy, so may be assembling & dissasembling them. Most likely this issue is general.
 2010-09-25 20:23:55 +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
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
Ivan Savenko
9e8d0651f6 - fix for #32 (b) 
- fix for some warnings
 2010-08-29 23:12:34 +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
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
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
d1bfe4cbd6 * a bit better screen scrolling for small resolutions 
* a bit optimized terrainRect
 2010-08-26 15:33:55 +00:00
mateuszb
c45d037bc8 * small bugfix for hiding tiles 
* minor changes
 2010-08-26 12:06:36 +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
mateuszb
7cad2364fe * minor fixes for screen scrolling 2010-08-23 16:13:30 +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
Frank Zago
e252c2d06c Build files update. 2010-08-21 00:41:40 +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
Michał W. Urbańczyk
7e5b675cbf Fixed crash on drawing selectable component. 2010-08-18 10:58:41 +00:00
Michał W. Urbańczyk
58c2e176c4 Smarter fix for #577 ;) 2010-08-18 10:53:59 +00:00
Michał W. Urbańczyk
6057ca0c0b Reverted r1752 
[breaks a few things]
 2010-08-18 10:52:30 +00:00
mateuszb
fe87ba6608 * fixed crash on displaying right or bottom part of advmap 2010-08-18 10:37:43 +00:00
Michał W. Urbańczyk
4aa60cd40e Minor changes. 2010-08-18 09:50:25 +00:00
DjWarmonger
48b262756b Fixed #577. New BlockingDialog functionality - only accept. 2010-08-17 16:26:48 +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
DjWarmonger
084a0148c7 Compile fix + minor changes. 2010-08-17 15:16:08 +00:00
mateuszb
9c60629bcf * minor changes 2010-08-17 14:58:13 +00:00
mateuszb
c96dab5c7e * reverting prevoius revisiom 
* minor changes
 2010-08-17 12:48:34 +00:00
mateuszb
9aa6d0a7b9 * refactoring of map handler and minor changes 2010-08-16 13:51:31 +00:00
mateuszb
9445e5b184 * small refactoring 
Please don't touch CGI->state directly in client code - use callbacks instead. I'd like to make some mechanics-critical handlers in CGI const - a lot of work, certain changes have been done here.
 2010-08-16 09:54:09 +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
Frank Zago
904f764628 Compile and warning fixes. 2010-08-06 02:47:43 +00:00
mateuszb
6928f850b9 * fixed 494 
* minor changes
 2010-08-05 11:47:57 +00:00
Michał W. Urbańczyk
78f44dc648 Support for 16bpp displays. Possible optimizations. 2010-08-05 11:02:18 +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
7002e73908 * small fix 2010-08-05 07:52:34 +00:00
mateuszb
844d170b4f * Town portal implemented 2010-08-04 13:41:01 +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
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
4140711b6d Version set to 0.82. 
Updated changelog.
Fixed crashes on losing.
 2010-08-01 14:46:19 +00:00
mateuszb
b441143a73 * monster campaign bonus handled 
* selecting / displaying difficulty
 2010-08-01 14:40:34 +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
Ivan Savenko
1338340027 - fixed 578 
- minor fix to hero window
 2010-07-31 13:18:40 +00:00
Michał W. Urbańczyk
558350c686 Fixed #564. 
Minor improvements.
 2010-07-31 01:38:12 +00:00
mateuszb
af7aebc806 * minor changes 2010-07-30 14:26:37 +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
Frank Zago
686061071f Compile fix. 2010-07-30 02:08:53 +00:00
mateuszb
052e4f08e5 * partially done campaign bonus selection 2010-07-29 17:00:34 +00:00
mateuszb
d3bf011270 * fixed #559 2010-07-29 12:54:30 +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
Michał W. Urbańczyk
fc4c496f99 Fixed #556. Version for dev build 0.81d 
EDIT: r1703 will be 0.81d
 2010-07-28 22:24:16 +00:00
Michał W. Urbańczyk
cc96374a40 Fixed #552 2010-07-28 10:46:36 +00:00
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