 AlexVinS
|
a59f0c23ce
Dedug tweaks
|
9 years ago |
|
AlexVinS
|
5a92e0de2b
Small redesign
|
9 years ago |
|
AlexVinS
|
22b93106c8
Experimental drafts of Json serializer
|
9 years ago |
|
AlexVinS
|
a307d3ca40
tweaks
|
9 years ago |
|
AlexVinS
|
fb17914ae5
Debug tweaks
|
9 years ago |
|
AlexVinS
|
3c78f960cd
Complete json map format integration
|
9 years ago |
|
AlexVinS
|
0c21efb202
Start integration of map format into engine
|
9 years ago |
|
AlexVinS
|
6db94ab74c
Explicit army serialization - too much CArmedInstance descendants
|
9 years ago |
|
AlexVinS
|
53dc49e92a
CGShipyard, CGShrine serialization
|
9 years ago |
|
AlexVinS
|
401ba48257
CGScholar serialization
|
9 years ago |
|
AlexVinS
|
a00dbd3dd1
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
|
9 years ago |
 ArseniyShestakov
|
890ae43f55
Merge pull request #180 from Zyx-2000/FileInfo
|
9 years ago |
|
Arseniy Shestakov
|
a13aec4fd7
Aplly some fix for merge and explicitly specify type for std::max
|
9 years ago |
|
ArseniyShestakov
|
5f23091770
Merge pull request #184 from Zyx-2000/musicstreaming
|
9 years ago |
|
ArseniyShestakov
|
54eb9bf81a
Merge pull request #192 from vmarkovtsev/feature/petrified_damage
|
9 years ago |
 DjWarmonger
|
441c94d56c
Remove log for Seer Huts.
|
9 years ago |
|
DjWarmonger
|
6f5706352d
Possible fix for #2371
|
9 years ago |
|
AlexVinS
|
081a20d047
Fix a crash.
|
9 years ago |
|
AlexVinS
|
a3f0d1a94e
More post-merge fixes
|
9 years ago |
|
DjWarmonger
|
b98a83f743
Added string identifiers for terrain types.
|
9 years ago |
|
AlexVinS
|
483276b128
Merge fixes
|
9 years ago |
|
AlexVinS
|
6e205a58b4
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
|
9 years ago |
|
AlexVinS
|
97f19b5176
CGResource serialization
|
9 years ago |
|
AlexVinS
|
d8d574ed84
CGSignBottle serialization
|
9 years ago |
|
AlexVinS
|
a6c719ee11
CGCreature serialization. Added rewardResources.
|
9 years ago |
 Vadim Markovtsev
|
4a326e163b
Implement blinded units attack penalties
|
9 years ago |
|
DjWarmonger
|
e7b639898e
Final compilation fix suggested by AVS.
|
9 years ago |
|
AlexVinS
|
1bc41b3ba3
Merge commit '3c844002626f48007a888d4dd8b0b45ec867fc9a' into feature/VCMIMapFormat1
|
9 years ago |
|
AlexVinS
|
b176734418
CGCreature serialization
|
9 years ago |
|
DjWarmonger
|
0c82419fb0
Final compile fix, unfortunatelly game fails to launch now due to missing fill_fopen64_filefunc in minizip.dll :(
|
9 years ago |
