1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Commit Graph

445 Commits

Author SHA1 Message Date
mateuszb
4c0936a3dc * further code reorganization 2009-05-20 09:02:50 +00:00
Michał W. Urbańczyk
7fbd4e696c * Fixed crashbug on iterating stack effects
* Altered probabilities of starting with 1/2/3 stacks (according to Zamolxis tests)
* fix compilation min/max (windef.h is somehow included and it has its own macros min/max)
2009-05-17 22:52:22 +00:00
Frank Zago
0f6bb0d8b0 Use mapped memory for LOD files. Fixed a few bugs. 2009-05-17 20:31:57 +00:00
mateuszb
cc78c2d350 * more of the new stack bonus system 2009-05-15 12:07:55 +00:00
mateuszb
f07c80ce44 * more of the new stack bonus system 2009-05-14 17:26:55 +00:00
Frank Zago
1f337764bd Support for combat spell sounds. 2009-05-14 04:49:04 +00:00
Frank Zago
bbf4394ecc Removed unused variable. 2009-05-14 03:28:55 +00:00
Frank Zago
e7d4635da8 Use the creatures parameter. 2009-05-14 03:13:54 +00:00
mateuszb
a93796e9d8 * a few changes to new stack bonus system 2009-05-13 20:40:23 +00:00
Frank Zago
788343dd1d Typo: cast is an irregular verb. 2009-05-12 03:35:51 +00:00
Frank Zago
a8ebc0fb5b Fix include path. 2009-05-11 04:57:58 +00:00
Frank Zago
4dd4912b81 Unused file. 2009-05-11 00:59:10 +00:00
mateuszb
8a32855900 * further changes in stack's bonus code 2009-05-10 15:09:42 +00:00
Michał W. Urbańczyk
90fd75e66c * Removed trailing newline from settings.txt (caused warning)
* Sprite/Bitmap handlers moved to VCMI_Lib
* Moved volume sliders 1px down for better look
2009-05-09 16:18:27 +00:00
mateuszb
ae2909667d * redesign of stack's abilities and bonuses - not 100% working, but close ;] 2009-05-08 16:55:04 +00:00
mateuszb
b5ae7d5cbe * refactorings and comment coverage improvements 2009-05-07 17:20:41 +00:00
Frank Zago
a594beea92 Added volume support. 2009-05-06 03:13:46 +00:00
Frank Zago
11779956b1 Fix spelling: pickup_sounds -> pickupSounds 2009-05-06 02:39:03 +00:00
Frank Zago
2bb0eab5f9 Split CMusicHandler into CMusicHandler, CSoundHandler and CAudioHandler. Audio handler is now audioh instead of mush. 2009-05-06 02:32:36 +00:00
Michał W. Urbańczyk
ab1a759458 * reduntant quotation marks from artifact descriptions are removed
* fixed map scrolling with ctrl+arrows when some windows are opened
2009-05-03 23:15:18 +00:00
mateuszb
51821ad5c4 * missing change for previous commit 2009-05-03 16:15:22 +00:00
mateuszb
047590427f * support for new hero bonuses (BLOCK_MORALE, SECONDARY_SKILL_PREMY (archery), AIR_SPELL_DMG_PREMY, EARTH_SPELL_DMG_PREMY, FIRE_SPELL_DMG_PREMY, WATER_SPELL_DMG_PREMY, BLOCK_SPELLS_ABOVE_LEVEL, SPELL_IMMUNITY, BLOCK_MORALE, FIRE_SPELLS, AIR_SPELLS, WATER_SPELLS, EARTH_SPELLS, SPELL, SPELLS_OF_LEVEL). It means that following artifacts are now supported:
- Orb of the Firmament
- Orb of Silt
- Orb of Tempestuous Fire
- Orb of Driving Rain
- Bow of Elven Cherrywood
- Bowstring of the Unicorn's Mane
- Angel Feather Arrows
- Tome of Fire Magic
- Tome of Air Magic
- Tome of Water Magic
- Tome of Earth Magic
- Recanter's Cloak
- Orb of Inhibition
- Pendant of Dispassion
- Pendant of Second Sight
- Pendant of Holiness
- Pendant of Life
- Pendant of Death
- Pendant of Free Will
- Pendant of Negativity
- Pendant of Total Recall
- Spellbinder's Hat
- Spirit of Oppression
- Sphere of Permanence
I hope I listed them all here :). Please try them and report if something's wrong.
2009-05-03 16:14:16 +00:00
Michał W. Urbańczyk
1661da2fcb * fixed selecting new path
* always restoring default cursor when movng mouse out of the terrain
* fixed herolist scrolling
* fixed picking guarded resources
2009-05-01 22:08:03 +00:00
Michał W. Urbańczyk
8c6c0df45e Sound patch from Ubuntux #11: Add music infrastruture + some musics in various places
[With mine minor fixes and updated MSVC project]
vcmi_music.diff
2009-04-30 23:25:17 +00:00
Michał W. Urbańczyk
df25dd7efb Sound patches from Ubuntux #7 - #10:
* Some sound code cleanups
* Renamed soundBase::soundNames into soundBase::soundID
* Add a music handler destructor
* Add Archdevil and vampire pre and post movement sounds

I've applied minor change to fix CMusicHandler - GeniusAI conflict: moved sounds bimap to the .cpp file.

