1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Commit Graph

1700 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
847a4f222c Further serialization code and refactorings. 2009-01-06 18:42:20 +00:00
Michał W. Urbańczyk
4a8ae4ed9a * restored objects functionalities (hopefully working)
* new file in vcmi lib: IGameCallback.cpp
2008-12-27 01:01:59 +00:00
Łukasz Wychrystenko
d0d60175d7 break, fix and break and fix - now its fine :) 2008-12-26 15:00:34 +00:00
Łukasz Wychrystenko
b54a3bfb7c unified guardians names 2008-12-26 01:46:53 +00:00
Łukasz Wychrystenko
b356524aee corrected that missclick! hope so 2008-12-26 01:15:47 +00:00
mateuszb
b114582857 * corrected indentation
* centered battle interface
* battle cursor while 1024x768 is now correct
* new version of settings.txt from Tow
2008-12-23 13:59:03 +00:00
Michał W. Urbańczyk
ae48e73fe7 * fixed reading .defs
* new system for handling objects and their behaviors, most functionalities don't work now but will be restored soon
* more serialization code, savegame/loadgame bit closer :)
CHANGES IN PROJECT FILES:
* removed CLua.h and CLua.cpp (server)
* removed CScriptCallback.h and CScriptCallback.cpp (server)
* added IGameCallback.h header (lib)
2008-12-22 17:48:41 +00:00
Łukasz Wychrystenko
633b0007ba some warning & code cleanup - nothing significant 2008-12-21 19:17:35 +00:00
mateuszb
6fc8ed9365 * showing spell effects affecting stack in creature info window
* more appropriate coloring of stack amount box when stack is affected by a spell
2008-12-21 11:07:23 +00:00
Michał W. Urbańczyk
7387d2905e * improved support for bigger resolutions (border around castle interface)
* shots proper initialization
2008-12-07 22:38:04 +00:00
Michał W. Urbańczyk
c6bcd61aba * animation of water tiles
* minor changes
2008-11-30 00:15:38 +00:00
Michał W. Urbańczyk
c4bcf7b880 * better support for non-800x600 resolutions
* Merged CPreGameTextHandler into CGeneralTextHandler and moved to VCMI_Lib.dll (update your project files)
* Genius AI will be used as a default AI
* more code for save/load
2008-11-28 01:36:34 +00:00
Vadim Glazunov
9cfa09c076 Some gcc fixups. Automake project updates 2008-11-19 07:55:17 +00:00
Michał W. Urbańczyk
333e1d9878 * started making support for save/load options 2008-11-16 01:06:15 +00:00
Michał W. Urbańczyk
bb5819f4df * support for Wait command (to be tested) 2008-11-15 15:26:08 +00:00
Michał W. Urbańczyk
f6807a2af9 * loading AI dll for neutrals
* hopefully fixed reported by Zamolxis garrison bugs
* fixed calculating hero level
* fixed gicing starting exp for heroes
2008-11-15 00:55:19 +00:00
mateuszb
0cc5571604 * new spell: implosion
* optimizations in def handling
* small refactoring
2008-11-12 18:59:33 +00:00
Michał W. Urbańczyk
89d8bdc069 * Adventure Map interface elements configurable (new screen resolutions possible!)
* Data and Sprites subfolders will can be used for adding files not present in .lod archives
* version set to 0.65
2008-11-12 18:26:23 +00:00
Michał W. Urbańczyk
a1606b2fb3 * partial support for Haste spell
* started making external settings file (will be used for support for non 800x600 screen resolutions)
* minor changes
2008-11-08 22:29:19 +00:00
mateuszb
ceb3cf8eae * magic arrow probably works
* war machines support partially added
* queue of stacks narrowed
* minor fixes
2008-11-06 17:17:48 +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
mateuszb
45204d8beb * displaying spell effects (currently only arrow magic effect is shown)
* minor fixes
2008-10-19 15:41:18 +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
9d099e8c54 * blocked map scrolling where dialog window is opened
* it's possible in battles to check remeaining HP of neutral stacks
* function in CGameInterface called when spell is casted. Support for the Magic Arrow from engine side.
* heroes can regain mana
* support for mistycisim and intelligence skills
* fixed leak with creating frameratekeeper every turn
* minor improvements
2008-10-18 11:41:24 +00:00
mateuszb
20a6e05718 small fixes 2008-10-17 17:43:25 +00:00
mateuszb
929ce79ad4 * general improvements in battles
* calls for spell casting in battles (they usually crash VCMI server)
2008-10-17 16:30:56 +00:00
Michał W. Urbańczyk
4af64f1b9f * fixed blocked shooter behavior
* slowed map scrolling
* minor
2008-10-11 13:14:52 +00:00
mateuszb
538ffb1579 * added support for archery, offence and armorer secondary abilities
* hero's primary skills account for damage dealt by creatures in battle
* magical hero are given spellbook at the beginning
* added initial secondary skills for heroes
* minor fixes and improvements
2008-09-29 11:03:30 +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
mateuszb
6a3d0b666f * directional attack in battles
* CSystemOptionsWindow partially done
* added a few consts and references to improve performance
2008-09-25 14:09:31 +00:00
mateuszb
8bde616908 * mostly done battle options (although they're not saved)
* general improvements in rendering of battle interface
2008-09-24 16:25:14 +00:00
Michał W. Urbańczyk
16303ab1df classes for buttons group and functionlist with arg 2008-09-24 08:15:49 +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
mateuszb
ca1dbfe949 changed most of std::cout to tlogX
Alt+F4 quits the game
2008-09-19 12:09:15 +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
Vadim Glazunov
a1dd7f22f9 gcc fixes(bad idea to call global vars such as log2, this name used by math function). Colored log support on some non-win32 platforms. Small Automake project update 2008-09-18 20:24:53 +00:00
Michał W. Urbańczyk
70673674dc * setting army formation
* minor changes
2008-09-18 13:54:54 +00:00
Michał W. Urbańczyk
629d934810 * moved CConsoleHandler to lib (update project files)
* using winapi for better console handling with MSVC (I hope I didn't break anything at GCC)
* new logging system (use log0 - log5 for different priorities and colors (at msvc))
* using lists for storing activated interface objects
* more proper closing of server
2008-09-17 10:18:22 +00:00
mateuszb
c5c9127673 * fixed a few problems with refreshing screen during blitting using CSDL_Ext::printAtMiddle
* fixed drawbacks in displaying secondary skills in hero window
* fixed two bugs with spellBook
* corrected order of spells in spellBook
* spellBook is opened when hero in battle is left-clicked
2008-09-16 15:23:44 +00:00
mateuszb
cc1b5f37cd * fourth part of spellbook
* small fixes
2008-09-15 16:46:54 +00:00
mateuszb
ae6e260107 * third part of spellBook
* probably finished counterattacking
2008-09-12 13:06:53 +00:00
Michał W. Urbańczyk
e71b40ccc5 * counterattacks
* spells learning
* no tooltips for objects under FoW
* working resource silo
* new system for simple unit abilities/states
* neutral monster army disappears when defeated
* synchronization between client and server processes
* fixed battle ending
2008-09-12 08:51:46 +00:00
Vadim Glazunov
3759675bb2 gcc fixes 2008-09-11 18:42:21 +00:00
mateuszb
e4d8d66de1 second part of spellbook 2008-09-11 12:29:22 +00:00
Vadim Glazunov
df03f4ef78 update automake file 2008-09-10 19:06:23 +00:00
mateuszb
11cef89810 * partially done spell window 2008-09-10 12:19:48 +00:00
Vadim Glazunov
4edd375ddb Some changes to compile again with gcc 2008-09-07 12:13:51 +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
ce6a9ae374 * fixed possible freeze when applying changes in gamestate
* it's impossible to enter not owned town
* giving starting bonus
* other improvements
2008-08-25 21:14:00 +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
0607ec70cf Support for Tree of knowledge and minor changes. 2008-08-22 12:21:09 +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
22ade5efbe * make compatible with boost 1.36.0 (there was breaking change in boost::function)
* randomizing spells in towns
* fixed reading forbidden structures
* support for heroes starting in town garrisons
* hopefully fixed problems with wrong town defs (village/fort/capitol)
* moved CSpellHandler.* to VCMI_Lib (project files must be updated)
* redone reading spell info
* added missing features to the fort screen
* minor improvements

* partially done mage guild screen
2008-08-20 06:57:53 +00:00
Vadim Glazunov
c94fbbf228 Changes to compile under gcc 2008-08-17 14:09:30 +00:00
Michał W. Urbańczyk
61e66fa89c * icon in infobox showing that there is hero in town garrison
* fort/citadel/castle screen
2008-08-17 09:11:16 +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
52f6de2877 Fixed entering/leaving town. 2008-08-13 09:28:06 +00:00
Michał W. Urbańczyk
59b808f4e1 * removing objects (resources, chests, dismissing heroes) 2008-08-13 04:41:11 +00:00
Michał W. Urbańczyk
b89c951d09 * version set to 0.62
* almost redone treasure chest
* working gaining levels for heroes (including dialog with skill selection)
* corrected another typo i cr_shots
2008-08-13 00:44:31 +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
15ff21e84c Battles: attacking, shooting, killing. 2008-08-08 23:02:32 +00:00
mateuszb
92971e0df0 * working minimap's FoW
* properly displayed neutral buildings' flags
2008-08-07 15:09:10 +00:00
Michał W. Urbańczyk
9ec606a40b Battles:
* removed some displaying problems
* showing last group of frames in creature animation won't crash
* added start moving and end moving animations
* fixed moving two-hex creatures
* showing/hiding graphic cursor
* a part of using graphic cursor
2008-08-07 00:38:44 +00:00
Michał W. Urbańczyk
d8eb861117 Battles:
* showing ranges
* improvements in moving
* workaround for neutrals
2008-08-05 23:33:08 +00:00
Michał W. Urbańczyk
c7bb04235c * merged changes in pregame
* portrait initialziaton
* minor
2008-08-05 22:11:32 +00:00
Michał W. Urbańczyk
a5354271e2 * improvements in battle support - moving creatures work though there are small graphic glitches
* @neweagle - I've replaced in VCMI_Lib.h your #ifndef with #ifdef since you modification affected (and broke) compilation only on MSVC. Is it ok now?
2008-08-04 23:04:15 +00:00
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
Vadim Glazunov
038dd90517 Autoconf/automake scripts to easy building. 2008-08-04 09:33:08 +00:00
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
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
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
b3c5f19c0d Proper initialization of the first turn. 2008-07-26 13:57:32 +00:00
Michał W. Urbańczyk
b72d065265 Minor changes/cleanups. Adventure map is shown :) 2008-07-26 06:39:44 +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
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
b26024e607 First part of commit 2008-06-30 00:05:48 +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
4347996353 Cleanups + started splitting 2008-06-12 06:45:51 +00:00
Michał W. Urbańczyk
feaa2396a6 Code cleaning/refactoring 2008-06-07 17:16:52 +00:00