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,437 Commits 19 Branches 61 Tags 108 MiB
386ac80cf9
Commit Graph

594 Commits

Author SHA1 Message Date
DjWarmonger
f7bd5e75cb Fixed 563 & 701. 
It's not nice to write same piece of code twice.
 2011-03-08 13:27:32 +00:00
Michał W. Urbańczyk
7dbf105f6e Surrendering and related artifacts (Statesman's Medal, 
Diplomat's Ring, Ambassador's Sash).
 2011-03-05 16:38:22 +00:00
Michał W. Urbańczyk
207e573001 Fixed #645 by reverting support for screen scrolling [there are still some remains in settings file] 
Removed some unused code.
 2011-03-01 09:57:18 +00:00
Michał W. Urbańczyk
03fdd22b1a Version set to 0.83c, to be released as development build. 
Code reorganizations in bonus system, allowing defining bonusNode-like classes.
Fixed some issues with artifact handling (proper updating of GUI when moving, minor fixes). 
Restoring battle AI for neutrals after loading game.
 2011-02-27 19:58:14 +00:00
Michał W. Urbańczyk
236345e61d Fixed #674, #675, #676, #677. 2011-02-25 17:57:30 +00:00
mateuszb
ab4418917a * artillery skill fixed 2011-02-24 15:33:03 +00:00
Michał W. Urbańczyk
1afcaf2817 * CThreadHelper.cpp now belongs to VCMI_lib project 
* fixed console on Windows (restored old code)
 * GeniusAI won't get blocked when it has a hero with tactics in battle
 * fixed an issue with switching turns in hot-seat mode when there is Cover of Darkness active
 * suppressed bonus system console output: it goes only to the logfile
 * [win32] setting thread names (debug purposes)
 * minor fixes
 2011-02-24 13:57:47 +00:00
mateuszb
6d6a1af9ed * fixed crash on after attack spell casting 
* more aggressive stack direction normalization after action
* artillery support
 2011-02-23 17:10:35 +00:00
mateuszb
6db7f1d610 * minor improvements in spell immunity handling 2011-02-22 13:44:34 +00:00
mateuszb
b4edd10e6c * beegee's comments patch 
* very minor changes
 2011-02-22 11:52:36 +00:00
Michał W. Urbańczyk
a46ad0b7ef Next set of fixes, mostly for deserialization. 2011-02-22 09:47:25 +00:00
Michał W. Urbańczyk
4c9edd3f06 Many fixes around bonus system. Some basic propagation mechanism (not clever but works). 2011-02-21 04:13:00 +00:00
mateuszb
519a4186de * fixed bugs 470 and 523 
* minor improvements
 2011-02-20 18:32:39 +00:00
mateuszb
4e631fc530 * fix for bug 573 
* minor changes
 2011-02-15 19:54:55 +00:00
Michał W. Urbańczyk
e3310f8759 Eagle Eye seems to work. 2011-02-14 09:29:35 +00:00
Michał W. Urbańczyk
0c700f97cd A little progress with Eagle Eye and Tactics. 2011-02-13 22:46:04 +00:00
DjWarmonger
252cee96f5 Partial Stack Exp operations. Can't really test it as battle is unplayable atm. 2011-02-12 18:48:11 +00:00
mateuszb
fcdc3f0bdd Various changes, including exprank limiter and development towards Tactics secondary skill support. 2011-02-12 16:12:48 +00:00
Michał W. Urbańczyk
9f90ef58ca Some work towards Eagle Eye skill support. 2011-02-11 19:12:08 +00:00
Michał W. Urbańczyk
ab20e024c0 Various fixes and improvements around kill hero and kill monster quests. A few minor unrelated fixes. 2011-02-11 12:27:38 +00:00
mateuszb
8b8d06ac64 * fixed bug 257 
* minor changes
 2011-02-09 15:19:53 +00:00
Michał W. Urbańczyk
c6db92c0be More development around bonus system: building hierarchy, managing morale bonuses. Fully functional Spell Scroll and Angelic Alliance artifacts. Fixed recruiting hero and moving hero to garrison. 2011-02-04 14:58:14 +00:00
Michał W. Urbańczyk
e5bf71538f Minor fix. 2011-01-28 02:16:38 +00:00
Michał W. Urbańczyk
a75a37008f Practically finished combined artifacts changes, many other fixes. 2011-01-28 02:11:58 +00:00
Michał W. Urbańczyk
e6d577c233 Mostly done combined artifacts. 
[assembling, disassembling, moving, picking]
 2011-01-23 23:49:17 +00:00
