1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-30 23:18:08 +02:00
Commit Graph

63 Commits

Author SHA1 Message Date
alexvins
065b8366fb [Spells] Added basic support for icons and sounds
* few changes in spell format
* save format changed
2014-03-10 16:00:58 +00:00
Ivan Savenko
2c4c964a45 Large rewrite of adventure map objects:
- replaced CDefObjInfo with ObjectTemplate class
- ObjectTempate is a direct member of objects instead of pointer with
shared ownership across CMap, handler and game objects
- simplified handling of objects that can change appearance (e.g. towns)
- all object queries regarding object appearance/blockmaps use h3m pos
instead of relative positions
- removed need of modhandler::reload
- cleanup of some old code
2014-01-02 23:48:38 +00:00
Ivan Savenko
2b45e13c5c c++03 -> c++11 switch:
- use std versions of function, bind and ref
- OVERRIDE -> override
- NULL -> nullptr
- use std versions of random distributions

NOTE: this may be last revision that supports gcc-4.5
2013-06-26 11:18:27 +00:00
Ivan Savenko
3285f1910b - finally, solution for imageIndex fields. All image lists will be generated in runtime
- iconIndex fields from json are no longer used
- simple check for missing icons on startup
2013-04-22 19:51:22 +00:00
beegee1
30bcec42c6 - Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui 2013-04-07 11:52:07 +00:00
mateuszb
dbec99ffc7 * PlayerColor and TeamID refactoring 2013-03-03 17:06:03 +00:00
Ivan Savenko
da6cb0ae12 - trade windows work with new creatures\artifacts
- removed some duplicated code in creature loading
2012-12-23 10:23:41 +00:00
Ivan Savenko
b5ebf443fc - all fonts handling is now in new file, UIFramework/Fonts.cpp/h
- common base class for H3 bmp and ttf fonts
- replaced fonts.txt with fonts.json
2012-12-19 17:24:53 +00:00
Ivan Savenko
e36bc50504 - support for new heroes and hero classes
- moved hero-specific data from text handler to CHero
- moved hero classes-specific data into heroClasses.json
2012-12-16 13:47:53 +00:00
Ivan Savenko
ffe8b99369 - reorganized hero classes
- artifact iconIndex should work
- new file with hardcoded string constants: lib/StringConstants.h

Note: some minor bugs, will fix soon:
- slow to open hero window
- hero adventure map images serialization is broken\incorrect
2012-12-14 15:32:53 +00:00
Ivan Savenko
e3231db1c9 - primaryResource and warMachine now use string ID
- fixed long delays on moving units in garrisons
- fixed bug on loading available spells from map
- removed unused bigImgs from Graphics
2012-12-11 12:12:46 +00:00
Ivan Savenko
1c5a4c669c - merged minimap.json into terrains.json
- removed no longer used fields from Graphics + portraits.json
 - work on pregame:
 - - new code for map options window icons + popups
 - - fixed bugs related to new towns
 - - less hardcoded magic numbers
2012-12-10 14:28:27 +00:00
DjWarmonger
730cbd930a Parsing for new artifact format: http://wiki.vcmi.eu/index.php?title=Artifact_Format
Not finished, not tested.
2012-12-10 13:55:54 +00:00
Ivan Savenko
f7915d9e61 - removed creature-related code from ModHandler
- new towns can be loaded as mods
 - removed separate DefInfos for towns\capitals
 - a bit simpler handling of adventure map def's
