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

253 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
de1ed92379 * version set 0.73b
* config entry for 1600x1200 resolution
* several fixes
* http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=3185#3185
2009-08-03 23:53:18 +00:00
Trevor Standley
cb8ddd74da 2009-08-03 19:22:05 +00:00
Trevor Standley
e3ce3f8496 2009-08-02 06:56:32 +00:00
mateuszb
8e63c73cf8 * flaggable objects change their color on minimap when taken over
* corrected damage inflicted by spells and ballista
* minor changes
2009-07-30 12:49:45 +00:00
Michał W. Urbańczyk
9fd4b5bb62 Fourth part of sailing code.
Support for Shipyard (both for town and adventure map versions). Improved boat displaying code. Minor changes.
2009-07-26 03:33:13 +00:00
Michał W. Urbańczyk
fbd496b756 Infowindows for enemy towns. 2009-07-20 02:56:35 +00:00
Michał W. Urbańczyk
c9cac18482 Support for infowindows on enemy heroes. 2009-07-20 01:47:49 +00:00
Michał W. Urbańczyk
58c12e8d73 Reshaped some code responsible for hero list / paths.
* Garrisoning, then removing hero from garrison move him at the end of the list
* problems with the hero window hero list should be fixed
2009-06-11 17:21:06 +00:00
mateuszb
429b226517 * moved a few files 2009-05-20 10:08:56 +00:00
mateuszb
b5ae7d5cbe * refactorings and comment coverage improvements 2009-05-07 17:20:41 +00:00
mateuszb
7319e5cb0e * canceling of casting a spell by pressing Escape or R-click (R-click on a creatures does not cancel a spell)
* new spells:
- frost ring
- fireball
- inferno
- meteor shower
- death ripple
- destroy undead
* spellbook button is inactive when hero cannot cast any spell
* obstacles will be placed more properly when resolution is different than 800x600
* minor changes
2009-04-16 14:01:27 +00:00
mateuszb
cc631b1362 * next ubuntux's patch
* normalized line endings (CR+LF)
* translated comments in CMessage.cpp
2009-04-16 11:14:13 +00:00
mateuszb
f9ae91d88c * further changes towards support for ranged spells
* added info about author & license in files
2009-04-15 14:03:31 +00:00
Michał W. Urbańczyk
985b4930e4 Major changes to the GUI. Introduced list of interfaces (listInt) containing pointers to all shown interfaces / windows. Only top layer is active and regularly updated.
Windows should be shown using pushInt and closed with popInt or PopIntTotally (if interface needs to be also deleted).
Some things are not working yet properly, I'll try to fix them ASAP.
2009-04-14 12:47:09 +00:00
Michał W. Urbańczyk
f9aebcc4bd * Started making support for garrison window. Leaving guardians in flagged mines. 2009-04-12 00:58:41 +00:00
Michał W. Urbańczyk
d72d988a9c * fixed crash on closing application
* unified yes/no and selection dialog interface calls
* VCMI won't anymore be always giving all three stacks in the starting armies
* fix for drawing starting army creatures count
* support for School of Magic
* support for School of War
* support for Pillar of Fire
* minor changes
2009-04-11 01:32:50 +00:00
Michał W. Urbańczyk
7a9e323297 * fixed 8 hero limit to check only for wandering heroes (not garrisoned)
* srand at the beginning of handleConnection
2009-04-09 15:05:20 +00:00
mateuszb
47bc007d8c Common changes (ours):
* Improvements for console
* Speed bonus support
* Minor improvements
2009-04-04 19:26:41 +00:00
Michał W. Urbańczyk
cb31f5ada3 * Ammo Cart won't get move
* fixed crashes on equipping artifacts
* fixed Wisdom handling
2009-03-29 12:02:37 +00:00
Michał W. Urbańczyk
42773e67f2 * amounts of units taking actions / being an object of actions won't be shown until action ends
* provisional support for "Save" button in System Options Window
* forbidden buildings will be shown as forbidden, even if there are no res / other conditions are not fulfilled
* improved damage calculation formula
* several minor improvements
2009-03-28 00:38:48 +00:00
Michał W. Urbańczyk
516b1e2b00 REMOVED FILES: CPatgFinder.h/cpp
Updated project files for MSVC and automake (I hope I didn't break it)
* Refactored pathfinding and integrated into CGameState. 
* Fixed issues with wrong calculating movement cost at server side
* Hero infowindow won't be redrawed each time experience changes
* Removed memory leaks with CPaths-s
* Support for Sign objects
* Bumped savegame formt version to ensure old not compatible saves won't be readed
* Spellscrolls will disappear on visit (won't be treated as spellbooks anymore)
2009-03-19 14:17:19 +00:00
mateuszb
227d48c12b * fixed bug crashing server when hero was moving near bottom or right edge of the map
* a few improvements in CMinimap.
2009-03-13 14:16:53 +00:00
Michał W. Urbańczyk
5bbc50fc12 * it's possible to stop hero movement
* fixed horde buildings displaying in town hall
2009-03-12 18:50:36 +00:00
Michał W. Urbańczyk
79ae1441ff * support for numpad keyboard
* cannot build more than one capitol
* cannot build shipyard if town is not near water
2009-02-20 15:44:49 +00:00
mateuszb
445653c880 * most of the obstacles (but needs some polishing)
* more appropriate animation of hero casting spell
2009-02-09 14:50:32 +00:00
mateuszb
0070c93888 * more support for attacking stacks for back by two hex stacks
* minor typo fixed
2009-02-05 14:44:27 +00:00
Łukasz Wychrystenko
b54a3bfb7c unified guardians names 2008-12-26 01:46:53 +00:00
Łukasz Wychrystenko
633b0007ba some warning & code cleanup - nothing significant 2008-12-21 19:17:35 +00:00
mateuszb
99691b0f11 * fixed compilation error
* added frenzy spell
* repaired order in stack queue in case a unit has waited (it should work correctly now)
* added spell positiveness info, positive spells cannot be cast on hostile stacks and vice versa
2008-12-20 17:08:51 +00:00
Michał W. Urbańczyk
3a66dc2b7c * added heroes pool for heroes available for hiring
* better handling disposed/predefined heroes
* blocked scrolling adventure map with mouse when left ctrl is pressed
* scholar will be accessible from the top
* partially done tavern and hero recruitment
* fixed bug with formation button in hero window
* unified hero initialization code
* minor changes

For 0.63c dev release
2008-10-26 20:58:34 +00:00
Michał W. Urbańczyk
2d01e00284 Added some kind of simple chatting functionality through console. Implemented several WoG cheats equivalents:
* woggaladriel -> vcmiainur 
* wogoliphaunt -> vcminoldor 
* wogshadowfax -> vcminahar 
* wogeyeofsauron -> vcmieagles 
* wogisengard -> vcmiformenos 
* wogsaruman -> vcmiistari 
* wogpathofthedead -> vcmiangband 

Minor changes.
2008-10-18 23:20:48 +00:00
Michał W. Urbańczyk
89cb5cb81b * added calls for battle action start/end
* added interface for casting spells
* artifact info in backpack
* artifacts we pick up on the map go to the appropriate slot (if free)
2008-09-28 21:01:49 +00:00
mateuszb
a4afdc7145 * minimap shows all flaggable objects (towns, mines, etc.)
* minor optimizations
2008-09-26 14:16:01 +00:00
Michał W. Urbańczyk
41acf5528c * spells in the guild visible again
* garrisons on adv. map again available from all directions
* working Subterranean Gates, Monoliths
* minor code reorganizations
2008-09-23 10:58:54 +00:00
Michał W. Urbańczyk
856698bd80 * fixes for MSVC (it needs to have global variables from library explicitly exported)
* renamed logging variables to tlogX ('_' in var names looks ugly)
* cleaned it improved setting formations
* fixed crashbug on maps with random hero
2008-09-19 08:16:19 +00:00
Michał W. Urbańczyk
70673674dc * setting army formation
* minor changes
2008-09-18 13:54:54 +00:00
Vadim Glazunov
387f8230cf gcc fixes 2008-09-09 21:10:24 +00:00
Michał W. Urbańczyk
3d147a7be8 * version set to 0.63
* mostly done morketplace
* more logging around netcode
2008-09-07 03:38:37 +00:00
Michał W. Urbańczyk
bca18a31c3 * fixed crashes when town is placed out of the map boundaries
* for screen is updated after buying creatures
* fixed crashbug on maps with random monster
* proper images of war machines are displayed in blacksmith
* picking starting hero should work again
* Ice Elemental will be treated as two-hex creature
* minor fixes
2008-08-29 21:41:32 +00:00
Michał W. Urbańczyk
7722d058f0 Fixed issues reported by Zamolxis:
* dismiss Hero works blocked in the castles
* the backpack scrollable arrows aren't available (yellow, clickable) even when backpack is empty.
* added missing info texts for buttons in hero window (and added functionality of enable tactic formations button)
* can select (single click) and enter castle (double click) from the map. Same for hero.
* Hero gets automatically selected after End Turn 
* Hero is automatically selected when exiting town
* In Garrison or Hero army: units are selected when we first click on them
Fixed (at least partially) also a problem with disappearing path
2008-08-28 17:36:34 +00:00
Michał W. Urbańczyk
e856ad21a9 * fixed crashbug on loading maps with events giving creatures
* added confirmation window when hero is dismissed
* finished mage guild screen
* fixed some crashbugs with hero window on adventure interface
* fixed giving wrong war machines on start
* added blacksmith functionality
2008-08-27 10:19:18 +00:00
Michał W. Urbańczyk
6613955463 * hero placed in the town starts as visiting hero, not garrisoned
* if hero doesn't have a spell book, he can buy one in a mage guild
* improvements in closing
* fixed crash on picking artifact
* added event message when picking artifact
* fixed problems with disappearing pikemen
* InfoWindow will be properly centered
* hero portraits again visible in PreGame
* fixed problems with handling Pandora's Box
* support for Campfires
* minor changes
2008-08-25 10:25:16 +00:00
Michał W. Urbańczyk
1c7e3718a7 * swapping artifacts (needs testing)
* various improvements and fixes for interface
* put changelog into ChangeLog
2008-08-20 19:02:48 +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
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
6e02c1c5db * corrected typo in cr_shots
* recruiting creatures
2008-08-10 04:46:16 +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
b4f383f196 Slowly recovering object scripts. 2008-07-30 17:51:19 +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
0c139e72f5 More changes for netcode/serialization
Removed not needed stuff
2008-07-25 17:28:28 +00:00
Michał W. Urbańczyk
1b73678b7c Fighting with includes. 2008-07-02 08:39:56 +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
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
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
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
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
54f94cf5ef a bit of escaping battlefield (to be finished) 2008-04-15 16:52:31 +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
mateuszb
fc4e0215fb * moving units and some minor improvements 2008-03-29 10:59:18 +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
7b88f4a70b another piece of battles (with code reorganization) 2008-03-14 18:24:37 +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
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
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
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
21ec0b77d4 code cleanups, etc. 2008-02-03 15:24: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
b675de7ca5 * support for Inferno
* started doing splitting/merging stacks
2008-01-29 22:47:43 +00:00
Michał W. Urbańczyk
e6de19e17d * town visiting
* improvements in garrisons
2008-01-28 14:01:09 +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
mateuszb
8da051febf Wspólne zmiany (Common changes)
* fixed heroWindow
* started making garrisons
2008-01-26 19:36:31 +00:00
Michał W. Urbańczyk
f518ffdfac Handling custom properties of resources (except of guards). 2007-12-28 00:00:57 +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
e427974875 * code reorganization
* minor stuff for resource <-> infoBar interaction
2007-12-22 14:40:27 +00:00
Michał W. Urbańczyk
aef05b45fc More bugfixes. 2007-12-09 12:42:45 +00:00
Michał W. Urbańczyk
ae0be1f79e Bugfix - it should work now. 2007-12-06 19:06:07 +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
Michał W. Urbańczyk
fa5079809f Partially done resources. 2007-11-25 13:16:45 +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
Michał W. Urbańczyk
4f316cd7e6 Our changes.
Restructured instances classes.
Still very instable.
2007-10-27 19:38:48 +00:00
Michał W. Urbańczyk
2286d37012 * added #42 and #30
* one more file for AIs
2007-10-19 21:12:37 +00:00
mateuszb
355e21b56a * finishing hero flags
* some things with #36 and #41
2007-10-16 17:46:01 +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
mateuszb
d530bd057d * fixed some issues with hero moving; actualizing hero position is still broken :( 2007-10-03 19:56:08 +00:00
Michał W. Urbańczyk
7b3c270dfc - Initializing movement points (t.#16)
- minor improvements
2007-10-03 18:53:49 +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
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
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
Michał W. Urbańczyk
2030a6793f Empty function for hero movement 2007-08-29 10:05:50 +00:00
Michał W. Urbańczyk
210123ac33 * improved minimap
* live event handling on adventure map
* added CCallback
* minor stuff (as usual)
2007-08-27 14:15:03 +00:00