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

125 Commits

Author SHA1 Message Date
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
8a6cfa2590 Dialog windows when upgrading/dismissing creature. 2008-08-15 14:08:39 +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
15ff21e84c Battles: attacking, shooting, killing. 2008-08-08 23:02:32 +00:00
Michał W. Urbańczyk
4673a6d0e1 Improved pathfinding in battles, removed problems with displaying movement, adventure map interface won't be called during battles. 2008-08-06 17:49:47 +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
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
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
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
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
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
dd9b506293 Merged changes from trunk (since r452) 2008-06-11 01:58:18 +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
7e12926baa * VCMI won't crash when r-click neutral stack during the battle
* water won't blink behind shipyard in the Castle
* in the townlist in castle selected town will by placed on the 2nd place (not 3rd)
* fixed memory leaks
* properly displaying two-hex creatures in recruit/split/info window
* minor improvements
2008-06-04 13:00:56 +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
88a29416da improvements in battles 2008-05-30 11:53:04 +00:00
mateuszb
21a8d87796 small upgrade 2008-05-27 15:16:12 +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
00929126d5 * started making creature info window
* callback for buttons/lists based on boost::function
* new file AdventureMapButton.cpp - update your project files
2008-05-18 17:33:39 +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
Michał W. Urbańczyk
d7b5099b6f Fixed moving creatures in garison in heroWindow 2008-04-19 19:29:00 +00:00
mateuszb
f9a4c2a5fd better support for two-hex stacks 2008-04-19 17:10:57 +00:00
Michał W. Urbańczyk
06f278717c Splitting stacks 2008-04-19 16:15:04 +00:00
Michał W. Urbańczyk
e8056d0d80 * improved slider
* fixed leaving battles
2008-04-15 17:12:21 +00:00
mateuszb
54f94cf5ef a bit of escaping battlefield (to be finished) 2008-04-15 16:52:31 +00:00