2012-11-13 11:52:23 +00:00
Ivan Savenko
c071a03a8a - fix for #1135
- merged wall_pos.json into town config
- removed tower_shooter field from creatures.json
2012-10-05 18:03:49 +00:00
Ivan Savenko
0ca9f64573 Next part of town configuration:
- town screen is mostly implemented, has some minor issues
- factions are now separate from towns, neutrals have faction with id=9
- more constants to GameConstants: town-specific buildings, strings for terrains and resources
- replaced most access to builtBuildings with isBuilt() method
- replaced id's with enums for town subtype and buildings id's
2012-09-05 12:49:23 +00:00
Ivan Savenko
13de841e10 - minor tweaks to quest window
- fixed #531
- fixed query crash (empty funciton)
2012-07-21 20:16:54 +00:00
Ivan Savenko
9d2711fb51 - rewrote most of classes from adventure map window
-- new files: client/AdventureMapClasses.*
-- implemented all missing details from infobox
- textinput can handle numbers as input
- fixed several bugs caused by CIntObject changes
- fixed #988
2012-06-13 13:04:06 +00:00
beegee1
156aa6e4d9 * Updated class - file - handling
* Renamed color constants
* Renamed class AdventureMapButton to CAdventureMapButton
* Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses
* Moved new creature window from GuiClasses to CCreatureWindow
2011-12-22 13:05:19 +00:00
beegee1
2f5d6f2684 * CHexField renamed to CBattleHex
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
2011-12-17 18:59:59 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface
Introduction of pre compiled headers,...
2011-12-13 21:23:17 +00:00
ori.bar
5b836f428a Partial fix for 37. Full fix for 27, 64, 600. Fix for bug where code tried to reload non existent file. 2011-09-04 00:04:48 +00:00
mateuszb
5e0b0e49b2 * bug 392 fixed 2011-02-23 18:21:51 +00:00
mateuszb
b4edd10e6c * beegee's comments patch
* very minor changes
2011-02-22 11:52:36 +00:00
mateuszb
49083c4e5a * ConstTransitive CGI more or less done
* hch contents distributed to more appropriate folders
2010-12-20 21:22:53 +00:00
mateuszb
b15deaa203 * more constTransitivePointers in GameInfo, separated client GUI classes from it, moved def handlers from CGDefInfo 2010-12-19 14:39:56 +00:00
mateuszb
6ebfe25f86 * compile fixes & minor changes (I hope they are correct, SComponent::setSurface didn't return any value and failed to compile - I'm not sure if I return proper value). 2010-08-19 15:24:32 +00:00
Ivan Savenko
8319e5e703 - town events implemented
- merged CustomImagecComponent into SComponent
- moved some subID-related code from CastleInterface
2010-08-18 14:24:30 +00:00
mateuszb
9aa6d0a7b9 * refactoring of map handler and minor changes 2010-08-16 13:51:31 +00:00
mateuszb
9445e5b184 * small refactoring
Please don't touch CGI->state directly in client code - use callbacks instead. I'd like to make some mechanics-critical handlers in CGI const - a lot of work, certain changes have been done here.
2010-08-16 09:54:09 +00:00
Michał W. Urbańczyk
d0ff61807d Obtaining town instance pointer via cb. Plz, don't access gamestate directly from player interface! Everything has to go via callback.
Commented out giving starting artifact - new artifact randomization make it crashing. Please fix it.

New control - CTextBox - for multi-line text with optional slider. Used it for map description and info windows. Related changes. Fixes #22 and #96.
2010-07-06 02:10:26 +00:00
Michał W. Urbańczyk
80f49badc9 Implemented Scuttle Boat and Dimension Door spells.
Fixed #417 and #418.
Moved / refactored some code. Minor fixes.
2010-03-20 22:17:19 +00:00
Ivan Savenko
3aefb896fe - Created config file for true type fonts (disabled by default)
- Implemented buildings with bonuses for defending hero (glyphs of fear, fountain of fortune, some grails)
- Minor fixes
2010-02-04 15:50:59 +00:00
Ivan Savenko
0f22ba0c0f - First part of kingdom overview window (not a 100% stable)
- Implemented town buildings: dwarven treasury, ballista yard, partially - mystic pond
2010-01-25 21:25:14 +00:00
Ivan Savenko
def041a8c9 #39 and #106 - fixed cosmetic buildings behaviour
#102 - fixed config + requirements system
#161 - extended clickable rectangle
and some minor fixes
2009-12-29 13:40:16 +00:00
mateuszb
f22570712e * again, please don't include headers in headers if not necessary
* minor changes
2009-10-26 15:01:12 +00:00
OnionKnight
95808db933 * Right-click info window for castles and garrisons you do not own shows a rough amount of creatures instead of none.
I don't really know under which circumstances no information at all is shown in the original H3 so I haven't dealt with that.
2009-10-25 19:32:02 +00:00
Frank Zago
c7a307dfed Compile fix. 2009-08-18 01:57:39 +00:00
Michał W. Urbańczyk
b4070c6b3e Third part of GUI reorganization:
* Rewritten pregame
* FNT fonts support
* Several additions to GUI system. 

Changes are significant, some things may be broken.
2009-08-17 08:50:31 +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
b551f6a72b Partially done support for external creature dwellings. 2009-07-06 19:41:27 +00:00
Michał W. Urbańczyk
9aff190899 Added palette colors for neutral "player" (Thx to Dru). Support for using them via blueToPlayersAdv(surface, 255). 2009-06-30 15:36:12 +00:00
mateuszb
ae3fa69134 * next part of exchange window
* changed some CDefHandlers to CDefEssential (the second is less memory consuming)
* minor changes
2009-06-17 16:46:16 +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
6ce9a253a4 * support for Redwood Observatory
* support for Shrine of Magic Incantation / Gesture / Thought
* minor improvements
2009-03-14 11:25:25 +00:00
mateuszb
ba9b58d3a4 * moved graphics from CAbilityHandler to Graphics
* reading BALLIST.TXT
* minor changes
2009-02-06 14:15:45 +00:00
Michał W. Urbańczyk
3474fdaf05 * save/load partially working
* Arena and Witch Hut support
* improved support for Resources
* minor fixes and changes
2009-01-10 22:08:18 +00:00
Łukasz Wychrystenko
b54a3bfb7c unified guardians names 2008-12-26 01:46:53 +00:00