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

35 Commits

Author SHA1 Message Date
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
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
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
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
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
mateuszb
33e3bf4849 better battle pathfinder and unit reversing 2008-05-03 15:18:48 +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
f9a4c2a5fd better support for two-hex stacks 2008-04-19 17:10:57 +00:00
mateuszb
df76e03628 console in battles and small improvements 2008-04-16 17:21:02 +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
mateuszb
149c6772e2 battle and general upgrades and bugfixes 2008-04-07 17:51:46 +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
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
mateuszb
b95551a0be * another part of Battle interface 2008-03-10 20:19:41 +00:00
mateuszb
0379fbfc1d * [battles] displaying fighting creatures
* faster blitting of animated unit
2008-03-08 15:23:04 +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
mateuszb
4236c65512 another piece of battles (and CCreatureAnimation) 2008-03-05 17:01:41 +00:00
mateuszb
ffd3742e3d another piece of battles
Yifeng, your blitting optimizations are good enough for now (and work for me ;]). If you want to do something simple and developing, you could write sound handling - especially a function to play sounds directly from lod files (atm it requires unpacking to a file and opening it). It may require a small patch to SDL_mixer, but will significantly contribute to this project.
2008-03-04 17:25:58 +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
mateuszb
68d37e1507 * small bugfix in dismissing hero (still needs better actualization of advmap lists)
* most buttons in battleInterface
2008-03-01 11:49:25 +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