games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Code Issues Releases Activity
3,260 Commits 21 Branches 61 Tags 103 MiB
06f0a29b31
Commit Graph

62 Commits

Author SHA1 Message Date
Ivan Savenko
4724ccbb45 - fixes #1276 
- minor fix to json arrays merging
- fixed update of growth icons on town screen
 2013-05-30 18:43:45 +00:00
Ivan Savenko
8297102350 - some groundwork for wog optionality 
- moved wog artifacts to wog mod
 2013-04-25 21:50:55 +00:00
Ivan Savenko
8273f323b1 - it is possible to edit data of another mod or H3 data via mods 
- mods can access only ID's from dependenies, virtual "core" mod and itself (optional for some mods compatibility)
- metadata field for JsonNode, used to track source mod
- moved wog creatures into wog mod
- (linux) convertMP3 option for vcmibuilder for systems where SDL_Mixer can't play mp3's
 2013-04-25 14:03:35 +00:00
Ivan Savenko
c6cc6e6301 Large changeset, first part of editing H3 objects via mods feature. Changes: 
- loading of all objects (including H3 objects) will be directed by mod handlers
- common base for all handlers accessible from mod system (IHanderBase)
- json format changes: use struct with string ID's instead of vector

- fixed some gcc/clang errors and warnings
- fixed several cases of memory leaks and invalid memory access (mostly related to usage of bonus system and/or identifiers resolution)

Note that right now loading is much slower than before due to excessive json validation (or not fast enough validator)
 2013-04-21 12:49:26 +00:00
Ivan Savenko
2d89e643c6 - some optimizations to validator - should be a bit faster now 2013-04-12 20:49:02 +00:00
Ivan Savenko
0cf969d508 - console logger by default uses same format as previously (no extra data) 
- a lot of changes in configs;
- - update to creature format - abilities are now json structure
- - multiple bugfixes revealed by validation
- made schemas a bit more strict
- creatures data can be replaced via mods
- it is possible to validate vcmi configs using schemas (disabled)
 2013-04-11 19:24:14 +00:00
beegee1
c7c2686379 - Integrated the logging API into the client and the lib - Remove some more comments and switched to /// style - Fixed recursive locks - Added Global.h to CMakeLists(now visible in qt-creator) - Removed usage of shared_mutex - Added unique_ptr to CLogger targets 2013-04-09 14:31:36 +00:00
beegee1
ee51c5beb5 - Renamed /lib subfolders to lowercase 2013-04-07 10:48:07 +00:00
Ivan Savenko
52e56693ea - fixed handling of incorrect configuration in settings.json 
- more compact schema for siege node
 2013-04-03 13:39:46 +00:00
Ivan Savenko
0307639c32 properly initialize settings when configuration was not found 2013-04-02 21:39:32 +00:00
Ivan Savenko
c927913f5f - Improved json validation. Now it support most of features from latest json schema draft 
- Set of schemas in config/schemas directory that are used to validate input from mods.
 2013-04-02 17:06:43 +00:00
Ivan Savenko
c4c592b773 - bugfixing: #1243, #1227, #1241, #1236, #1233 2013-03-14 20:44:00 +00:00
alexvins
f686edc1b8 Cleanup 
* simplify JSON values getting
* ensure initialization of Bonus fields
 2013-03-14 17:21:16 +00:00
Ivan Savenko
b413d80ccc - better logging of some config files errors 
- restored lvl 10 for some dragons
 2013-03-09 13:16:35 +00:00
Ivan Savenko
b4e54f76ea - split heroes.json in manner similar to creatures\factions 
- string ID's for H3 heroes
- data in vcmi configs for heroes will replace data in h3 txt's
 2013-03-03 18:00:37 +00:00
alexvins
2cb86d84fa [refactor] 
+ crexp parser: parse mind immunity
 2013-02-25 12:18:45 +00:00
alexvins
856c7feeba [refactor] 
* creature config use string ids now
+ support string subtype id in short bonus format
* crexp parser: less magic nombers
 2013-02-23 22:48:22 +00:00
mateuszb
560315bc48 * SlotID refactoring 2013-02-16 14:03:47 +00:00
mateuszb
86dc9386d6 * refactoring, including a generic solution for IDs 2013-02-10 23:24:57 +00:00
mateuszb
f1c78e3260 * creature ID refactoring 
* double week creatures are configurable now
 2013-02-07 17:34:50 +00:00
mateuszb
c4e03ef0de * enum serialization/deserialization (si32 as basetype ought to be enough for anybody) 
* some fields in classes refactored to use appropriate enums (not yet finished)
 2013-02-01 22:04:25 +00:00
DjWarmonger
fff7909958 - Fix for hero specialties (creature type limiters) 
- Improved handling of new heroes / arts, check forum for fresh mod packages :)
 2013-01-20 16:31:18 +00:00