Michał W. Urbańczyk
3fde9e45df Partially redone combined artifacts. 2011-01-22 03:43:20 +00:00
Michał W. Urbańczyk
ed07cfe073 Configurable duels. 2011-01-21 02:36:30 +00:00
mateuszb
824d2b52db * more or less fixed spells 
* certain hero specialties are still broken
 2011-01-20 19:57:12 +00:00
mateuszb
2451c0dea6 * a bit better stack reversing 
* FoWChange uses unordered_set instead of set
 2011-01-20 17:25:15 +00:00
Michał W. Urbańczyk
898ad292ea A few fixes for artifacts. 2011-01-18 18:56:14 +00:00
mateuszb
a9c98d2b8c #463 and #571 should be fixed now 2011-01-18 18:54:53 +00:00
mateuszb
98494a5e6f * defensive stance implemented (bug #342 fixed) 2011-01-18 17:23:31 +00:00
mateuszb
8a063b88e5 * bug #569 fixed 2011-01-18 16:24:06 +00:00
Michał W. Urbańczyk
28550c85fd Merged Ivan's changes in trunk ( r1918 ) 2011-01-15 20:07:16 +00:00
Ivan Savenko
77ba5a5cd6 - some minor fixes: #626 #597 #275 
- fixed console on Linux
 2011-01-15 17:30:46 +00:00
Michał W. Urbańczyk
7b0188a941 Compile fix. 2011-01-15 02:36:10 +00:00
Michał W. Urbańczyk
f52d4f7cd6 Merged changes from trunk. 2011-01-15 02:35:46 +00:00
Michał W. Urbańczyk
a940daba5e A handful of fixes for artifacts, minor for for battles. 2011-01-15 02:17:56 +00:00
mateuszb
56ec829049 * minor refactoring 
* minor improvements in battle interface
 2011-01-09 17:41:46 +00:00
Michał W. Urbańczyk
c1bd81abdd Mostly fixed battle animations. 
Added proper ending for duel mode.
 2011-01-08 19:38:42 +00:00
Michał W. Urbańczyk
a53ec23556 Stupid AI is capable of winning / losing battle. 2011-01-08 18:33:40 +00:00
mateuszb
957f1764d7 * some progress in StupidAI 
* refactoring of battle handling
WARNING: strange crash on entering battle
 2011-01-07 10:48:31 +00:00
Michał W. Urbańczyk
401b364ad7 Partially functional artifact screen. 
[TBD compound artifacts, backpack arranging, "live" modifying values, many details]
 2011-01-06 20:00:19 +00:00
Ivan Savenko
b8f65697ca - fixes for several bugs: #639 #656 #135 #646 #638 #94 #629 
- re-enabled console on Linux to allow disabling AI
 2011-01-01 20:26:39 +00:00
Michał W. Urbańczyk
ebb9c84da9 Artifacts, updated map loading. 2010-12-30 14:41:46 +00:00
Michał W. Urbańczyk
c9189119b9 Little more work on artifacts. 2010-12-29 21:04:22 +00:00
Michał W. Urbańczyk
471c23ba71 Compile fixes, more work on new artifact system. 2010-12-26 14:34:11 +00:00
mateuszb
b3fd14b524 * splitted CGameState into general game state and battle game state 
* added missing fields to serialize in CHero
 2010-12-25 19:23:30 +00:00
mateuszb
4929cf9782 * enum for secondary skills 
* THex for battle positions
* towards removal of battleGetStackByID

TODO:
investigate the necessity of putting implementation of BattleAction CGlobalAI::activeStack( const CStack * stack ) in CGeniusAI.cpp
 2010-12-23 20:18:10 +00:00
mateuszb
af2c4633ad * partially done duel mode 
* program options parsing via boost::program_options
* Stupid AI - a stupid battle-only AI
* precompiled headers for server and Stupid AI on MSVC
 2010-12-22 20:14:40 +00:00
mateuszb
49083c4e5a * ConstTransitive CGI more or less done 
* hch contents distributed to more appropriate folders
 2010-12-20 21:22:53 +00:00
mateuszb
8b831c1f46 Const-transitiveness of CGI almost reached 2010-12-20 13:04:24 +00:00
mateuszb
b15deaa203 * more constTransitivePointers in GameInfo, separated client GUI classes from it, moved def handlers from CGDefInfo 2010-12-19 14:39:56 +00:00
mateuszb
5806976a9a * towards ConstTranssitivePointers in CGI 2010-12-18 22:11:28 +00:00
mateuszb
23c501b79e some changes 2010-12-17 18:47:07 +00:00
Michał W. Urbańczyk
f7f917845c Merged changes from trunk ( r1885 ) 2010-12-14 18:08:21 +00:00
mateuszb
3989afd153 * more const-correct interface 2010-12-13 20:16:18 +00:00
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