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

1076 Commits

Author SHA1 Message Date
Ivan Savenko
e494171de3 - several changes to get reusable code
- possibly fixed #725
- bug in random seed initializing?
2011-04-30 18:16:58 +00:00
Michał W. Urbańczyk
ec76876bda drawBorder should not crash when attempted drawing outside the surface. 2011-04-29 00:50:54 +00:00
beegee1
45fba15511 * Reverted previously changed PreGame code
* Added the missing AB video resource file in linux code, AB campaign selection videos should now play BUT they don't => it seems that ffmpeg can't handle older BINK videos
* Fixed a visual glitch which could be seen at the WOG animation in the main menu on a linux machine
* Fixed the random crashes bug on mouse centering at startup on linux
* Fixed a visual bug at the bonus selection screen when starting a campaign-map
* Changed some positions in the bonus selection screen, no bonus pre selection, you cannot start the campaign when no bonus is selected (like in h3)
* Added a border functionality to the AdventureMapButton
* InfoWindow buttons and some other buttons have now the border which heroes 3 buttons have
* Fixed a app crash when you start a campaign two times in one session
2011-04-26 13:30:29 +00:00
DjWarmonger
a73a1c2724 Battle log messages for new abilities.
Lots of fixes.
2011-04-26 07:57:26 +00:00
DjWarmonger
a4d845688a Support for Poison, Age, Disease
Partial support for Stone Gaze, Paralyze, Mana drain
Partial fix for #134 - animation triggers only for our own stacks, not enemy's
Lots of tweaks & fixes.
2011-04-25 09:03:13 +00:00
Michał W. Urbańczyk
362f413b4d Fixing #127 and #702. 2011-04-24 02:02:41 +00:00
DjWarmonger
7591d06b05 Support for Death Stare.
Some tweaks are still needed. Level 0 spell-like abilities won't work correctly.
2011-04-23 17:10:54 +00:00
Ivan Savenko
61af4c745e - recursive directory parser for LodHandler - for creature abilities and new main menu images
- fixed screen updating on closing window
- minor fixes
2011-04-23 10:27:44 +00:00
Michał W. Urbańczyk
d092eaf9d1 Artifact Merchant: selling artifacts. Messy, but completes H3 town structures functionalities.
BTW updating screen after closing marketplace is broken.
2011-04-22 21:51:10 +00:00
beegee1
66b708c168 * PreGame interface gets now redrawn every frame.
* Changed PreGame event handling and update/draw order.
* Changed mouse cursor drawing in PreGame
* Fixed linux bug where main menu WOG animation gets played only once, windows/linux video handling is now more similar
* Minor code improvements
2011-04-17 18:02:13 +00:00
DjWarmonger
3241e7c8f8 Applied patch for #721 from Plush. 2011-04-15 18:43:46 +00:00
beegee1
d6bd8514e7 Fixed bug #722. GuiBase::Run is now mostly in its old state. (before rev 2062) One disadvantage is now that the FPS Counter doesn't work in battle. 2011-04-13 19:52:56 +00:00
DjWarmonger
3c5a0fd4ce Creatures now use SHOTS Bonus to express their total ammo count. Support for "additional shots" exp premy. 2011-04-12 08:59:18 +00:00
DjWarmonger
f12aeb7fa4 More tweaks. 2011-04-10 10:31:42 +00:00
DjWarmonger
4bcf4926c9 Various fixes. 2011-04-10 05:41:24 +00:00
DjWarmonger
0f60ceb414 Impemented scrollbar for Creature Window. Call it finished. 2011-04-09 19:34:48 +00:00
Frank Zago
ecb3508690 (linux) Added configure test for the icc and clang compilers, and set some extra parameters for them. 2011-04-09 17:28:51 +00:00
Frank Zago
b0cecac5c9 (linux) Use avcodec_decode_video when avcodec_decode_video2 is not present. Updated vcmi version number. 2011-04-08 04:21:41 +00:00
Ivan Savenko
0f605256e9 - added new files to build system
- minor gcc fixes
- updated castle interface code, added missing parts including #380
- buildings enum in global.h
2011-04-07 17:54:08 +00:00
Frank Zago
69364b5b60 Various gcc compile fixes, and updates to linux code. 2011-04-07 02:16:32 +00:00
mateuszb
7874d84c4e * basic structure of ERM interpreter
* SHOW_FPS moved to settings.txt
* minor changes
2011-04-06 20:30:59 +00:00
beegee1
157002fe68 Better implementation of the framerate manager, FPS timer added, minor improvements 2011-04-05 17:38:24 +00:00
Michał W. Urbańczyk
b5a546349b Moved framerate keeper from CPlayerInterface to CGuiHandler, thing should be running smoother. 2011-04-03 10:45:39 +00:00
mateuszb
ccecc6637f * partially done support for VERM
* MSVC compilation fix (using boost::ref is an error)
2011-04-01 19:09:05 +00:00
Ivan Savenko
407acce4c6 - gcc 4.5 / boost 1.46 compilation fixes
- configure will accept CXXFLAGS parameter correctly
- boost version check in ERMParser - to skip compilation with old boost
2011-03-29 17:16:10 +00:00
mateuszb
3c393843e6 * ERM parsing mostly done, some strange cases of body syntax, undocumented expressions and encoding issues still remain. 2011-03-27 17:24:30 +00:00
Ivan Savenko
c6f1d87ede - fix for #95 and #602
- implemented animation for new town buildings
2011-03-22 13:19:07 +00:00
beegee1
b6c385f158 Better implementation of campaign selection screen 2011-03-21 19:32:48 +00:00
DjWarmonger
70b21fc9eb Quick implementation of stack experience details. Minor fixes.
Man, it's ugly.
2011-03-21 08:14:23 +00:00
DjWarmonger
bc51c0006f Support for creature skill icons. Several fixes for creature abilities. 2011-03-20 08:45:05 +00:00
Ivan Savenko
7209f158a1 - gcc/Linux fixes
- added --nointro parameter to skip intro videos
- minor fixes to scenario selection menu
2011-03-19 22:27:05 +00:00
Michał W. Urbańczyk
5e4140762f Fixed #687. 2011-03-19 14:35:29 +00:00
beegee1
fb929fa9b0 AB campaign selection screen added 2011-03-19 14:27:51 +00:00
Michał W. Urbańczyk
95efcc7cb5 Fixed #305, #707, #708. 2011-03-19 00:06:54 +00:00
Michał W. Urbańczyk
4d3776058d My project files for VC10. 2011-03-17 23:06:48 +00:00
Frank Zago
66c05ddcff Some gcc/linux fixes. 2011-03-17 03:56:36 +00:00
mateuszb
406b3e3f1c * unnecessary code removed 2011-03-15 17:25:51 +00:00
beegee1
38837ebfc9 Implementation of WOG and ROE campaign selection screen 2011-03-15 14:35:36 +00:00
Frank Zago
9bd484a6de gcc compile fix. 2011-03-13 16:06:20 +00:00
Michał W. Urbańczyk
a382b641b7 Removing old, VC9 project files. 2011-03-12 22:53:52 +00:00
Michał W. Urbańczyk
a461326380 Fixed #634 and #703. 2011-03-12 22:29:19 +00:00
Michał W. Urbańczyk
39120fe4a5 Spell scroll improvements, fixing #689, #690, #691.
CArtPlace now uses common CInfoWindow for r-click popup (with or without a custom component), old CMessage::genWindow no longer needed.
2011-03-12 21:55:31 +00:00
DjWarmonger
2fc2fa539d Fixed #706. 2011-03-08 09:09:57 +00:00
DjWarmonger
d0e9049161 Fixed #704.
Magic Resistance tweak.
2011-03-08 07:53:09 +00:00
DjWarmonger
b9f301b600 Better implementation of creature window, minor fixes.
Check forum for new graphics.
2011-03-06 12:12:22 +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
Ivan Savenko
7908a1a61d Makefiles update - new files 2011-03-04 17:18:45 +00:00
DjWarmonger
dc0eb37da6 New creature window works in general, covering old functionalities and displaying new info. It's far from finished though. 2011-03-03 18:25:48 +00:00
Michał W. Urbańczyk
222bf004b9 Fixed #679 and #681. 2011-03-01 13:54:48 +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
Ivan Savenko
a2f512813f - gcc compile fixes
- fixed locale issue
- Makefiles for StupidAI
- fix for #671 (not tested)
- linux readme update, including #598
2011-02-28 15:14:26 +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
mateuszb
1dd05788c9 * fixed #53 2011-02-26 17:32:56 +00:00
Michał W. Urbańczyk
236345e61d Fixed #674, #675, #676, #677. 2011-02-25 17:57:30 +00:00
DjWarmonger
2f4aabca52 Compile issue fixed - it's temporary solution. 2011-02-24 18:27:44 +00:00
mateuszb
ba7eb6ce49 * bug 492 fixed
* boost::filesystem version set to 2 (should work with all relatively new versions of boost)
2011-02-24 15:05:21 +00:00
Michał W. Urbańczyk
e505328fcd Reverted r1992 for now [boost < 1.46 won't work with it] 2011-02-24 14:01:58 +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
0482195489 * bug 652 fixed 2011-02-24 13:14:52 +00:00
mateuszb
4647d4af2c boost 1.46 compile fixes. 2011-02-24 12:21:48 +00:00
mateuszb
5e0b0e49b2 * bug 392 fixed 2011-02-23 18:21:51 +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
e979802012 * fix for bug 672 2011-02-23 15:51:33 +00:00
mateuszb
a6b4cfdde7 * spell scroll campaign bonus
* minor fix (gratuitous call to giveCampaignBonusToHero)
2011-02-23 11:21:40 +00:00
Michał W. Urbańczyk
cab8f9e11d AI for neutral creatures and battles and player AIs can be different. StupidAI will handle neutrals by default.
Fixes for issues with deserialization and handling Tactics secondary skill.
2011-02-23 03:57:45 +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
mateuszb
1458cf64c2 * fixed bug 298
* fixed INDEPENDENT_MIN bonus value type
* minor changes
2011-02-21 16:53:23 +00:00
mateuszb
43468e16e1 * bug 97 fixed
* better handling of BLOCK_SPELLS_ABOVE_LEVEL bonus
2011-02-21 13:27:31 +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
Ivan Savenko
450ae1772c - Buttons optimization - less memory and CPU usage
- gcc compilation fixes
2011-02-20 09:24:53 +00:00
mateuszb
4e631fc530 * fix for bug 573
* minor changes
2011-02-15 19:54:55 +00:00
Michał W. Urbańczyk
44619757e8 Fixed opening spellbook via hero screen. 2011-02-15 18:40:06 +00:00
Michał W. Urbańczyk
2f9ed138f6 Tactics more or less working (some improvements still needed, as proper updating battle GUI). 2011-02-14 20:31:53 +00:00
Michał W. Urbańczyk
99a7320e99 Fixes for Altar of Sacrifice (got broken after artifact rewrite) 2011-02-14 10:38:33 +00:00
Michał W. Urbańczyk
0c700f97cd A little progress with Eagle Eye and Tactics. 2011-02-13 22:46:04 +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
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
d630d88ac1 * some work towards fix of 537
* 338 seems to be fixed
2011-02-10 14:44:21 +00:00
mateuszb
8b8d06ac64 * fixed bug 257
* minor changes
2011-02-09 15:19:53 +00:00
mateuszb
8a4187df16 * fixed displaying animation of creature starting moving 2011-02-09 13:56:30 +00:00
Michał W. Urbańczyk
9f21e4b46f Minor compile fix, std::copy used that way overwrites original bonuses [but the code won't be needed anyway] 2011-02-09 12:33:58 +00:00
DjWarmonger
125f39275d Compile fix for previous commit. 2011-02-06 17:37:51 +00:00
Ivan Savenko
2ff07fa66a - Next part of animation system:
-- Reduced memory usage for images with margins
-- Implemented RLE compression
- Linux-related changes:
-- build system updated to include changed paths
-- new dependency: boost-program-options
-- configure option --disable-debug will produce optimized build

- Several gcc compile fixes
- Optimized CPU usage on town screens
- Removed several includes from headers
- Possible fix for #496
2011-02-06 17:26:27 +00:00
Michał W. Urbańczyk
31fc8f6db3 Merged Warmonger's changes from trunk 2011-02-06 08:32:05 +00:00
Michał W. Urbańczyk
a3ba75b0b7 Various fixes, mainly around garrisons. 2011-02-05 13:39:10 +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
15011e611d Merged Ivan's changes from trunk (r1921) 2011-01-28 02:33:26 +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
092ab5a77f Fix for #662. 2011-01-24 00:09:08 +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
591ba76f69 Fixed initialization of recruited stacks.
Fixed displaying garrison slots in CCastleInterface.
2011-01-21 10:37:19 +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
Ivan Savenko
551d1f1b26 - Possible support for sounds in GOG version
- Fixed all issues with Russian localisation
- (Linux) fixed #637
2011-01-17 16:07:08 +00:00
Michał W. Urbańczyk
28550c85fd Merged Ivan's changes in trunk ( r1918 ) 2011-01-15 20:07:16 +00:00
Michał W. Urbańczyk
502bb5392e The last set of fixes for non-combined artifacts operations. 2011-01-15 17:58:08 +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
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
57580b87e1 * minor fix for battle interface 2011-01-14 18:08:01 +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
c9189119b9 Little more work on artifacts. 2010-12-29 21:04:22 +00:00
mateuszb
8104a43809 * a voodoo fix of a mysterious bug 2010-12-27 10:48:28 +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
Michał W. Urbańczyk
2cf6729eee Towards duel support. 2010-12-25 01:43:40 +00:00
mateuszb
6383c9a013 * more extensive usage of CStack pointers instead of stack IDs 2010-12-24 21:44:48 +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
Michał W. Urbańczyk
2fe8b07f4f Little more development for duel mode. 2010-12-23 00:33:48 +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
b15ac97c62 Half done refactoring of CHeroWindow. 2010-12-16 22:32:53 +00:00
Michał W. Urbańczyk
e301256f92 Adjusted player interface to new set of stack operations.
Const transitive ptr.
2010-12-14 21:55:23 +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
e677cd5b07 Merged r1880. 2010-12-11 20:30:33 +00:00
Michał W. Urbańczyk
69b97e0a51 Little more changes. 2010-12-09 23:10:28 +00:00
mateuszb
ad48681d91 * cleanup 2010-12-08 20:17:05 +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
6f56b5bb30 * a few more consts 2010-12-04 19:44:23 +00:00
mateuszb
efedb1a55a * minor cleanup 2010-12-04 19:15:20 +00:00
DjWarmonger
ea03273c8e Some work towards useful AI:
-It is possible to toggle adventure AI on / off typing "ai" in the console (default is true)
-General cleaning and formatting of code
-Some minor optimizations
-Teal console log for AI

AI tends to hang in the maze of mutexes and current player interface, further investigation is needed.

Fixed #580
minor tweaks
2010-11-28 16:39:13 +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
cdf7b2b4d9 Bonuses now use pointers.
Things are very broken.
2010-11-18 22:06:56 +00:00
Michał W. Urbańczyk
4d657eaf47 Merges from trunk. Minor changes. 2010-11-18 18:07:57 +00:00
Ivan Savenko
73a4c2e446 - missed Hill Fort fixes
- compile fix
2010-11-18 13:34:21 +00:00
Ivan Savenko
265d7a22d6 Animation system update:
-- files moved to /client, GUI classes added
-- handling of creatures, used in creature cards, fixed #469 \ #490
-- handling of town buildings
#631 crash at hill fort fixed
2010-11-15 15:15:00 +00:00
DjWarmonger
310a36c8d1 Fixed 313 & 314 :) 2010-11-15 12:51:53 +00:00
DjWarmonger
56cd172b82 Fixed #296
Partial fix for #314
2010-11-15 07:15:10 +00:00
Michał W. Urbańczyk
9028684697 Disemboweling the system.
Things are broken now.
2010-11-13 20:26:15 +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
Ivan Savenko
9771dd12ff - changes in LodHandler:
-- file type (text, image...) can be specified in getFile(), all hacks removed
-- replaced Nodrze with std::set
-  some gcc warnings fixed
2010-11-09 11:27:58 +00:00
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