DjWarmonger
1e90de3c9f Some more fixes for limiters and specialties. 2013-01-19 18:52:13 +00:00
DjWarmonger
79062eb15c - Parsing hero specialty is working (though complicated) 
- Some obvious fixed for limiters, more work needed
 2013-01-19 17:38:37 +00:00
DjWarmonger
97db289d3c Parsing for CREATURE_TYPE_LIMITER 2013-01-18 11:49:15 +00:00
alexvins
36469f406c Fix results of merge conflict with Warmonger. + more fixes to barseBonus. 
Bonus duration now can be array and parsed to bitmask as designed.
 2013-01-16 16:41:01 +00:00
DjWarmonger
d7c9377843 - Parsing propagators and limiters 
- Experimental support for chaining limiters
- Added missing abilities, propagators and limiters to artifacts
- Sketch of Calculator for bonuses, ignore it for now
 2013-01-16 13:02:01 +00:00
alexvins
53b684180d [refactor] 
* use spells configuration (all timed effects for battle spells)
* a few more cleanups
+register erm resource types (useful in future and less noise in log now)
 2013-01-16 11:19:04 +00:00
DjWarmonger
1807a8a536 - Bonus subtype will now be resolved using string identifiers. 
- Registered secondary skills and resource names in identifier pool
 2012-12-26 09:46:09 +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
alexvins
c0ce8712c1 add some missing licence headers 2012-12-19 14:54:10 +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
04358ed0c6 multiple changes in config system, breaks existing mods. See upcoming post on forums. 
- filesystem initialization works in conjuction with modHandler
- (config) split buildings.json in multiple files in "factions" directory
- (mods) merged filesystem.json and config/mod.json into mod.json
 2012-12-12 11:13:57 +00:00
Ivan Savenko
c9dd80ea6d - moved json-related functions (e.g. ParseBonus) into JsonUtils namespace 
- replaced JsonNode::toStdVector with more universal convertTo
- some renaming in StartInfo
 2012-12-02 12:21:44 +00:00
Ivan Savenko
2cd774fe42 - gcc 4.5 compatibility 2012-11-02 20:08:37 +00:00
Ivan Savenko
306d64b0c4 - it is possible to read json file with vector 
- town configuration:
- - all town-related texts are now in TownHandler
- - alignments are now part of faction
- - removed CTown::bonus field
 2012-10-05 13:11:26 +00:00
mateuszb
652ea4036e * artifact bonuses are read from config file now 
* removed two commented-out methods
 2012-10-03 18:11:19 +00:00
Ivan Savenko
a602d7e9da - build system update 
- compile\warning fixes
 2012-09-29 12:02:46 +00:00
DjWarmonger
ecda63683e Fixed Bonus parser crashing at unspecified value. Assigning empty objects is also not good solution. 2012-09-27 17:58:14 +00:00
mateuszb
af133ae758 * experimental support for bonus limiter/propagator loading from json (not turned on yet) 2012-09-27 16:48:46 +00:00
mateuszb
8dca88c3c8 * start map in campaign button is properly disabled/enabled (I hope) 
* exported json for artifact bonuses; no limiters/propagators yet, so it's not used
* minor changes
 2012-09-26 18:10:29 +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
44cc848edc first part of town configuration: 
- moved almost all loading to TownHandler
- CBuildings and CStructures are now part of CTown
- merged hall.json into buildings.json

Should not cause any crashes or glitches
 2012-09-02 10:33:41 +00:00
DjWarmonger
d56e7c568a Added full parser for Bonus structure, as described in http://wiki.vcmi.eu/index.php?title=Bonus_Format 
Untested.
Limiters / propagators are not yet supported.
 2012-08-23 18:46:43 +00:00
Ivan Savenko
e67f8afdd9 - removed multiple unused files 
- config folder with all json files is used via new FS API
- fixed campaigns loading. Replaced "detect h3m starts" heuristics with CCompessedStream::getNextBlock()
 2012-08-02 11:03:26 +00:00
Ivan Savenko
e4c88d5088 - moved ParseBonus to JsonNode.cpp (linkage errors) 
- fixes to CMakeLists - vcmi can be compiled and started with cmake
- gcc\clang warnings fixes
 2012-07-19 18:52:44 +00:00
DjWarmonger
cf45239332 Fixed #1035. 
Support for commander artifacts that accumulate bonus after battle.
 2012-07-16 16:18:02 +00:00
Ivan Savenko
8c6965c5ee - shadows for CWindowObject-based windows 
- better error messages on read error
- fixed crash on level-up window
 2012-06-16 10:41:14 +00:00
Ivan Savenko
86e7d96b39 - setting system: replaced settings.txt + sysopt.bin with json-based system (defaultSetting.json + settings.json) 
- some work on system settings window
- new menu for selecting resolution (reused town portal graphics), can be opened from system settings
 2012-01-12 15:23:00 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00