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

334 Commits

Author SHA1 Message Date
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
Michał W. Urbańczyk
88acb2e0c1 * redone building info reading 2008-03-02 18:16:08 +00:00
Michał W. Urbańczyk
6cb9ed9f8b *fixed bugs with hero dismissing 2008-03-02 13:16:11 +00:00
Michał W. Urbańczyk
17d5d298ca * hints for cregens
* moved battle loop to the activeStack
2008-02-29 22:14:53 +00:00
Michał W. Urbańczyk
1e7f8984e2 * new command - "get txt" - VCMI will extract all .txt files from h3bitmap.lod to the Extracted_txts/ folder.
* more detailed logs
* version changed to 0.55
2008-02-25 23:26:50 +00:00
Michał W. Urbańczyk
33fd0d22a6 * reading disposed/predefined heroes (probably works)
* new discoveries in h3m specification

VCMI handles correctly all known maps again :)
2008-02-25 18:35:10 +00:00
Michał W. Urbańczyk
ee2a63f26e * another fix of Pnadora's Box handling 2008-02-25 16:21:19 +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
83b5c78d5a * added hints in town lists
* eliminated square from city hints
* version changed on 0.53c
2008-02-22 15:47:01 +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
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
mateuszb
2f6ec1f7eb * better new hero initialization
* faster pathfinder
2008-02-10 15:43:11 +00:00
Michał W. Urbańczyk
021a7ed61a * Seer's Hut and Event with creatures won't crash on RoE maps 2008-02-10 15:02:08 +00:00
Michał W. Urbańczyk
ec072972ee * hopefully last bugfix for Pandora's Box
* fixed blockmap for generated hero
* one can't choose already disposed hero in pregame
* fixes in heroes and towns picking
* improved hero selection in pregame
* version changed to 0.53
* CGI will be in debug mode a global pointer (much more convenient debugging)
2008-02-10 09:35:52 +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
96734fafa1 general code improvements 2008-02-06 13:50:40 +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
mateuszb
2e0dacd65a small bugfix in def handling 2008-02-05 10:58:59 +00:00
Michał W. Urbańczyk
c9cfdacbc5 * leading files from Data/ instead of h3bitmap.lod when possible (as in OH3)
* minor improvements
2008-02-05 07:21:09 +00:00
Michał W. Urbańczyk
fe5bcc19cf * redone def info handling
* redone randomization (mam nadziemę, że będzie toto działać)
* no more cheating pathfinder
* minor improvements
* version changed to 0.52
2008-02-05 03:56:45 +00:00
mateuszb
21ec0b77d4 code cleanups, etc. 2008-02-03 15:24:35 +00:00
Michał W. Urbańczyk
84b10c0cd9 Last bugfix 2008-02-03 07:09:21 +00:00
Michał W. Urbańczyk
10c67209fb * part of that code was used
* version changedto 0.51