(vcmi_sounds_cleanup.diff
vcmi_sounds_cleanup2.diff
vcmi_sounds_cleanup3.diff
vcmi_add_sounds.diff)
2009-04-30 10:53:06 +00:00
Michał W. Urbańczyk
6ccd9c2701 Sound patch from Ubuntux #6 - adds sound to units during combats
(vcmi_sound_battle.diff)
2009-04-25 23:31:39 +00:00
Michał W. Urbańczyk
92671947a0 Sound patch from Ubuntux #5 - fixes a bug in stopSound where all channels would be stopped if -1 is given in parameter.
(vcmi_sound_stop_one_channel.diff)
2009-04-25 22:51:16 +00:00
Michał W. Urbańczyk
275ec5f640 Added sounds to several objects, minor improvements. 2009-04-23 21:09:10 +00:00
Michał W. Urbańczyk
992ce92ae5 Sound patch from Ubuntux #4 - sounds for hero movement
(vcmi_sound_hero_moving.diff)
2009-04-23 19:50:27 +00:00
Michał W. Urbańczyk
a81378617f Little more events
[Still need more work]
2009-04-23 15:48:53 +00:00
Michał W. Urbańczyk
ff131a3b2f Sound patch from Ubuntux #3
(vcmi_sounds_sets.diff)
2009-04-22 18:50:22 +00:00
Michał W. Urbańczyk
ade4b46edd Sound patch from Ubuntux #2
(vcmi_sounds.diff)
2009-04-22 18:48:56 +00:00
Michał W. Urbańczyk
d625066449 Sound patch from Ubuntux #1 2009-04-22 18:28:01 +00:00
mateuszb
d14083272d * new spells
- protection from air
- protection from fire
- protection from water
- protection from earth
* a bit of refactoring in spell handling code
2009-04-22 10:03:13 +00:00
Michał W. Urbańczyk
c8b6858716 * mostly done Events objects handling
* some moving hero code improvements
* fixed Blacksmith
* minor changes
2009-04-20 22:57:07 +00:00
mateuszb
7319e5cb0e * canceling of casting a spell by pressing Escape or R-click (R-click on a creatures does not cancel a spell)
* new spells:
- frost ring
- fireball
- inferno
- meteor shower
- death ripple
- destroy undead
* spellbook button is inactive when hero cannot cast any spell
* obstacles will be placed more properly when resolution is different than 800x600
* minor changes
2009-04-16 14:01:27 +00:00
mateuszb
cc631b1362 * next ubuntux's patch
* normalized line endings (CR+LF)
* translated comments in CMessage.cpp
2009-04-16 11:14:13 +00:00
Michał W. Urbańczyk
d80afb1902 * server sends confirmation (given later to player interface) after applying request (will be needed for AI)
* created new package for injuring multiple units - needed for area spells (not tested)
* proper screen updating on garrison change
* spell effects will be removed when they time out
* Corpse (Skeleton) will be accessible from all directions
* new objects supported:
- Corpse
- Lean To
- Wagon
- Warrior's Tomb

