games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity
740 Commits 21 Branches 65 Tags 118 MiB
eaa7ea643a
Commit Graph

214 Commits

Author SHA1 Message Date
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
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
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
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
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
mateuszb
7b88f4a70b another piece of battles (with code reorganization) 2008-03-14 18:24:37 +00:00
Michał W. Urbańczyk
eed2a2b54c More code for halls. 2008-03-11 21:36:59 +00:00
mateuszb
b95551a0be * another part of Battle interface 2008-03-10 20:19:41 +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
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
6cb9ed9f8b *fixed bugs with hero dismissing 2008-03-02 13:16:11 +00:00
Pioxan
1b55f6457f * fixed crashbug with dissmising heroes 
* fixed bug with hero list redrawing after dissmissing
 2008-03-01 14:50:22 +00:00
Michał W. Urbańczyk
17d5d298ca * hints for cregens 
* moved battle loop to the activeStack
 2008-02-29 22:14:53 +00:00
mateuszb
1580c71c78 * reported problems with hero flags resolved 
* a bit of battle interface
* heroes with same owner cannot fight
 2008-02-26 18:01:26 +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
dbf3b8d08e * right click popups with infoboxes for heroes/towns lists 
* separation activate/show functions in advmapint
 2008-02-22 22:26:31 +00:00
mateuszb
8b5a50f619 * new interface coloring (many thanks to GrayFace ;]) 
* fixed bug in object flag's coloring
* a bit of water animation (next thanks to GrayFace, even if it does not work good ATM)
 2008-02-22 17:47:14 +00:00
Michał W. Urbańczyk
06c193498e * added giving default buildings in towns 
* town infobox won't crash on empty town
* version changed to 0.53b
 2008-02-20 18:24:19 +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
77fadf561d * added visitDir bitfield in CGDefInfo specifying from which directions object can be visited 
* fixed crashbug in heroList (showing after dismissing hero)
 2008-02-15 18:40:58 +00:00
mateuszb
4a655a0ad1 small changes 2008-02-11 18:40:10 +00:00
mateuszb
f0e2f1d205 * memory usage significantly decreased (now it's about half of what was before ;]) 
* load time significantly decreased also (now it's almost like in OH3)
* TODO: make extensively used CSDL_Ext::blit8bppAlphaTo24bpp faster - it slows down VCMI too significantly, but I'm sure it can be as fast as the code from SDL and anyway those speed-ups and memory usage decrease were worth it ;]
 2008-02-10 17:44:51 +00:00
Michał W. Urbańczyk
f0db8760c2 * redone ZELP.TXT handling. Now VCMI should handle all language versions of that file. 2008-02-06 05:12:59 +00:00
Michał W. Urbańczyk
847126f57a * close button properly closes (same does 'q' key) 
* two players can't have selected same hero
* double click on "Show Avalible Scenarios" won't reset options
* fixed crashbug in town/hero lists
* fixed crashbug in initializing game caused by wrong prisons handling
* fixed crashbug on reading custom artifacts in RoE map
* fixed crashbug on reading custom pandora's box in RoE map
* fixed crashbug on reading blank quest guards
* improved console messages


Ufff....
 2008-02-03 04:22:58 +00:00
Michał W. Urbańczyk
f01fc2af45 Probably final version of techdemo. 2008-02-02 00:51:49 +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
974d27aacc small improvements, bugfixes etc. 2008-01-30 14:19:35 +00:00
mateuszb
099af11606 secondary skills' descriptions and rightcliks on artifacts 2008-01-29 13:55:14 +00:00
Michał W. Urbańczyk
25bc3b532f * redone buildings reading 
* subtitles in statusbar for garrison
* animations an castle view are faster
 2008-01-29 13:00:45 +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
b1af2fb829 strange bug while clicking 2008-01-28 12:28:18 +00:00
Michał W. Urbańczyk
9ed4f66cb7 * custom statusbar in town interface 
* added missing file
 2008-01-27 20:37:10 +00:00
Michał W. Urbańczyk
9b805ea1e7 Fixed crashbug in infoWindows. 2008-01-27 14:07:51 +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
449e7b6773 Hopefully fixed buttons without making leak. 2008-01-21 18:22:51 +00:00
Michał W. Urbańczyk
8fea2b87b8 Nearly working borders of buildings. 2008-01-20 16:24:03 +00:00
Michał W. Urbańczyk
d64dfa0a23 showInfoDialog should be compatible with interfaces other than advmapint. 2008-01-20 12:34:39 +00:00
mateuszb
e3f40e6907 first part of artifacts on hero window - small problem with misc5 slot (most probably in AmbarCendamo) 2008-01-19 13:19:58 +00:00
mateuszb
2ce033aba9 heroWindow is now show/hideable ;] 2008-01-11 18:56:39 +00:00
mateuszb
e62cfed95f a bit of hero window 
help needed - make something to prevent changing surface stored in CHeroWindow::background. I do not overwrite it, but it changes dramatically with every call of CHeroWindow method!

And besides - is there anything to make my window displayed easily, without calling show() every frame when it should be displayed? any machanism?
 2008-01-10 19:01:25 +00:00
Michał W. Urbańczyk
b334dbd79d Town interface and minor improvements. 2008-01-09 17:21:31 +00:00
mateuszb
ef90e6140f hero animation speed now independent 2008-01-08 13:31:44 +00:00
mateuszb
8c651b5021 - repaired wrong decompressing defs type 2 (mainly effected shadows) 
- fixed #34
- correctly working most of CCreatureHandler (except displaying only specific part of animation)
 2008-01-07 18:24:05 +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
06a081c924 Arrays allocated with new[] must be deleted with delete[] 2007-12-23 16:46:33 +00:00
Michał W. Urbańczyk
6c2cf4ba29 * hopefully fixed #46 
* minor improvements
 2007-12-23 16:25:14 +00:00
Michał W. Urbańczyk
daa9217979 * working info about collecting resources in infoBar 
* minor fixes
 2007-12-22 18:04:34 +00:00
Michał W. Urbańczyk
e427974875 * code reorganization 
* minor stuff for resource <-> infoBar interaction
 2007-12-22 14:40:27 +00:00
Michał W. Urbańczyk
84261a5de8 * bugfixes in infobar 
* new week animation
 2007-12-20 23:07:02 +00:00
Michał W. Urbańczyk
6cd90195f4 * major optimization of infoBar drawing 
* new day animation (TODO: dorobic zeby pierwsza klatka wchodzila - wkrotce sie tym zajme)
* some stuff for selection window
* minor improvements
 2007-12-19 00:06:51 +00:00
mateuszb
56ed228cb1 minimap completety fixed (never use float for precise int calculations!) 2007-12-09 14:02:11 +00:00
Michał W. Urbańczyk
aef05b45fc More bugfixes. 2007-12-09 12:42:45 +00:00
mateuszb
4a6ffa94d0 part of minimap revealing 2007-12-06 19:54:31 +00:00
Michał W. Urbańczyk
62237573c8 optimized hero list updating 2007-12-06 19:19:25 +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
c8c0d0eaaf Bugfixes for AI, Callback Interface, logging macrodefs. 2007-12-06 18:32:06 +00:00
Michał W. Urbańczyk
e1b2ae0df1 Several bugfixes and half-done things. 2007-12-01 12:50:33 +00:00
mateuszb
7c0f9afc9f correct detection of blocked pos after disappearing objects and hero movement 2007-11-29 18:45:47 +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