1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Commit Graph

823 Commits

Author SHA1 Message Date
Frank Zago
eacbddb7a0 Replaced 4 hardcoded values. 2009-06-14 16:38:24 +00:00
Frank Zago
e5203db83c In config file, for adventure map, replaced tilesWidth, tilesHeight, trimX and trimY with width and height. Let VCMI do the right calculations. 2009-06-14 15:10:59 +00:00
Frank Zago
96a34c30f0 Center active hero on map. Added map grid. Fixed a visual artefact. 2009-06-14 07:02:06 +00:00
Frank Zago
a8f9e4d033 Fix prototype for blitWithRotate1. 2009-06-13 23:25:15 +00:00
Michał W. Urbańczyk
527ec27ef5 * fixed handling second horde building in Rampart/Inferno
* garrisoned hero can buy a spellbook if he is selected or if there is no visiting hero
* minor fixes
2009-06-12 23:34:02 +00:00
Frank Zago
1c2ac579d5 The size of the frame around the map depends on the screen size, so compute it. 2009-06-12 03:26:41 +00:00
Michał W. Urbańczyk
58c12e8d73 Reshaped some code responsible for hero list / paths.
* Garrisoning, then removing hero from garrison move him at the end of the list
* problems with the hero window hero list should be fixed
2009-06-11 17:21:06 +00:00
Michał W. Urbańczyk
e2c30df5a6 * fix for problems after r-clicking hero in tavern
* refactored Options::show
* minor improvements
2009-06-10 20:48:55 +00:00
Michał W. Urbańczyk
29e1f2a0b8 * removed redundant code for displaying map difficulty
* bumped version name to 0.72b
* more diagnostics in music handler (should help to catch the reported bug with not playing main menu theme)
* probably fixed problems with horde buildings in towns that start with upgraded dwellings (0.72#1 http://vcmi.antypika.aplus.pl/forum/viewtopic.php?t=159)
2009-06-10 19:44:09 +00:00
Frank Zago
914da9d6d6 Use mutex.hpp instead of shared_mutex.hpp. 2009-06-10 14:01:27 +00:00
Frank Zago
1113de7a1c In hero window, only display heroes that are not in garrison. 2009-06-10 01:23:17 +00:00
Frank Zago
3398941231 Fix difficulty level displayed (Normal instead of ormal). 2009-06-10 00:34:40 +00:00
Frank Zago
be806d7942 Use right path separator. 2009-06-09 05:02:22 +00:00
Frank Zago
cbf2ed6b7a Protects against concurrent access to in game console texts. 2009-06-09 03:53:29 +00:00
Frank Zago
c75bbc359e CSDL_Ext::alphaTransform does not need to return the modified surface. 2009-06-06 22:47:23 +00:00
Frank Zago
e0c600b963 Don't close the server socket while another thread is using it. 2009-06-06 15:17:07 +00:00
Frank Zago
8bc64d87e9 Force the popup window to be completely oin scs\reen. Fixes bug #2799727. 2009-06-02 03:01:17 +00:00
Frank Zago
b2014c79d4 Try to better dimension the info windows. 2009-06-02 02:15:23 +00:00
Michał W. Urbańczyk
a17936908a * updated changelog
* version set to 0.72
* integrated save format version to the CLoadFile
* fixed problems on entering non-number as resolution number
* minor improvements
2009-06-01 22:31:11 +00:00
Frank Zago
fa7f35bbf4 Do not use hardcoded font sizes in messages. 2009-06-01 05:40:54 +00:00
Frank Zago
627c20c949 Typo. 2009-06-01 03:36:13 +00:00
Frank Zago
d9215d050c Fix typo. 2009-06-01 03:17:54 +00:00
Frank Zago
da0bf61b54 Fixed typo. 2009-06-01 03:04:50 +00:00
Frank Zago
ee385d7654 Fix comment from previous commit. 2009-05-30 17:37:53 +00:00
Frank Zago
e7b2074812 In tavern update the hover text for the RECRUIT button when a hero is selected. 2009-05-30 16:17:44 +00:00
Michał W. Urbańczyk
cff70406f1 * enter can be used to open window with selected hero/town
* fixed slider behavior when showing less maps/games than available slots
* added a few missing sounds for creatures
* fixed problems with artifacts info caused by bug in serialization
* fixed bug in Scholar's serializetion
* all stacks features will be serialized (should fix problems with missing premies from artifacts)
* proper serialization of HeroBonus, fixes some problems/crashes
* resource silos won't give resources on the first day
* fixed problems with removing artifacts when all visiblebackpack slots are full
2009-05-30 16:00:26 +00:00
Frank Zago
5b25b21a15 Hero description in tavern is invariant, so move it into its constructor instead of recreating it for every frame. 2009-05-30 15:58:28 +00:00
Frank Zago
e3bfc51328 Initialize animval. Fixes crash in town. 2009-05-29 13:43:33 +00:00
Frank Zago
566a99932b Enable key repeats. Useful for the map selection screen. 2009-05-29 03:03:19 +00:00
Frank Zago
94b8fa4f9d Added support for Home/End. 2009-05-29 02:39:12 +00:00
Frank Zago
53129ec1a7 Made sortMaps clearer. 2009-05-29 01:54:45 +00:00
Frank Zago
e863269893 Use a temporary vector to keep list of maps to display instead of using sizeFilter. That should fix all the glitches reported. Added support for pgup/pgdown. 2009-05-29 01:50:33 +00:00
Frank Zago
6b87161ae2 Further blit8bppAlphaTo24bpp optimizations (use invariant loop counters, switch RShift cases). 2009-05-28 02:58:29 +00:00
Frank Zago
79cd541bbf Optimized blitWithRotate3. 2009-05-27 23:43:47 +00:00
Frank Zago
af5dfd9dbc Optimized blitWithRotate2. 2009-05-27 23:21:34 +00:00
mateuszb
b8adaaeaf4 * removed misleading const 2009-05-27 08:38:12 +00:00
Frank Zago
b38c279225 Optimized blitWithRotate1. 2009-05-27 04:10:35 +00:00
Frank Zago
5eb067e3fd Revert memory mapped support for LOD files (r881, r886 and r895) because on Windows these files get locked and other applications cannot access them anymore. 2009-05-26 04:52:34 +00:00
Michał W. Urbańczyk
4581c30b20 * VCMI won't try to calculate path when clicking terrain on the other map level then that of currently selected hero (caused hangs)
* Mines / Resource Silos won't give income in the first turn
* Double click on hero slot during stack splitting won't crash
* Fixed problems with updating buttons / minimap
2009-05-24 23:21:55 +00:00
Frank Zago
6635cf4f23 Made a few functions static or static inline. 2009-05-23 22:57:39 +00:00
Frank Zago
24449e0c41 blit8bppAlphaTo24bpp speedup. 2009-05-23 20:13:09 +00:00
Frank Zago
e3c3d3478d Simplify infs2. 2009-05-23 01:23:09 +00:00
mateuszb
564c8ae839 Common changes.
for changes see http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=2576#2576
2009-05-22 19:20:30 +00:00
Frank Zago
8e2a6466e2 Split audioh into soundh and musich. Derive both from a new CAudioBase class. Fixed crash when there is no sound card present. 2009-05-22 04:14:59 +00:00
Michał W. Urbańczyk
1d5565b3a3 * updated project files for MSVC
* fixed a few includes paths
* it's possible to enter Tavern via Brotherhood of Sword
* fixes for statusbar
* fixes for townlist
* fixed crashes on building / clicking some buildings
* bumped version number to 0.71c
* bonuses from wearing more than one same artifact won't cumulate
2009-05-21 23:50:45 +00:00
Frank Zago
73949f3367 Build fixes for linux. 2009-05-21 00:55:30 +00:00
mateuszb
429b226517 * moved a few files 2009-05-20 10:08:56 +00:00
mateuszb
4c0936a3dc * further code reorganization 2009-05-20 09:02:50 +00:00
Frank Zago
2ab691ef40 Linux build fixes. 2009-05-20 03:10:16 +00:00
mateuszb
35f7281024 * battle options window works again
* reorganization of GUI code
2009-05-19 18:23:04 +00:00
Frank Zago
0f6bb0d8b0 Use mapped memory for LOD files. Fixed a few bugs. 2009-05-17 20:31:57 +00:00
Frank Zago
bc506bbc77 Fix 32 bits depth issues during combat. 2009-05-17 03:34:41 +00:00
Frank Zago
788343dd1d Typo: cast is an irregular verb. 2009-05-12 03:35:51 +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
b5ae7d5cbe * refactorings and comment coverage improvements 2009-05-07 17:20:41 +00:00
Frank Zago
8172493467 Updated autoconf generated files. 2009-05-07 04:52:40 +00:00
Frank Zago
81d2a36df6 Autoconf rework. 2009-05-07 04:45:59 +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
mateuszb
bb8e505ccd * refactoring 2009-05-01 14:37:25 +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
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
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
408411d8c3 * next ubuntux's patch 2009-04-19 15:01:33 +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
985b4930e4 Major changes to the GUI. Introduced list of interfaces (listInt) containing pointers to all shown interfaces / windows. Only top layer is active and regularly updated.
Windows should be shown using pushInt and closed with popInt or PopIntTotally (if interface needs to be also deleted).
Some things are not working yet properly, I'll try to fix them ASAP.
2009-04-14 12:47:09 +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
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
mateuszb
47bc007d8c Common changes (ours):
* Improvements for console
* Speed bonus support
* Minor improvements
2009-04-04 19:26:41 +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
fca28fab10 * battle settings will be remembered between battles
* call-ins for serializing client and playerinterfaces (not used really yet)
2009-03-28 18:46:20 +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
mateuszb
2a7ad63495 * massive spells go via one SetStackEffect 2009-03-21 16:03:07 +00:00
Michał W. Urbańczyk
b2c4f3e0fd * fixed crash on saving when some objects havebeen removed
* support for multi-target attacks/spells in the protocol
* version bumped to 0.7d
2009-03-21 12:49:58 +00:00
mateuszb
74be845594 * fixed bug with looping animation supposed to be played once
* minor changes
2009-03-19 19:04:46 +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
Łukasz Wychrystenko
a0057c5014 upd for build system(client and server) 2009-03-15 22:59:32 +00:00
Michał W. Urbańczyk
f33d3894bd Possibly fixed compiling on gcc. 2009-03-15 12:53:58 +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
a7680d3957 Bugfixes and support for timed events. 2009-03-09 19:40:43 +00:00
Michał W. Urbańczyk
4653ca6b29 New file for VCMI_Server - NetPacksServer.cpp
Redone client -> server protocol.
2009-03-09 10:37:49 +00:00
Michał W. Urbańczyk
320e04a121 New files
For VCMI_LIB: lib/RegisterTypes.cpp lib/NetPacksLib.cpp
For VCMI_CLIENT: client/NetPacksClient.cpp
(+ headers)
Removed files
FOR VCMI_CLIENT: hch/CAbilityHandler.cpp and header

Redone sending and applying messages server => client
May be still buggy.
2009-03-07 17:08:40 +00:00
mateuszb
9eb6128b27 * correct handling of flying creatures in battles
* minor changes
2009-03-07 16:05:53 +00:00
Michał W. Urbańczyk
5816028322 new files 2009-03-07 15:55:56 +00:00
Michał W. Urbańczyk
5ebb54ec59 should be fine... 2009-03-07 15:54:12 +00:00
Michał W. Urbańczyk
e9ebc7de5b wrong1 2009-03-06 22:25:19 +00:00
Michał W. Urbańczyk
b1c0d10ece 2009-03-06 22:11:17 +00:00
mateuszb
329eab2f6a * corrected stack death animation 2009-03-05 17:57:26 +00:00
mateuszb
dc73072ba4 * fixed #20 from 0.7b bug thread 2009-02-28 16:44:56 +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
mateuszb
2e47b5ce10 * probably fixed #8 from 0.7b forum
* fixed blockmap for obstacle 10
* better handling of creature animation framesInGroup
* vcmiistari no longer gives creature spell-like abilities
* probably correct calculation of occupiable hexes on battlefield
2009-02-20 13:06:20 +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
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
9dbe9bd277 Reverted r731 2009-02-14 14:37:13 +00:00
mateuszb
96a7e1600b ?!? 2009-02-14 13:51:21 +00:00
Michał W. Urbańczyk
fd07f7f33e Experimental commit...
* spellbook displays only spells known by Hero
* further fixes for leveling-up
2009-02-14 10:11:07 +00:00
Michał W. Urbańczyk
59b2bb4940 * fixed scrolling behind window problem (now it's possible to scroll with CTRL + arrows)
* proper updating resdatabar after building structure in town or buying creatures (non 800x600 res)
* fixed blinking resdatabar in town screen when buying (800x600)
* updating blockmap/visitmap of randomized objects
* blocked "save" command during battle
* cannot select heroes for computer player (pregame)
* fixed mouse slow downs in pregame
2009-02-11 17:03:30 +00:00
mateuszb
489bd1e4f2 * various obstacles fixes
* better support for battle backgrounds
2009-02-10 14:21:51 +00:00
Michał W. Urbańczyk
a113a8d289 * patch update from Dikamilo 2009-02-08 16:36:53 +00:00
Michał W. Urbańczyk
dd36cfce50 Patch from Dikamilo:
* compatibility fixes for MinGW
* Code::Blocks project files
2009-02-08 15:39:26 +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
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
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
Michał W. Urbańczyk
f28c76984c Really fixed the evil bug. 2009-01-30 22:23:13 +00:00
Michał W. Urbańczyk
8868105fac * fixed the evil, strange bug [http://vcmi.antypika.aplus.pl/forum/viewtopic.php?t=93]
* fixed invisible hero problem reported by Steven Aus
* version bumped to 0.69
2009-01-30 21:28:02 +00:00
Vadim Glazunov
8523fcbb43 Small GCC fixes. Autoconf/automake project files updated 2009-01-30 18:36:00 +00:00
Michał W. Urbańczyk
302b5d9427 * fixed crashbug on savegame choice when no savegames were available
* removed unneeded files
* bumped up version (0.68a)
* added authors list
2009-01-24 22:17:49 +00:00
mateuszb
9ef5519f89 * fixed bug with displaying mass spells
* fixed defender projectile animation
* you don't have to select location for spells which don't need them
* fixed calculating stack speed when it's under slow spell effect
* changed some 17's into BFIELD_WIDTH
2009-01-16 17:58:41 +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
mateuszb
22efd5df29 * experimental smooth hero move support (minor graphical glitches exist but I hope they'll be removed soon; I hope there are no more problems with it, but please test)
* small graphical glitch fixed
2009-01-09 13:03:47 +00:00
mateuszb
fa11c06bdc * our changes
* centered spellBook
* magic arrow animation fits battle window
* preventing different battle animations from getting out of appropriate rect
2009-01-07 19:40:19 +00:00
Michał W. Urbańczyk
847a4f222c Further serialization code and refactorings. 2009-01-06 18:42:20 +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
d0d60175d7 break, fix and break and fix - now its fine :) 2008-12-26 15:00:34 +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
6fc8ed9365 * showing spell effects affecting stack in creature info window
* more appropriate coloring of stack amount box when stack is affected by a spell
2008-12-21 11:07:23 +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
Vadim Glazunov
9cfa09c076 Some gcc fixups. Automake project updates 2008-11-19 07:55:17 +00:00
Michał W. Urbańczyk
333e1d9878 * started making support for save/load options 2008-11-16 01:06:15 +00:00
Michał W. Urbańczyk
bb5819f4df * support for Wait command (to be tested) 2008-11-15 15:26:08 +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
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
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
mateuszb
ceb3cf8eae * magic arrow probably works
* war machines support partially added
* queue of stacks narrowed
* minor fixes
2008-11-06 17:17:48 +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
mateuszb
45204d8beb * displaying spell effects (currently only arrow magic effect is shown)
* minor fixes
2008-10-19 15:41:18 +00:00
Michał W. Urbańczyk
2d01e00284 Added some kind of simple chatting functionality through console. Implemented several WoG cheats equivalents:
* woggaladriel -> vcmiainur 
* wogoliphaunt -> vcminoldor 
* wogshadowfax -> vcminahar 
* wogeyeofsauron -> vcmieagles 
* wogisengard -> vcmiformenos 
* wogsaruman -> vcmiistari 
* wogpathofthedead -> vcmiangband 

Minor changes.
2008-10-18 23:20:48 +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
20a6e05718 small fixes 2008-10-17 17:43:25 +00:00
mateuszb
929ce79ad4 * general improvements in battles
* calls for spell casting in battles (they usually crash VCMI server)
2008-10-17 16:30:56 +00:00
Michał W. Urbańczyk
4af64f1b9f * fixed blocked shooter behavior
* slowed map scrolling
* minor
2008-10-11 13:14:52 +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
Michał W. Urbańczyk
89cb5cb81b * added calls for battle action start/end
* added interface for casting spells
* artifact info in backpack
* artifacts we pick up on the map go to the appropriate slot (if free)
2008-09-28 21:01:49 +00:00
mateuszb
a4afdc7145 * minimap shows all flaggable objects (towns, mines, etc.)
* minor optimizations
2008-09-26 14:16:01 +00:00
mateuszb
6a3d0b666f * directional attack in battles
* CSystemOptionsWindow partially done
* added a few consts and references to improve performance
2008-09-25 14:09:31 +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
Michał W. Urbańczyk
16303ab1df classes for buttons group and functionlist with arg 2008-09-24 08:15:49 +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
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
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
mateuszb
c5c9127673 * fixed a few problems with refreshing screen during blitting using CSDL_Ext::printAtMiddle
* fixed drawbacks in displaying secondary skills in hero window
* fixed two bugs with spellBook
* corrected order of spells in spellBook
* spellBook is opened when hero in battle is left-clicked
2008-09-16 15:23:44 +00:00
mateuszb
cc1b5f37cd * fourth part of spellbook
* small fixes
2008-09-15 16:46:54 +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
Vadim Glazunov
3759675bb2 gcc fixes 2008-09-11 18:42:21 +00:00
mateuszb
e4d8d66de1 second part of spellbook 2008-09-11 12:29:22 +00:00
Vadim Glazunov
df03f4ef78 update automake file 2008-09-10 19:06:23 +00:00
mateuszb
11cef89810 * partially done spell window 2008-09-10 12:19:48 +00:00
Vadim Glazunov
4edd375ddb Some changes to compile again with gcc 2008-09-07 12:13:51 +00:00
Michał W. Urbańczyk
3d147a7be8 * version set to 0.63
* mostly done morketplace
* more logging around netcode
2008-09-07 03:38:37 +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
7722d058f0 Fixed issues reported by Zamolxis:
* dismiss Hero works blocked in the castles
* the backpack scrollable arrows aren't available (yellow, clickable) even when backpack is empty.
* added missing info texts for buttons in hero window (and added functionality of enable tactic formations button)
* can select (single click) and enter castle (double click) from the map. Same for hero.
* Hero gets automatically selected after End Turn 
* Hero is automatically selected when exiting town
* In Garrison or Hero army: units are selected when we first click on them
Fixed (at least partially) also a problem with disappearing path
2008-08-28 17:36:34 +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
c94fbbf228 Changes to compile under gcc 2008-08-17 14:09:30 +00:00
Michał W. Urbańczyk
61e66fa89c * icon in infobox showing that there is hero in town garrison
* fort/citadel/castle screen
2008-08-17 09:11:16 +00:00
Michał W. Urbańczyk
346af53961 * showing creature amount in the CCreInfoWindow
* fixes and improvements in dismiss/upgrade dialogs
* possibility of moving hero into the garrison
* viewing hero window in the town screen
2008-08-16 08:47:41 +00:00
Michał W. Urbańczyk
b83b80a71e * upgrading creatures
* splitted map loading on several functions
* buttons can call multiple functions when pressed
* minor
2008-08-15 12:11:42 +00:00
Michał W. Urbańczyk
52f6de2877 Fixed entering/leaving town. 2008-08-13 09:28:06 +00:00
Michał W. Urbańczyk
59b808f4e1 * removing objects (resources, chests, dismissing heroes) 2008-08-13 04:41:11 +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
6e02c1c5db * corrected typo in cr_shots
* recruiting creatures
2008-08-10 04:46:16 +00:00
Michał W. Urbańczyk
15ff21e84c Battles: attacking, shooting, killing. 2008-08-08 23:02:32 +00:00
mateuszb
92971e0df0 * working minimap's FoW
* properly displayed neutral buildings' flags
2008-08-07 15:09:10 +00:00
Michał W. Urbańczyk
9ec606a40b Battles:
* removed some displaying problems
* showing last group of frames in creature animation won't crash
* added start moving and end moving animations
* fixed moving two-hex creatures
* showing/hiding graphic cursor
* a part of using graphic cursor
2008-08-07 00:38:44 +00:00
Michał W. Urbańczyk
d8eb861117 Battles:
* showing ranges
* improvements in moving
* workaround for neutrals
2008-08-05 23:33:08 +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
a5354271e2 * improvements in battle support - moving creatures work though there are small graphic glitches
* @neweagle - I've replaced in VCMI_Lib.h your #ifndef with #ifdef since you modification affected (and broke) compilation only on MSVC. Is it ok now?
2008-08-04 23:04:15 +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
038dd90517 Autoconf/automake scripts to easy building. 2008-08-04 09:33:08 +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
Michał W. Urbańczyk
dc82232e70 Hover text for heroes. 2008-08-02 10:25:58 +00:00
Michał W. Urbańczyk
1f4b4364df Dismissing heroes / minor. 2008-08-01 21:41:38 +00:00
Michał W. Urbańczyk
bfad10a8e4 * added fast graphical cursor :)
* building structures should work
2008-08-01 18:13:33 +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
28d5c184a9 Mines and object visitable once per week working. 2008-07-31 10:35:22 +00:00
Michał W. Urbańczyk
03287540c7 Further code for objects (mines) - not finished. 2008-07-30 21:27:15 +00:00
Michał W. Urbańczyk
b4f383f196 Slowly recovering object scripts. 2008-07-30 17:51:19 +00:00
Michał W. Urbańczyk
3247a9a4dd Rewrote hero moving code. Seems to be working. 2008-07-28 12:44:08 +00:00
Michał W. Urbańczyk
62b0365e70 Improvements for netcode. AI is working. Townlist won't crash. Moving hero is wrong but won't crash. Giving starting hero is working properly. Town defs are wrong but displayed. 2008-07-27 17:07:37 +00:00
Michał W. Urbańczyk
b3c5f19c0d Proper initialization of the first turn. 2008-07-26 13:57:32 +00:00
Michał W. Urbańczyk
b72d065265 Minor changes/cleanups. Adventure map is shown :) 2008-07-26 06:39:44 +00:00
Michał W. Urbańczyk
0c139e72f5 More changes for netcode/serialization
Removed not needed stuff
2008-07-25 17:28:28 +00:00
Michał W. Urbańczyk
9422b0d9ca Experimantal parts of netcode 2008-07-03 15:03:32 +00:00
Michał W. Urbańczyk
1b73678b7c Fighting with includes. 2008-07-02 08:39:56 +00:00
Michał W. Urbańczyk
b0002ff50b * added files for future server
* make code compiling
* broken objects scripts
2008-07-01 08:01:02 +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
b26024e607 First part of commit 2008-06-30 00:05:48 +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
4347996353 Cleanups + started splitting 2008-06-12 06:45:51 +00:00
Michał W. Urbańczyk
feaa2396a6 Code cleaning/refactoring 2008-06-07 17:16:52 +00:00