games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity
6,608 Commits 22 Branches 61 Tags 102 MiB
4f8c7bd4bb
Commit Graph

102 Commits

Author SHA1 Message Date
AlexVinS
02ae95aca3 Fixed random map format test crash 2017-06-14 12:40:46 +03:00
AlexVinS
96bc191480 Fixed CID 1366296 2016-11-26 21:45:58 +03:00
AlexVinS
dc1015fac9 Fixed CID 1197411 2016-11-25 21:51:27 +03:00
Vadim Markovtsev
c696746017 Fix some compilation warnings 2016-10-28 08:07:05 +02:00
Vadim Markovtsev
89f506658e Fix issue #2068 - maps list update 2016-10-16 22:15:37 +02:00
AlexVinS
34a494ade0 hack-fixed http://bugs.vcmi.eu/view.php?id=2533 2016-10-02 12:39:25 +03:00
AlexVinS
49e2bde3c0 Mostly complete fix for http://bugs.vcmi.eu/view.php?id=2429 2016-09-11 16:02:45 +03:00
Arseniy Shestakov
9296382bc6 More fixes for clang warning... 2016-09-08 19:58:01 +03:00
AlexVinS
63500042e8 Fixed memory leak in CCompressedStream 2016-08-22 12:56:05 +03:00
AlexVinS
3c78f960cd Complete json map format integration 2016-02-10 07:28:00 +03:00
AlexVinS
0c21efb202 Start integration of map format into engine 2016-02-09 20:20:03 +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
ArseniyShestakov
890ae43f55 Merge pull request #180 from Zyx-2000/FileInfo 
Refactored CFileInfo & ResourceID
 2016-02-08 04:55:39 +03:00
AlexVinS
a3f0d1a94e More post-merge fixes 2016-02-05 09:28:36 +03:00
AlexVinS
483276b128 Merge fixes 2016-02-04 12:28:12 +03:00
AlexVinS
6e205a58b4 Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1 
Conflicts:
	lib/VCMI_lib.cbp
	lib/filesystem/CZipLoader.cpp
	lib/filesystem/CZipLoader.h
	lib/mapObjects/CGTownInstance.cpp
 2016-02-04 10:27:51 +03:00
DjWarmonger
e7b639898e Final compilation fix suggested by AVS. 2016-02-03 14:26:25 +01:00
AlexVinS
1bc41b3ba3 Merge commit '3c844002626f48007a888d4dd8b0b45ec867fc9a' into feature/VCMIMapFormat1 
Conflicts:
	lib/mapObjects/CGHeroInstance.cpp
 2016-02-03 05:04:44 +03:00
DjWarmonger
7cf2d79584 Final compile fix. 2016-02-02 18:48:20 +01:00
DjWarmonger
6865f70ab8 Compile fix #1 2016-02-02 12:19:33 +01:00
Zyx-2000
7fbd5479e2 alignment & makefile fix 2016-01-29 16:08:44 +01:00
Zyx-2000
2b88de8e24 added new files 2016-01-29 15:39:44 +01:00
Zyx-2000
523bc22a30 removed old files 2016-01-29 15:32:37 +01:00
Zyx-2000
3a1a8e3d47 further refactoring-related changes 2016-01-29 15:16:14 +01:00
DjWarmonger
fdfe7b6b06 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-01-27 21:08:18 +01:00
DjWarmonger
327e95407e - Compile fixes part 1 
- Project settings for MSVS
 2016-01-27 21:08:08 +01:00
Zyx-2000
c3e8c8bc1c Merge branch 'develop' into FileInfo 2016-01-27 19:21:43 +01:00
AlexVinS
048e22dbe6 Fix build. 2016-01-27 19:32:59 +03:00
AlexVinS
d7c0c3759a Merge branch 'Zyx-develop' into develop 
Conflicts:
	lib/filesystem/AdapterLoaders.h
 2016-01-27 18:53:41 +03:00
Vadim Markovtsev
36eaa399e7 Add hardcodedFeature to switch winner's retreating with no troops 2016-01-27 16:42:17 +03:00
Zyx-2000
70e3c81b9f Replaced CFileInfo with more correct and efficient alternative 2016-01-26 14:51:38 +01:00
Zyx-2000
c385c8757b TAB instead of spaces 2016-01-19 20:53:29 +01:00
Zyx-2000
2a55d5f85e added copyright info 2016-01-19 14:26:18 +01:00
Zyx-2000
64365fa294 additional polishing 2016-01-19 11:56:03 +01:00
Zyx-2000
170e4283ae Small improvements to FileStream 2016-01-18 21:30:06 +01:00
Zyx-2000
cf61837ced replaced std::string with boost::filesystem::path in several places 2016-01-16 16:36:16 +01:00
Zyx-2000
933b7c1f5e some modernization of CFileInputStream implementation code 2016-01-12 23:40:24 +01:00
Zyx-2000
f9b255c896 Cleaner code & MSVC compatibility 2016-01-12 22:40:05 +01:00
Zyx-2000
99cf8069d7 FileStream files 2016-01-09 21:24:20 +01:00
Zyx-2000
203b2dccc3 hopefully fixed things 2016-01-09 21:23:55 +01:00
AlexVinS
37d0dad70a Merge branch 'develop' into feature/VCMIMapFormat1 
Conflicts:
	lib/CArtHandler.cpp
 2016-01-01 20:28:52 +03:00
ArseniyShestakov
1c0d4e3f6f Fix filenames in file headers 2015-12-08 09:53:14 +03:00
AlexVinS
3af255d1b9 Implemented terrain serialisation 
* with test
 2015-12-05 12:36:34 +03:00
AlexVinS
b683c29b6e Added modification time to zip. 
* it is required to consider archive valid (by some tools)
 2015-12-05 12:06:49 +03:00
AlexVinS
0cc7213a27 WiP on zip serialization 
(-) still not works correctly
 2015-12-05 12:06:47 +03:00
AlexVinS
f2164abf1b Wip on zip serialize fixes 2015-12-05 12:06:45 +03:00
AlexVinS
27a29bd035 Start implementing actulal json serialization 2015-12-05 12:06:44 +03:00
AlexVinS
1a8faeb0b9 Start implementing map saver 2015-12-05 12:06:42 +03:00
AlexVinS
0040b459c3 Add support of CIOApi to CZipStream and CZipLoader (unused, untested) 2015-12-05 12:06:41 +03:00
AlexVinS
b3ac146ba9 Define bridge interface to minizip IOAPI 2015-12-05 12:06:40 +03:00