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 |
|