I chyba będę już to releasował.
2008-02-03 05:50:39 +00:00
Michał W. Urbańczyk
bd7d5d2687 * removed useless but slowing def handling code 2008-02-03 05:36:56 +00:00
Michał W. Urbańczyk
2cec1a2022 * unpacking defs speeded up by ~40% 2008-02-03 05:10:33 +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
mateuszb
313f940e7e small and unfortunately partial bugfix 2008-02-02 13:06:33 +00:00
Michał W. Urbańczyk
515c30247b * added Conflux
* minor fixes
2008-02-02 00:41:00 +00:00
Michał W. Urbańczyk
fe9f3ba720 Wspólne zmiany (poza fortecą)
* bugfixes and improvements in pregame
* added support for Stronghold
* added support for Fortress
* fixed memory leak in towns
2008-02-01 21:45:07 +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
31a5ea2ae5 general heroWindow improvements 2008-01-31 12:10:59 +00:00
mateuszb
974d27aacc small improvements, bugfixes etc. 2008-01-30 14:19:35 +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
dfbe7d7c6b * added support for buildings showing with halls
* creatures base growth is showed
* fixes in building reading
* fixes in building grouping
* fixes in Rampart townview
2008-01-29 15:08:41 +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
Michał W. Urbańczyk
9ed4f66cb7 * custom statusbar in town interface
* added missing file
2008-01-27 20:37:10 +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
19c1fee418 * improvements in the town view 2008-01-27 13:18:18 +00:00
Michał W. Urbańczyk
70bf415eb6 Improvements within garrisons/town. 2008-01-26 21:50:51 +00:00
mateuszb
b5ecb2e146 some minor improvements 2008-01-25 19:09:41 +00:00
mateuszb
c66d430702 memory optimizations (less leaks) 2008-01-23 18:32:24 +00:00
Michał W. Urbańczyk
10e4e2937f Less leaks. 2008-01-21 18:46:07 +00:00
mateuszb
f0186c3858 less leak, bizzare buttons 2008-01-21 18:08:53 +00:00
mateuszb
7cb9c879ca small improvements 2008-01-20 17:10:01 +00:00
Michał W. Urbańczyk
8fea2b87b8 Nearly working borders of buildings. 2008-01-20 16:24:03 +00:00
mateuszb
315f92ef14 bugfix and speedup 2008-01-20 15:26:34 +00:00
mateuszb
efd09f0a68 fixed misc5 bug, hero backpack, strange bug with hero portrait (LClick) 2008-01-19 18:58:24 +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
Michał W. Urbańczyk
2e25e040d5 Fixing buildings in castle and related improvements. 2008-01-19 11:55:04 +00:00
Michał W. Urbańczyk
4b772315bb Buildings in town (tylko zamek, trzeba inaczej sortować, jeden budynek źle trafiony) 2008-01-15 21:38:01 +00:00
mateuszb
bce31ba91b another part of hero window and other improvements 2008-01-15 18:50:52 +00:00
mateuszb
d55b020dbd a bit more of hero window 2008-01-13 16:24:24 +00:00
Michał W. Urbańczyk
b976857c6c Now features in town interface:
* town garrison
* creature growths
* town big pic
2008-01-12 11:32:40 +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
9530fb42c2 Reading buildings in the castles - still needs more testing and improvents. 2008-01-09 19:59:23 +00:00
Michał W. Urbańczyk
b334dbd79d Town interface and minor improvements. 2008-01-09 17:21:31 +00:00
mateuszb
a4e4c97776 possibly handles all H3 maps inculding RoE 2008-01-08 16:08:25 +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
mateuszb
e44c6b47f3 - rename
- partially written CCreatureAnimation
2008-01-06 18:07:03 +00:00
mateuszb
d116caeb26 some improvements in map randomizing, most things done. If you want to do sth with this, do it ;]. 2007-12-26 13:57:38 +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
mateuszb
e12976a9fe small update 2007-12-15 15:33:14 +00:00
mateuszb
b0648b4c63 support for Ab maps, needs a bit of testing 2007-12-13 17:42:12 +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
mateuszb
d8103fd242 * part of new object randomizing; make it work (I mean moving the last hero on your Arrogance2 - it doesn't wotk and I don't know why) 2007-11-20 17:52:22 +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
Michał W. Urbańczyk
de4d8e093e * redone def declaration reading 2007-10-28 17:56:16 +00:00
Michał W. Urbańczyk
32baadfbfa * added missing files
* fixed displaying objects
* fixed memory leak
2007-10-28 11:34:33 +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
Michał W. Urbańczyk
16642621db Fixed a few includes 2007-10-21 16:52:41 +00:00
mateuszb
c1e9e9b750 * resolving #41 and #36
* small improvements
2007-10-17 20:05:49 +00:00
Michał W. Urbańczyk
4cca2da9c0 * added #38
* CDefEssential is now useful
* initGameState shouldn't overwrite starting armies
* loading more graphics (small creature icons, large hero portraits)
* functions for getting current valueof morale/luck (unfinished)
* added in CLodHandler function that returns CDefEssential with images from desired .def
* copySurface works correctly (I hope)
2007-10-16 22:39:11 +00:00
Michał W. Urbańczyk
730b469ec6 * added #17
* added txt file with reference names of creatures
* minor changes
2007-10-15 20:59:17 +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
Michał W. Urbańczyk
70ce922fe6 * added #33 & #19 (as far as possible by now)
* more text in CPreGameTextHandler
2007-10-13 21:27:03 +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
65ae2cd217 * resolving #31
* using better flags
2007-10-08 18:47:23 +00:00
mateuszb
87b3459d14 * resolving #28
* minor changes and improvements
2007-10-07 16:01:53 +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
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
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
mateuszb
b0e72f334e small bugfix, move of one file 2007-09-17 17:36:20 +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
3c4923a31e hero animation 2007-09-15 18:04:12 +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
88a1809229 initializing town instances in game state 2007-09-05 15:56:35 +00:00
Michał W. Urbańczyk
4edc6176dc * minimap fix
* headers fix
* commented LUA stuff
2007-09-02 12:36:54 +00:00
mateuszb
5222be8d94 * upgrades in moveHero function
* new folder structure
2007-08-30 10:11:53 +00:00