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

266 Commits

Author SHA1 Message Date
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