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

334 Commits

Author SHA1 Message Date
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
mateuszb
2d1fc64dd9 * forgetfulness spell implemented
* partial support for many creatures being attacked at once (killed - not killed mixes and callback/engine support must be added)
2008-11-17 18:47:43 +00:00
mateuszb
32505ec161 * reverted pathfinder with necessary updates including handling of visitDir and code cleanup (needs a bit of testing but Zamolxis will probably do it for us ;]) 2008-11-15 13:44:32 +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
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
4af64f1b9f * fixed blocked shooter behavior
* slowed map scrolling
* minor
2008-10-11 13:14:52 +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
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
Michał W. Urbańczyk
70673674dc * setting army formation
* minor changes
2008-09-18 13:54:54 +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
6233066b91 * it's possible to use other port than 3030 by passing it as an additional argument
* removed some redundant warnings
* minor improvements for marketplace
2008-09-09 01:40:43 +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
mateuszb
2af92aa170 * first part of end of battle window
* fixed heap corruption while exiting battle
2008-09-05 16:08:25 +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
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
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
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
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
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
d8eb861117 Battles:
* showing ranges
* improvements in moving
* workaround for neutrals
2008-08-05 23:33:08 +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
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
1f4b4364df Dismissing heroes / minor. 2008-08-01 21:41:38 +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
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
0c139e72f5 More changes for netcode/serialization
Removed not needed stuff
2008-07-25 17:28:28 +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
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
4347996353 Cleanups + started splitting 2008-06-12 06:45:51 +00:00
Michał W. Urbańczyk
dd9b506293 Merged changes from trunk (since r452) 2008-06-11 01:58:18 +00:00
Michał W. Urbańczyk
798fd11f65 radical cleanups 2008-06-08 00:58:29 +00:00
Michał W. Urbańczyk
608dc62ee8 * version set to 0.61
* Splitting: when moving slider to the right so that 0 is left in old slot the army is moved.
2008-06-06 12:35:23 +00:00
mateuszb
0b16616d7a Better pathfinder - it's not fixed completely as arrows for move in adventure map aren't always in appropriate color but it's significantly better. I'm not also sure how this pathfinder deals with different costs of straight and diagonal costs of move through a tile. 2008-06-03 14:44:09 +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
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
Michał W. Urbańczyk
4ff5788e51 * version changed to 0.58
* splitting stacks in hero window
* minor fixes
2008-04-20 12:39:33 +00:00
Michał W. Urbańczyk
06f278717c Splitting stacks 2008-04-19 16:15:04 +00:00
mateuszb
54f94cf5ef a bit of escaping battlefield (to be finished) 2008-04-15 16:52:31 +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
a729484dde * battle funcs added to ICallback
* initing visiting heroes
* merging stacks in town screen
* available creature amount handled
2008-04-13 11:05:39 +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
fc4e0215fb * moving units and some minor improvements 2008-03-29 10:59:18 +00:00
mateuszb
137f62798b completed calls of functions during stack's move 2008-03-24 19:04:30 +00:00
mateuszb
500f55cd52 A few upgrades and bugfixes in battles 2008-03-24 13:25:11 +00:00
mateuszb
d5a5a04811 progress in battles 2008-03-23 17:25:38 +00:00
Michał W. Urbańczyk
ac82c2fe5a Mostly working building and requirements 2008-03-23 01:01:17 +00:00
Michał W. Urbańczyk
1e61235aa9 Almost finished building of buildings. 2008-03-21 00:03:31 +00:00
mateuszb
7b88f4a70b another piece of battles (with code reorganization) 2008-03-14 18:24:37 +00:00
mateuszb
b95551a0be * another part of Battle interface 2008-03-10 20:19:41 +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
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
mateuszb
0c2cf02ca6 * given hero is placed in the town entrance
Wspólne zmiany
* some objects such as river delta won't be blitted "on" hero
* tiles under FoW are inaccessible
* giving random hero on RoE maps
* improved protection against hero duplication
* fixed starting values of primary abilities of random heroes on RoE/AB maps
2008-02-23 19:20:41 +00:00
Michał W. Urbańczyk
e46d411643 * mostly done town infobox
* town daily income is properly calculated
* minor not done stuff
2008-02-18 21:14:28 +00:00
Michał W. Urbańczyk
a89b4e2c59 * [feature] giving starting hero
* [feature] VCMI will try to use files from /Data folder instead of those from h3bitmap.lod
* [feature] picked artifacts are added to hero's backpack
2008-02-07 18:45:22 +00:00
mateuszb
21ec0b77d4 code cleanups, etc. 2008-02-03 15:24:35 +00:00
Michał W. Urbańczyk
c461365275 * added Necropolis
* townlist in town screen and switching towns
* minor changes
2008-01-31 21:35:30 +00:00
mateuszb
ed0bbcfe11 changes seem to cover almost everything on heroes' artifacts in hero screen
a part of code has been refactored for simpler support by other parts of code
2008-01-30 10:55:43 +00:00
Michał W. Urbańczyk
b675de7ca5 * support for Inferno
* started doing splitting/merging stacks
2008-01-29 22:47:43 +00:00
Michał W. Urbańczyk
3953eac82d * support for Rampart town view 2008-01-28 20:58:19 +00:00
Michał W. Urbańczyk
e6de19e17d * town visiting
* improvements in garrisons
2008-01-28 14:01:09 +00:00
mateuszb
74cce9b7a0 some additional descriptions on heroWindow, better functions for hero level <-> exp (to be tested a bit more) 2008-01-27 16:07:27 +00:00
Michał W. Urbańczyk
70bf415eb6 Improvements within garrisons/town. 2008-01-26 21:50:51 +00:00
mateuszb
8da051febf Wspólne zmiany (Common changes)
* fixed heroWindow
* started making garrisons
2008-01-26 19:36:31 +00:00
Michał W. Urbańczyk
8fea2b87b8 Nearly working borders of buildings. 2008-01-20 16:24:03 +00:00
Michał W. Urbańczyk
644a494589 Finished treasure chests. 2007-12-27 23:43:36 +00:00
Michał W. Urbańczyk
d3f5a1c1e7 Finished drawing selection window for treasure chest.
(trzeba dorobic jego zamykanie, zwrocenie infa, zwrot pamieci)
2007-12-27 00:11:46 +00:00
Michał W. Urbańczyk
01c996591a More stuff for selection window. 2007-12-25 16:25:53 +00:00
Michał W. Urbańczyk
e427974875 * code reorganization
* minor stuff for resource <-> infoBar interaction
2007-12-22 14:40:27 +00:00
mateuszb
4a6ffa94d0 part of minimap revealing 2007-12-06 19:54:31 +00:00
Michał W. Urbańczyk
ae0be1f79e Bugfix - it should work now. 2007-12-06 19:06:07 +00:00
mateuszb
58f1a2169f faster FoW in minimap, does not work, compiler errors 2007-12-06 18:55:58 +00:00
Michał W. Urbańczyk
e1b2ae0df1 Several bugfixes and half-done things. 2007-12-01 12:50:33 +00:00
Michał W. Urbańczyk
fa5079809f Partially done resources. 2007-11-25 13:16:45 +00:00
Michał W. Urbańczyk
845d99a908 Working mines and minor improvements. 2007-11-24 14:17:57 +00:00
Michał W. Urbańczyk
736af28c05 Working windmill, water wheel, mystical garden (not tested).
Info windows.
Minor changes.
2007-11-23 22:33:55 +00:00
Michał W. Urbańczyk
556311c9ab Partially done object scripting and interactions.
Most of 0.4 ;)
2007-11-18 22:58:28 +00:00
mateuszb
8b73ab8492 * fixed bugs in hero moving
* added functions to show/hide objects to CMapHandler
* added (partially written) fonction to create new CGObjectInstances
* added 2 console commands: A hides all abjects and R shows them again
2007-11-03 16:46:08 +00:00
mateuszb
287b053041 * small improvements 2007-10-28 15:15:58 +00:00
Michał W. Urbańczyk
cc01243da5 It should be quite stable now. 2007-10-27 20:14:25 +00:00
Michał W. Urbańczyk
4f316cd7e6 Our changes.
Restructured instances classes.
Still very instable.
2007-10-27 19:38:48 +00:00
mateuszb
c18e4573f1 * small improvements
* probably working getting visitable objects at certain position (to be tested)
2007-10-26 17:55:33 +00:00
mateuszb
b07b1ec7dc * displaying flags
* significant speed-ups and warningfixing
2007-10-25 16:14:43 +00:00
mateuszb
21f8684cdd * a bit of printing object flags
* small speed up
2007-10-24 19:54:35 +00:00
Michał W. Urbańczyk
8440ffb39b Probably last bugfixes for 0.3 2007-10-22 17:01:00 +00:00
Michał W. Urbańczyk
a5664e408a * minor bugfixes 2007-10-22 16:41:53 +00:00
Michał W. Urbańczyk
0291bf2d2d * added #1
* minor bugfixes
2007-10-21 18:41:58 +00:00
Michał W. Urbańczyk
04985fce2f * added #45, #44, #43 2007-10-21 16:45:13 +00:00
Michał W. Urbańczyk
2286d37012 * added #42 and #30
* one more file for AIs
2007-10-19 21:12:37 +00:00
mateuszb
f3b5d07aa5 * bugfixes
* general improvements
2007-10-18 20:14:26 +00:00
mateuszb
c1e9e9b750 * resolving #41 and #36
* small improvements
2007-10-17 20:05:49 +00:00
mateuszb
355e21b56a * finishing hero flags
* some things with #36 and #41
2007-10-16 17:46:01 +00:00
Michał W. Urbańczyk
f1d5e686ce * done #40, #32, #21
* added files for Lua handler and moved Lua test code
2007-10-14 12:11:18 +00:00
mateuszb
62b69b1f25 our changes 2007-10-13 18:49:43 +00:00
mateuszb
f3b712e6ea * resolving #35
* small changes
2007-10-11 20:13:13 +00:00
mateuszb
e32eaac8af * resolving #18
* small bugfix
2007-10-09 15:15:35 +00:00
Michał W. Urbańczyk
b434479b53 * fixed #29, #27 and #26 2007-10-05 20:38:14 +00:00
Michał W. Urbańczyk
e02f752211 Now hero movement should be working.
- fixed/added #22, #24, #25, #8, #11, partially #19
- minor improvements
2007-10-05 18:16:22 +00:00
mateuszb
49565e6b45 * resolving #23 with adding it to callback 2007-10-05 18:10:33 +00:00
mateuszb
df3b0f56d9 * fixing hero move
* fixing horopos actualization
* fixing #9 bug
2007-10-04 16:40:40 +00:00
mateuszb
d530bd057d * fixed some issues with hero moving; actualizing hero position is still broken :( 2007-10-03 19:56:08 +00:00
Michał W. Urbańczyk
7b3c270dfc - Initializing movement points (t.#16)
- minor improvements
2007-10-03 18:53:49 +00:00
Michał W. Urbańczyk
8421c901a4 * a lot of improvements
* started making an infobar
2007-09-30 16:16:00 +00:00
Michał W. Urbańczyk
cfc94847a1 * added selecting path by clicking on terrain (experimental)
* coordinates in CPathNode are stored in int3
* minor improvements
2007-09-22 01:16:31 +00:00
Michał W. Urbańczyk
6d0bcef157 * fixed initialization of map of players
* functions in callback for getting info about towns
* added info about towns to CGameState
* minor changes
2007-09-18 13:30:26 +00:00
Michał W. Urbańczyk
7d4aa0c803 * resource bar
* function in CCallback for getting onfo about res
* giving resources at the beginning of game
* moved several txt files to /config subfolder
* minor changes
2007-09-16 17:21:23 +00:00
mateuszb
f6953057d7 * main things in hero moving
* some minor fixes
2007-09-15 15:44:08 +00:00
Michał W. Urbańczyk
16a1861fc4 * heroList
* functions for getting info about heroes in CCallback
* function for initializing GameState
* improvements in CHeroInstance
* added codename
* minor stuff
2007-09-14 13:11:10 +00:00
mateuszb
55c0dc0229 some stuff to hero moving 2007-09-13 13:34:59 +00:00
mateuszb
5222be8d94 * upgrades in moveHero function
* new folder structure
2007-08-30 10:11:53 +00:00
mateuszb
2d7dbbefc3 * partially written hero moving
* improvements in include system
2007-08-29 12:18:31 +00:00
Michał W. Urbańczyk
2030a6793f Empty function for hero movement 2007-08-29 10:05:50 +00:00
Michał W. Urbańczyk
210123ac33 * improved minimap
* live event handling on adventure map
* added CCallback
* minor stuff (as usual)
2007-08-27 14:15:03 +00:00