* several minor improvements
2009-04-16 00:28:54 +00:00
mateuszb
f9ae91d88c * further changes towards support for ranged spells
* added info about author & license in files
2009-04-15 14:03:31 +00:00
Michał W. Urbańczyk
38b680ed30 * Patch from Ubuntux: fix to avoid resources becoming negative [on handling timed events]
* improvements for Garrison Window
* some changes towards Events support
* minor fixes
2009-04-14 23:29:26 +00:00
mateuszb
ece364f735 * partial implementation of SRSL parser (although it's enough for almost all Heroes III spells)
* config/spell_info.txt is now less unholy (its size is no more 666 bytes) :)
2009-04-14 14:48:57 +00:00
mateuszb
4d3808cfa0 * applied ubuntux's patches
* fixed AmptyAI (it builds now)
2009-04-13 18:52:20 +00:00
Michał W. Urbańczyk
de71191307 * Neutral creatures can join or escape depending on hero strength / army (partially done)
* Diplomacy secondary skill support
2009-04-12 01:48:50 +00:00
Michał W. Urbańczyk
f9aebcc4bd * Started making support for garrison window. Leaving guardians in flagged mines. 2009-04-12 00:58:41 +00:00
Michał W. Urbańczyk
d72d988a9c * fixed crash on closing application
* unified yes/no and selection dialog interface calls
* VCMI won't anymore be always giving all three stacks in the starting armies
* fix for drawing starting army creatures count
* support for School of Magic
* support for School of War
* support for Pillar of Fire
* minor changes
2009-04-11 01:32:50 +00:00
Michał W. Urbańczyk
e3222fd34f * fixed mana limit info in the hero window
* added support for Scholar object
* possibly fixed problems with handling obstacles info
2009-04-08 19:55:50 +00:00
Michał W. Urbańczyk
1983aee1b2 * resting in town with mage guild will replenih all the mana points
* battle will end when one side has only war machines
* fixed crasbug occurring on revisiting objects (by pressing space)
* started writing support for artifacts
2009-04-03 22:34:31 +00:00
Michał W. Urbańczyk
2710017049 * First Aid Tent won't get move
* presumably fixed crash occurring sometimes on battle end
* fixed problems when attacking with two-hex creature another two-hex creature, when tile before our destination was blocked
* minor changes
2009-03-31 20:47:53 +00:00
Michał W. Urbańczyk
cb31f5ada3 * Ammo Cart won't get move
* fixed crashes on equipping artifacts
* fixed Wisdom handling
2009-03-29 12:02:37 +00:00
Michał W. Urbańczyk
42773e67f2 * amounts of units taking actions / being an object of actions won't be shown until action ends
* provisional support for "Save" button in System Options Window
* forbidden buildings will be shown as forbidden, even if there are no res / other conditions are not fulfilled
* improved damage calculation formula
* several minor improvements
2009-03-28 00:38:48 +00:00
Michał W. Urbańczyk
cebd5db8b2 * it's possible to revisit object under hero by pressing Space
* splitting window allows to rebalance two stack with the same creatures
* slightly improved sliders
* minor improvements
2009-03-26 23:05:40 +00:00
Michał W. Urbańczyk
1915811a2e Patch from keen: compatibility fixes for Mac OS X 2009-03-24 21:28:17 +00:00
Michał W. Urbańczyk
516b1e2b00 REMOVED FILES: CPatgFinder.h/cpp
Updated project files for MSVC and automake (I hope I didn't break it)
* Refactored pathfinding and integrated into CGameState. 
* Fixed issues with wrong calculating movement cost at server side
* Hero infowindow won't be redrawed each time experience changes
* Removed memory leaks with CPaths-s
* Support for Sign objects
* Bumped savegame formt version to ensure old not compatible saves won't be readed
* Spellscrolls will disappear on visit (won't be treated as spellbooks anymore)
2009-03-19 14:17:19 +00:00
Michał W. Urbańczyk
24c2ce6a99 Improved tooltips. 2009-03-14 17:19:53 +00:00
Michał W. Urbańczyk
6ce9a253a4 * support for Redwood Observatory
* support for Shrine of Magic Incantation / Gesture / Thought
* minor improvements
2009-03-14 11:25:25 +00:00
mateuszb
a08aaba29d * probably fixed problem with displaying corpses on battlefield
* fixed buy troops window
* workaround for a problem with GeniusAI
* some magic numbers are removed
2009-03-12 18:06:02 +00:00
Michał W. Urbańczyk
d6283fd1ca * fixed crash when there was no sabegames in Games/ subfolder
* fixed crash when loading map with a mine belonging to human player
* fixed crash on moving hero into town garrison
* fixed r-click infowindow for towns
* new sight radious calculation. Works as OH3 for heroes, towns and probably all objects. (to be tested)
2009-03-11 23:25:59 +00:00
Michał W. Urbańczyk
d5da904c1f Really removed ability handler. 2009-03-07 17:10:48 +00:00
Michał W. Urbańczyk
e9ebc7de5b wrong1 2009-03-06 22:25:19 +00:00
mateuszb
f835ea9033 * fixed #9 and #12 from 0.7b bug thread
* more logging around #19 from that thread
* glowing effect of yellow border around creatures
* blue glowing border around hovered creature
* making animation on battlefield more smooth
* standing stacks have more static animation
2009-02-21 15:43:28 +00:00
Michał W. Urbańczyk
fd66234a39 * Witch HutL After the first visit to the hut, right-click/hover on that hut mention the skill available.
* refactorings
2009-02-20 12:39:27 +00:00
Michał W. Urbańczyk
6a3bfbee46 * added "Next hero" button functionality
* minor improvement for prison (hero appears at proper tile)
* only one spell can be casted per turn
* minor changes
2009-02-20 10:36:15 +00:00
Michał W. Urbańczyk
c1109452d6 * blocked opening sepllbook if hero doesn't have a one
* removing one-battle bonuses after battle
* windmill gives 500 gold only during first week ever
2009-02-15 19:49:23 +00:00
Michał W. Urbańczyk
adf5c052f9 * support for prison
* updated changelog
2009-02-14 19:12:40 +00:00
Michał W. Urbańczyk
99aef852be * probably fixed Bind effect
* reverted unwanted part of r730
* project files will now have relative paths to libs/includes
* more checkings on startup
2009-02-14 15:00:29 +00:00
Michał W. Urbańczyk
b2924064ee * new movement cost calculation.
* fixed crashes on loading maps with flag all mines/dwelling victory condition
* minor changes
2009-02-12 14:44:58 +00:00
Michał W. Urbańczyk
c83404a375 * fixed crash when there was no hero available to hire for some player
* pregmae wont crash if user gives wrong resolution number
* fixed 1024x600 screen resolution
* selection dialog (eg. for treasure chests) can be closed with enter key
* orientation of hero can't be change if movement points are exhausted
* numerous improvements for Tavern window (hover tips for buttons, button will be inactive if player has 8 heroes or there is a visiting hero in the town garrison)
* campfire, borderguard, bordergate, questguard will be accessible from the top
* spells not known by hero can't be casted
* restored checking mana points before casting spell
2009-02-09 16:18:48 +00:00
mateuszb
445653c880 * most of the obstacles (but needs some polishing)
* more appropriate animation of hero casting spell
2009-02-09 14:50:32 +00:00
Michał W. Urbańczyk
fb4ee65d0e * changed map reading routine in pregame, minor changes for events 2009-02-08 06:42:15 +00:00
mateuszb
02309c5bb8 * fixed positions of stack queue and battle result window when resolution is != 800x600
* attack is now possible when hex under cursor is not displayed
* first part of obstacles support
2009-02-07 16:07:29 +00:00
Michał W. Urbańczyk
131c220685 * fixed r-click on tavern hero crash
* fixed removing one-week bonuses
* added keybindings for components in selection window (eg. for treasure chest dialog)
* HANDLE_EXCEPTIONC macro will rethrow exception after logging
2009-02-07 13:28:23 +00:00
mateuszb
811e6c0945 * hopefully resolved bugs 19 and 20 reported by Zamolxis 2009-02-06 15:56:03 +00:00
mateuszb
ba9b58d3a4 * moved graphics from CAbilityHandler to Graphics
* reading BALLIST.TXT
* minor changes
2009-02-06 14:15:45 +00:00
Michał W. Urbańczyk
05b3e3215c * magic well support
* improvements in the recruitment window
* improvements for pregame  
[cf http://vcmi.antypika.aplus.pl/forum/viewtopic.php?t=97 issues 12-15 and 21 - 22]
* minor changes
2009-02-06 11:15:39 +00:00
Michał W. Urbańczyk
e1d6ff54d7 * morale/luck support in battles
* minor improvements/fixes
* updated changelog
More objects supported:
 *	Faerie Ring
 *	Swan Pond
 *	Idol of Fortune
 *	Fountain of Fortune
 *	Rally Flag
 *	Oasis
 *	Temple
 *	Watering Hole
 *	Fountain of Youth
2009-02-05 09:49:45 +00:00
Michał W. Urbańczyk
218a3beaf6 * further changes towards luck/morale support
* partial support for Idol of Fortune, Fountain of Fortune, Faerie Ring, Swan Pond
2009-02-04 13:40:54 +00:00
Michał W. Urbańczyk
680993459a * started making morale/luck system
* basic calculation of hero/stack morale
* displaying morale in hero window
* redone checking if attack is possible (should fix some problems with attacking with 2-hex creatures, at least on server side)
* std::list serialization
* version set to 0.7b
2009-02-03 05:28:05 +00:00
mateuszb
124e768a99 * added missing movement arrows (advmap interface)
* corrected centering on hero's position
* merged terrainRect and terrainRectSmooth
2009-02-02 13:05:19 +00:00
Michał W. Urbańczyk
3d29c31deb * further fight with hanged scroll tab
* fixed r-click on FoW crash
* fixed crash on opening tavern window after load
* fixed recruiting new heroes after load
* fixed crash on loading map with spell scrolls
* fixed more crashes
* displpaying difficulty level of saved game
* added support for Library of Enlightenment
* added notification when saving is done
2009-02-01 14:11:41 +00:00
Vadim Glazunov
8523fcbb43 Small GCC fixes. Autoconf/automake project files updated 2009-01-30 18:36:00 +00:00
mateuszb
5c51992294 * more developed battle console (spell destination select info, shoot info, move/fly info)
* removed crash when siege weapon is attacked
* corrected animation of defender's two-hex creature reverse
2009-01-29 18:07:31 +00:00
mateuszb
7405549733 * battle console displays notifications about wait/defend commands 2009-01-25 16:40:50 +00:00
Michał W. Urbańczyk
b895fa35cb * saving and resuming games should work!
(loading from the main menu, saving using "save [NAME]" command)
2009-01-12 20:05:56 +00:00
Michał W. Urbańczyk
3474fdaf05 * save/load partially working
* Arena and Witch Hut support
* improved support for Resources
* minor fixes and changes
2009-01-10 22:08:18 +00:00
Michał W. Urbańczyk
847a4f222c Further serialization code and refactorings. 2009-01-06 18:42:20 +00:00
Michał W. Urbańczyk
f853074d20 Minor changes (serialization and related) 2008-12-31 09:33:46 +00:00
Michał W. Urbańczyk
4a8ae4ed9a * restored objects functionalities (hopefully working)
* new file in vcmi lib: IGameCallback.cpp
2008-12-27 01:01:59 +00:00
Łukasz Wychrystenko
b54a3bfb7c unified guardians names 2008-12-26 01:46:53 +00:00
Łukasz Wychrystenko
b356524aee corrected that missclick! hope so 2008-12-26 01:15:47 +00:00
mateuszb
b114582857 * corrected indentation
* centered battle interface
* battle cursor while 1024x768 is now correct
* new version of settings.txt from Tow
2008-12-23 13:59:03 +00:00
Michał W. Urbańczyk
ae48e73fe7 * fixed reading .defs
* new system for handling objects and their behaviors, most functionalities don't work now but will be restored soon
* more serialization code, savegame/loadgame bit closer :)
CHANGES IN PROJECT FILES:
* removed CLua.h and CLua.cpp (server)
* removed CScriptCallback.h and CScriptCallback.cpp (server)
* added IGameCallback.h header (lib)
2008-12-22 17:48:41 +00:00
Łukasz Wychrystenko
633b0007ba some warning & code cleanup - nothing significant 2008-12-21 19:17:35 +00:00
mateuszb
99691b0f11 * fixed compilation error
* added frenzy spell
* repaired order in stack queue in case a unit has waited (it should work correctly now)
* added spell positiveness info, positive spells cannot be cast on hostile stacks and vice versa
2008-12-20 17:08:51 +00:00
Michał W. Urbańczyk
7387d2905e * improved support for bigger resolutions (border around castle interface)
* shots proper initialization
2008-12-07 22:38:04 +00:00
Michał W. Urbańczyk
c6bcd61aba * animation of water tiles
* minor changes
2008-11-30 00:15:38 +00:00
Michał W. Urbańczyk
c4bcf7b880 * better support for non-800x600 resolutions
* Merged CPreGameTextHandler into CGeneralTextHandler and moved to VCMI_Lib.dll (update your project files)
* Genius AI will be used as a default AI
* more code for save/load
2008-11-28 01:36:34 +00:00
Michał W. Urbańczyk
f6807a2af9 * loading AI dll for neutrals
* hopefully fixed reported by Zamolxis garrison bugs
* fixed calculating hero level
* fixed gicing starting exp for heroes
2008-11-15 00:55:19 +00:00
mateuszb
73cd282bbe * fixed problem with levelling above 15 lvl (Zamolxis #2 bug)
* probably fixed reported problems with battles (Zamolxis #3 - #7) - needs further testing
2008-11-14 18:18:13 +00:00
mateuszb
0cc5571604 * new spell: implosion
* optimizations in def handling
* small refactoring
2008-11-12 18:59:33 +00:00
Michał W. Urbańczyk
89d8bdc069 * Adventure Map interface elements configurable (new screen resolutions possible!)
* Data and Sprites subfolders will can be used for adding files not present in .lod archives
* version set to 0.65
2008-11-12 18:26:23 +00:00
mateuszb
d2db5ba18e * added slow spell
* a few mistakes in AC_desc.txt fixed
* appropriate spells cannot be casted at any tile
* small memory optimizations in CDefHandler
* minor fixes
2008-11-11 15:17:58 +00:00
Michał W. Urbańczyk
a1606b2fb3 * partial support for Haste spell
* started making external settings file (will be used for support for non 800x600 screen resolutions)
* minor changes
2008-11-08 22:29:19 +00:00
Michał W. Urbańczyk
248b5e8677 * added shots limit
* improved hero hiring
* tree of knowledge will give right number of exp points
* fixed bug with double showing "getting hit" animation
* more logs in initialization of creature handler
* added 'vcmiglorfindel' cheat (works as woggandalfwhite)
* minor improvements
2008-10-31 22:41:22 +00:00
Michał W. Urbańczyk
3a66dc2b7c * added heroes pool for heroes available for hiring
* better handling disposed/predefined heroes
* blocked scrolling adventure map with mouse when left ctrl is pressed
* scholar will be accessible from the top
* partially done tavern and hero recruitment
* fixed bug with formation button in hero window
* unified hero initialization code
* minor changes

For 0.63c dev release
2008-10-26 20:58:34 +00:00
Michał W. Urbańczyk
9d099e8c54 * blocked map scrolling where dialog window is opened
* it's possible in battles to check remeaining HP of neutral stacks
* function in CGameInterface called when spell is casted. Support for the Magic Arrow from engine side.
* heroes can regain mana
* support for mistycisim and intelligence skills
* fixed leak with creating frameratekeeper every turn
* minor improvements
2008-10-18 11:41:24 +00:00
mateuszb
7104326563 * water elemental will really be treated as 2 hex creature
* potential infinite loop in reverseCreature removed
* proper handling of battle cursor
2008-10-05 12:34:14 +00:00
mateuszb
b08b29d0d8 * sprites from /Sprites folder are handled correctly now
* fixed pathfinder and path arrows
* clicking on a tile in advmap view when a path is shown will not only hide it but also calculate a new one
2008-10-03 15:15:23 +00:00
mateuszb
538ffb1579 * added support for archery, offence and armorer secondary abilities
* hero's primary skills account for damage dealt by creatures in battle
* magical hero are given spellbook at the beginning
* added initial secondary skills for heroes
* minor fixes and improvements
2008-09-29 11:03:30 +00:00
mateuszb
ceaa51d07d * fixed bug with levelling up
* fixed pictures of secondary skills in hero window (in left - click popups)
* added handling of navigation, logistics, pathfinding, scouting end estates secondary skills
2008-09-28 13:29:37 +00:00
mateuszb
a4afdc7145 * minimap shows all flaggable objects (towns, mines, etc.)
* minor optimizations
2008-09-26 14:16:01 +00:00
mateuszb
8bde616908 * mostly done battle options (although they're not saved)
* general improvements in rendering of battle interface
2008-09-24 16:25:14 +00:00
Vadim Glazunov
c00d0e4aca gcc fix 2008-09-23 17:14:46 +00:00
Michał W. Urbańczyk
41acf5528c * spells in the guild visible again
* garrisons on adv. map again available from all directions
* working Subterranean Gates, Monoliths
* minor code reorganizations
2008-09-23 10:58:54 +00:00
mateuszb
ca1dbfe949 changed most of std::cout to tlogX
Alt+F4 quits the game
2008-09-19 12:09:15 +00:00
mateuszb
f97628e67f a few minor fixes 2008-09-19 11:19:14 +00:00
Michał W. Urbańczyk
856698bd80 * fixes for MSVC (it needs to have global variables from library explicitly exported)
* renamed logging variables to tlogX ('_' in var names looks ugly)
* cleaned it improved setting formations
* fixed crashbug on maps with random hero
2008-09-19 08:16:19 +00:00
Vadim Glazunov
a1dd7f22f9 gcc fixes(bad idea to call global vars such as log2, this name used by math function). Colored log support on some non-win32 platforms. Small Automake project update 2008-09-18 20:24:53 +00:00
mateuszb
5ee37eeb3d * fixed bug with disappearing head of a hero in adventure map
* some objects are no longer accessible from the top
* minor fixes
2008-09-18 14:18:08 +00:00
Michał W. Urbańczyk
70673674dc * setting army formation
* minor changes
2008-09-18 13:54:54 +00:00
Michał W. Urbańczyk
629d934810 * moved CConsoleHandler to lib (update project files)
* using winapi for better console handling with MSVC (I hope I didn't break anything at GCC)
* new logging system (use log0 - log5 for different priorities and colors (at msvc))
* using lists for storing activated interface objects
* more proper closing of server
2008-09-17 10:18:22 +00:00
Michał W. Urbańczyk
dc7d324045 * fixed attacking with shooting stack in a close-combat
* max/buy buttons in recruitment window are not active when there are no available creatures to buy
* reading no-retalation and twice-attack abilities
* boars are treated as two-hex
* dead stack won't retaliate
* support for double attack (not tested)
* one more typo fixed in battle backgrounds list
2008-09-14 07:11:07 +00:00
mateuszb
ae6e260107 * third part of spellBook
* probably finished counterattacking
2008-09-12 13:06:53 +00:00
Michał W. Urbańczyk
e71b40ccc5 * counterattacks
* spells learning
* no tooltips for objects under FoW
* working resource silo
* new system for simple unit abilities/states
* neutral monster army disappears when defeated
* synchronization between client and server processes
* fixed battle ending
2008-09-12 08:51:46 +00:00
Michał W. Urbańczyk
01105ddc41 * fixed move hero button
* creatures placeholders work properly
* abandoned mine won't show message with mithril
* it's possible to build glyph of fear in fortress
* emissaries won't be used in random creature drawing (they have no correct def)
* fixed problem with moving two-hex creatures one tile back
2008-09-01 00:25:36 +00:00
Michał W. Urbańczyk
bca18a31c3 * fixed crashes when town is placed out of the map boundaries
* for screen is updated after buying creatures
* fixed crashbug on maps with random monster
* proper images of war machines are displayed in blacksmith
* picking starting hero should work again
* Ice Elemental will be treated as two-hex creature
* minor fixes
2008-08-29 21:41:32 +00:00
Michał W. Urbańczyk
e856ad21a9 * fixed crashbug on loading maps with events giving creatures
* added confirmation window when hero is dismissed
* finished mage guild screen
* fixed some crashbugs with hero window on adventure interface
* fixed giving wrong war machines on start
* added blacksmith functionality
2008-08-27 10:19:18 +00:00
Michał W. Urbańczyk
ce6a9ae374 * fixed possible freeze when applying changes in gamestate
* it's impossible to enter not owned town
* giving starting bonus
* other improvements
2008-08-25 21:14:00 +00:00
Michał W. Urbańczyk
6613955463 * hero placed in the town starts as visiting hero, not garrisoned
* if hero doesn't have a spell book, he can buy one in a mage guild
* improvements in closing
* fixed crash on picking artifact
* added event message when picking artifact
* fixed problems with disappearing pikemen
* InfoWindow will be properly centered
* hero portraits again visible in PreGame
* fixed problems with handling Pandora's Box
* support for Campfires
* minor changes
2008-08-25 10:25:16 +00:00
Michał W. Urbańczyk
0607ec70cf Support for Tree of knowledge and minor changes. 2008-08-22 12:21:09 +00:00
Michał W. Urbańczyk
1c7e3718a7 * swapping artifacts (needs testing)
* various improvements and fixes for interface
* put changelog into ChangeLog
2008-08-20 19:02:48 +00:00
Michał W. Urbańczyk
22ade5efbe * make compatible with boost 1.36.0 (there was breaking change in boost::function)
* randomizing spells in towns
* fixed reading forbidden structures
* support for heroes starting in town garrisons
* hopefully fixed problems with wrong town defs (village/fort/capitol)
* moved CSpellHandler.* to VCMI_Lib (project files must be updated)
* redone reading spell info
* added missing features to the fort screen
* minor improvements

* partially done mage guild screen
2008-08-20 06:57:53 +00:00
Vadim Glazunov
3d11b2c4e7 Changes to work better on other(non win32) platforms 2008-08-17 19:15:31 +00:00
Michał W. Urbańczyk
b89c951d09 * version set to 0.62
* almost redone treasure chest
* working gaining levels for heroes (including dialog with skill selection)
* corrected another typo i cr_shots
2008-08-13 00:44:31 +00:00
Michał W. Urbańczyk
a78311f63d Reintagrating netcode branch to the trunk. 2008-08-06 12:27:56 +00:00
Michał W. Urbańczyk
c7bb04235c * merged changes in pregame
* portrait initialziaton
* minor
2008-08-05 22:11:32 +00:00
Michał W. Urbańczyk
1acf6e930b * slider position updated after sorting in pregame
* proper initialization of portrait in CGHeroInstance
2008-08-05 21:28:13 +00:00
Michał W. Urbańczyk
a15ffb06e6 * compiles under MSVC (haven't I broken anything on gcc?)
* half-done support for battles
2008-08-04 15:56:36 +00:00
Vadim Glazunov
6e737bbf3c Now netcode branch may be compiled with gcc. Sorry can't check build with MSVC 2008-08-04 09:05:52 +00:00
Michał W. Urbańczyk
cc7be20b07 Merged most of the changes from trunk.
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
2008-08-02 15:08:03 +00:00
mateuszb
e1b4331ee2 * resolved #62 and #66 2008-08-02 10:26:56 +00:00
Michał W. Urbańczyk
e5a064f36b Improved threa-safety, almost finished building structures in towns. 2008-08-01 11:21:15 +00:00
Michał W. Urbańczyk
5c5c80933b Made CreatureSet serializable and using creature id. Stack moving, swapping, merging, splitting. 2008-07-31 13:21:42 +00:00
Michał W. Urbańczyk
b4f383f196 Slowly recovering object scripts. 2008-07-30 17:51:19 +00:00
Michał W. Urbańczyk
08b6796545 Mainly refactoring 2008-07-29 09:53:27 +00:00
Michał W. Urbańczyk
3247a9a4dd Rewrote hero moving code. Seems to be working. 2008-07-28 12:44:08 +00:00
Vadim Glazunov
8209e7d090 Added new files from previous commit 2008-07-20 10:36:52 +00:00
Vadim Glazunov
8b53778417 Very little changes to compile under linux and other unix-like OS. Added autoconf/automake scripts to easy compile on all unix-like OS(try autoconf; automake --add-missing;./configure) 2008-07-20 10:32:36 +00:00
Michał W. Urbańczyk
d371f14ad2 More endianess checking / minor 2008-07-16 22:40:16 +00:00
Michał W. Urbańczyk
6f7b29afcc GCC/AmigaOS compatibility changes by Andrea Palmaté. 2008-07-16 18:26:15 +00:00
mateuszb
4bd39202c2 * first part shooting in battles (units cannot shoot yet)
* minor improvements
2008-07-11 09:43:13 +00:00
Michał W. Urbańczyk
ea8562a6b1 Rest of commit: broken battles, starting hero, town displaying and linker errors.
Further changes for netcode.
2008-06-30 00:06:41 +00:00
Michał W. Urbańczyk
c351496a47 * moved map reading to the map.cpp
* merged changes from trunk (since r461)
2008-06-21 13:27:52 +00:00
Michał W. Urbańczyk
c7dde147c3 More moving / minor changes 2008-06-19 06:08:05 +00:00
Michał W. Urbańczyk
d251597617 Moved objecthandler / minor 2008-06-17 17:48:32 +00:00
Michał W. Urbańczyk
3988767329 * BitmapHandler thread-safe
* multi-threaded loading main graphics
2008-06-16 14:56:48 +00:00
Michał W. Urbańczyk
d5b0bdcf9e A little threading and minor changes. 2008-06-16 10:51:14 +00:00
Michał W. Urbańczyk
300d540663 More changes / project files. 2008-06-14 10:20:18 +00:00
Michał W. Urbańczyk
6ad729148e Continuation of splitting.
(don't try to compile this revision)
2008-06-13 08:16:51 +00:00
Michał W. Urbańczyk
7df624d919 More changes for splitting 2008-06-12 21:08:04 +00:00
Michał W. Urbańczyk
4347996353 Cleanups + started splitting 2008-06-12 06:45:51 +00:00
Michał W. Urbańczyk
dbca25df74 Cleanups/refactoring 2008-06-11 01:53:57 +00:00
Michał W. Urbańczyk
798fd11f65 radical cleanups 2008-06-08 00:58:29 +00:00
Michał W. Urbańczyk
feaa2396a6 Code cleaning/refactoring 2008-06-07 17:16:52 +00:00
Michał W. Urbańczyk
61ce0c915c * "%s substitutions in Right-click information in town hall
* windmill won't give wood
* hover text for heroes
* good background for the town hall screen in Stronghold
* fixed typo in hall.txt
* support for ZSoft-style PCX files in /Data (using SDL_image)
* minor improvements
2008-06-03 18:16:54 +00:00
mateuszb
25ab2e5d8b * animations won't go in the same phase (resolved #55)
* small upgrades
2008-06-03 13:15:34 +00:00
Michał W. Urbańczyk
b53c01ab92 * fixed estate problems (#57)
* fixed blinking mana vortex (#52)
* grail increases creature growths
2008-06-01 13:42:29 +00:00
Michał W. Urbańczyk
7d7abbb68d * no more divison by 0 in slider
* little more code for upgrades 
* version set to 0.6
* "plural" reference names for Conflux creatures (starting armies of Conflux heroes should now be working)
* minor changes
2008-05-31 20:37:54 +00:00
mateuszb
1aa758a737 * partially done attacking in battles
* screen isn't now refreshed while blitting creature info window
* r-click creature info windows in battles
* a few minor things
2008-05-27 13:16:35 +00:00
Michał W. Urbańczyk
b00cc9c628 * more code for creature info window and upgrades (still not finished)
* minor fixes
2008-05-23 19:50:11 +00:00
Michał W. Urbańczyk
5b077531cd * improvements in recruitment window (slider won't allow to select more creatres than we can afford) 2008-05-12 05:46:04 +00:00
Michał W. Urbańczyk
2f2169b71f * improved slider ( #58 )
* fixed problems with horde buildings (won't block original dwellings)
* giving primary skill when hero get level (but there is still no dialog)
* if an upgraded creature is available it'll be shown as the first in a recruitment window
* creature levels not messed in Fortress
* war machines are added to the hero's inventory, not to the garrison
* support for H3-style PCX graphics in Data/ (not tested)
* started doing support for ZSoft PCX graphics in Data/
* VCMI won't crash when is unable to initialize audio system
* fixed displaying wrong town defs
* minor fixes and improvements
2008-05-03 15:30:11 +00:00
mateuszb
62952e3163 a bit of refactoring (removed variable ekran as we have screen which is the same as ekran) 2008-04-25 09:25:59 +00:00
mateuszb
9674343453 * fixed memory leak in battles
* blitting creature animatoins to rects (not tested!)
* a few minor improvements
2008-04-20 15:56:03 +00:00
mateuszb
063d2279ee * nicer movement of creatures on battlefield
* amounts of creatures on battlefield
* partial support for two hex creatures
* a few minor things
2008-04-14 18:24:46 +00:00
Michał W. Urbańczyk
fb5c26437c * correctly calculated growths (including castles and horde structures)
* giving daily income
2008-04-14 17:45:01 +00:00
Michał W. Urbańczyk
ffc93639ab Recruitment should work (todo - growths, counting remaining creatures) 2008-04-11 17:41:02 +00:00
mateuszb
149c6772e2 battle and general upgrades and bugfixes 2008-04-07 17:51:46 +00:00
Michał W. Urbańczyk
36779118b5 Huge commit:
* correctly showing recruitment window (recruitment not ready)
* new slider class
* creature growths handled (horde buildings not yet supported)
* buttons more secure
* info about factions and their creatures
* costs of creatures merged into vector
* info about town structeres state (started)
* new function in CSDL_Ext for drawing borders 
* numerous minor changes
2008-04-04 17:30:53 +00:00
mateuszb
d5a5a04811 progress in battles 2008-03-23 17:25:38 +00:00
Michał W. Urbańczyk
1e61235aa9 Almost finished building of buildings. 2008-03-21 00:03:31 +00:00
mateuszb
db12ede837 added requirements for some towns (to be tested - they're probably good, but seem to don't work) 2008-03-20 14:23:54 +00:00
phoebus118
3a279a7964 Interface added: CMusicHandler::playLodSnd(std::string name).
We can play wav data of Heroes3.snd through CMusicHandler::playLodSnd(std::string name) now, where name can be "BASLDFND.wav" or "BASLKILL.wav".
2008-03-20 09:55:33 +00:00
phoebus118
9c4cb94490 Play Wav from Lod directly. Need a little more work.. 2008-03-20 08:51:53 +00:00
mateuszb
bd7cf60f13 faster and better creature animation handling (almost finished!) 2008-03-18 17:05:00 +00:00
Michał W. Urbańczyk
b3c69fe838 More town hall code, started making building requirements. 2008-03-16 00:09:43 +00:00
mateuszb
d106fdcf2a battle improvements 2008-03-15 17:48:05 +00:00
Michał W. Urbańczyk
eed2a2b54c More code for halls. 2008-03-11 21:36:59 +00:00
Michał W. Urbańczyk
c3249d3fd7 Some code for town hall screen. 2008-03-09 23:06:35 +00:00
mateuszb
0379fbfc1d * [battles] displaying fighting creatures
* faster blitting of animated unit
2008-03-08 15:23:04 +00:00
Michał W. Urbańczyk
23a7b708d8 * right click popups in towns
* drawing window text-bitmap-subtitle
* destructor for CDefEssential
* version changed to 0.5x (or maybe it should be 0.6 ?)
* minor changes
2008-03-06 18:54:35 +00:00
mateuszb
f1e40d5e86 * significant speed-up in def loading
* bugfixes (player's id - player's serial mismatches)
2008-03-06 16:42:34 +00:00
mateuszb
4236c65512 another piece of battles (and CCreatureAnimation) 2008-03-05 17:01:41 +00:00
mateuszb
9b9a9b455f * hero is displayed in battle window
* battle console buttons added
* blit8bppAlphaTo24bpp bad working fixed (to be optimized)
* maybe something else
2008-03-03 19:41:10 +00:00
Michał W. Urbańczyk
88acb2e0c1 * redone building info reading 2008-03-02 18:16:08 +00:00
Michał W. Urbańczyk
6cb9ed9f8b *fixed bugs with hero dismissing 2008-03-02 13:16:11 +00:00
Michał W. Urbańczyk
17d5d298ca * hints for cregens
* moved battle loop to the activeStack
2008-02-29 22:14:53 +00:00
Michał W. Urbańczyk
1e7f8984e2 * new command - "get txt" - VCMI will extract all .txt files from h3bitmap.lod to the Extracted_txts/ folder.
* more detailed logs
* version changed to 0.55
2008-02-25 23:26:50 +00:00
Michał W. Urbańczyk
33fd0d22a6 * reading disposed/predefined heroes (probably works)
* new discoveries in h3m specification

VCMI handles correctly all known maps again :)
2008-02-25 18:35:10 +00:00
Michał W. Urbańczyk
ee2a63f26e * another fix of Pnadora's Box handling 2008-02-25 16:21:19 +00:00
Michał W. Urbańczyk
9819bc86e2 * stuff for battles
* Sprites/ folder works for h3sprite.lod same as Data/ for h3bitmap.lod
* randomization quantity of creatures on the map
* minor changes
2008-02-24 23:06:27 +00:00