games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
7,729 Commits 19 Branches 62 Tags 112 MiB
9c8d776398
Commit Graph

33 Commits

Author SHA1 Message Date
John Bolton
a05ae78e67 Fixed lots of warnings. 
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
 2020-10-04 02:20:18 -07:00
Michał Kalinowski
ac6b477aa2 Simplify statements 
-Simplify return statements across the code
 2019-03-31 09:43:14 +03:00
Michał Kalinowski
26a222ac62 Change JsonType to enum class (#393) 
Change enum JsonType to enum class JsonType
 2017-11-27 00:18:18 +03:00
AlexVinS
2f7968b803 Fixed wrong animation paths 2017-09-04 18:41:22 +03:00
AlexVinS
15138c23de Finished conversion to new logging API 
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
 2017-08-11 23:06:27 +03:00
AlexVinS
61e241308d Logging cleanup 2017-08-10 19:52:05 +03:00
Arseniy Shestakov
f1e5797834 Code style: move or add licensing information on top of every file 2017-07-14 01:26:03 +03:00
FeniksFire
1f215d2306 Fix http://bugs.vcmi.eu/view.php?id=2677. 2017-05-28 12:23:03 +02:00
AlexVinS
a85b4cf2a5 * WIP on event condition format 
* Hero portrait serialization
* Fix town spells serialization

* Added support for float exponential part in Json
* Added support for int64 in Json
* Added basic Hero definitions serialization
* Added rumors serialization
* Advanced player info serialization.
* Added Disposed heroes serialization, (!) not covered with tests yet
* Added Local event serialization
* Added Pandoras box serialization
* Added Seer hut reward serialization
* Added CQuest serialization
* Added API for map object instance names serialization.
* Added random dwelling options serialization
* Advanced town options serialization
* Advanced hero options serialization
* More map format tests
* A lot of fixes, cleanup and refactoring
 2017-05-27 00:23:19 +03:00
AlexVinS
a109580b91 Use const for ObjectTemplate 2016-09-08 18:06:28 +03:00
AlexVinS
114dac7e81 Added ObjectTemplate copy constructor and assignment operator 2016-09-08 17:02:59 +03:00
DjWarmonger
2410f0af61 - WeightedRule optimization - part 1 
- comments, style
 2016-08-11 07:49:08 +02:00
DjWarmonger
2bffd4e5c1 Moar optimization! 2016-08-09 13:40:46 +02:00
AlexVinS
5408b6c1ff Formatting 2016-02-26 18:19:41 +03:00
AlexVinS
0de1a37d65 Fix missing template zIndex saving 2016-02-26 01:01:07 +03:00
AlexVinS
64cb0267a3 Do not save "visitableFrom" if object do not have active tiles. 2016-02-22 03:22:10 +03:00
AlexVinS
a00dbd3dd1 Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1 
Conflicts:
	lib/CMakeLists.txt
	lib/VCMI_lib.cbp
	lib/filesystem/CFileInputStream.cpp
	lib/filesystem/CZipLoader.cpp
	lib/rmg/CRmgTemplateZone.cpp
	vcmi.workspace
 2016-02-08 10:17:25 +03:00
Arseniy Shestakov
a13aec4fd7 Aplly some fix for merge and explicitly specify type for std::max 2016-02-08 04:09:02 +03:00
DjWarmonger
6f5706352d Possible fix for #2371 2016-02-06 12:36:56 +01:00
AlexVinS
8a979d016f ObjectTemplate serialization 
(+) generated map displayed correctly in editor
 2015-12-05 12:36:44 +03:00
AlexVinS
2d777ea676 Small (temp) fix. Prevent nulls from serialization. 2015-12-05 12:36:43 +03:00
AlexVinS
9cc3dae5fe Started working on objects serialization 2015-12-05 12:36:42 +03:00
DjWarmonger
a832b7efee Fixed #2026 2015-03-12 10:08:10 +01:00
DjWarmonger
f894abe494 Unified interface for object template. 2015-03-12 08:31:30 +01:00
DjWarmonger
6c0a396094 Corrected y-axis orientation, now object placement is correct. 2014-07-09 16:39:17 +02:00
DjWarmonger
492b866806 - Fixed crash caused by randomShuffle 
- Banned Magic Spring as it has 2 visitable positions
 2014-07-09 14:27:12 +02:00
DjWarmonger
22d26db694 Correct placement of non-overlapping objects. 2014-07-08 20:13:51 +02:00
DjWarmonger
920f56969b Create random obstacles that match terrain. 2014-06-28 09:46:32 +02:00
DjWarmonger
79036484dd Trying to sort out project changes and compile issues. 2014-06-23 19:58:19 +02:00
Ivan Savenko
0a71e89f58 Created large number of missing objects in configs 
Minor bugfixes in code
 2014-06-17 14:57:47 +03:00
Ivan Savenko
09d595e385 - Implemented "mapObject" entry for hero classes 
- Updated schemas
- Some bugfixing
 2014-06-16 19:27:26 +03:00
Ivan Savenko
b2e8c92383 Cleanup: 
- removed commented-out #includ'es
- renamed some files to match name of class
 2014-06-05 20:26:50 +03:00
Ivan Savenko
0afdfa529c Moved all object-related files to lib/mapObjects directory. 
Renamed some classes to more readable names
 2014-06-05 14:19:47 +03:00