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
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
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
Michał W. Urbańczyk
1e61235aa9
Almost finished building of buildings.
2008-03-21 00:03:31 +00:00
mateuszb
db12ede837
added requirements for some towns (to be tested - they're probably good, but seem to don't work)
2008-03-20 14:23:54 +00:00
phoebus118
3a279a7964
Interface added: CMusicHandler::playLodSnd(std::string name).
...
We can play wav data of Heroes3.snd through CMusicHandler::playLodSnd(std::string name) now, where name can be "BASLDFND.wav" or "BASLKILL.wav".
2008-03-20 09:55:33 +00:00
phoebus118
9c4cb94490
Play Wav from Lod directly. Need a little more work..
2008-03-20 08:51:53 +00:00
mateuszb
bd7cf60f13
faster and better creature animation handling (almost finished!)
2008-03-18 17:05:00 +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
Michał W. Urbańczyk
eed2a2b54c
More code for halls.
2008-03-11 21:36:59 +00:00
Michał W. Urbańczyk
c3249d3fd7
Some code for town hall screen.
2008-03-09 23:06:35 +00:00
mateuszb
0379fbfc1d
* [battles] displaying fighting creatures
...
* faster blitting of animated unit
2008-03-08 15:23:04 +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
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
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