e7b639898e
Final compilation fix suggested by AVS.
2016-02-03 14:26:25 +01:00
1bc41b3ba3
Merge commit '3c844002626f48007a888d4dd8b0b45ec867fc9a' into feature/VCMIMapFormat1
...
Conflicts:
lib/mapObjects/CGHeroInstance.cpp
2016-02-03 05:04:44 +03:00
7cf2d79584
Final compile fix.
2016-02-02 18:48:20 +01:00
6865f70ab8
Compile fix #1
2016-02-02 12:19:33 +01:00
7fbd5479e2
alignment & makefile fix
2016-01-29 16:08:44 +01:00
2b88de8e24
added new files
2016-01-29 15:39:44 +01:00
523bc22a30
removed old files
2016-01-29 15:32:37 +01:00
3a1a8e3d47
further refactoring-related changes
2016-01-29 15:16:14 +01:00
fdfe7b6b06
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-01-27 21:08:18 +01:00
327e95407e
- Compile fixes part 1
...
- Project settings for MSVS
2016-01-27 21:08:08 +01:00
c3e8c8bc1c
Merge branch 'develop' into FileInfo
2016-01-27 19:21:43 +01:00
048e22dbe6
Fix build.
2016-01-27 19:32:59 +03:00
d7c0c3759a
Merge branch 'Zyx-develop' into develop
...
Conflicts:
lib/filesystem/AdapterLoaders.h
2016-01-27 18:53:41 +03:00
36eaa399e7
Add hardcodedFeature to switch winner's retreating with no troops
2016-01-27 16:42:17 +03:00
70e3c81b9f
Replaced CFileInfo with more correct and efficient alternative
2016-01-26 14:51:38 +01:00
c385c8757b
TAB instead of spaces
2016-01-19 20:53:29 +01:00
2a55d5f85e
added copyright info
2016-01-19 14:26:18 +01:00
64365fa294
additional polishing
2016-01-19 11:56:03 +01:00
170e4283ae
Small improvements to FileStream
2016-01-18 21:30:06 +01:00
cf61837ced
replaced std::string with boost::filesystem::path in several places
2016-01-16 16:36:16 +01:00
933b7c1f5e
some modernization of CFileInputStream implementation code
2016-01-12 23:40:24 +01:00
f9b255c896
Cleaner code & MSVC compatibility
2016-01-12 22:40:05 +01:00
99cf8069d7
FileStream files
2016-01-09 21:24:20 +01:00
203b2dccc3
hopefully fixed things
2016-01-09 21:23:55 +01:00
37d0dad70a
Merge branch 'develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/CArtHandler.cpp
2016-01-01 20:28:52 +03:00
1c0d4e3f6f
Fix filenames in file headers
2015-12-08 09:53:14 +03:00
3af255d1b9
Implemented terrain serialisation
...
* with test
2015-12-05 12:36:34 +03:00
b683c29b6e
Added modification time to zip.
...
* it is required to consider archive valid (by some tools)
2015-12-05 12:06:49 +03:00
0cc7213a27
WiP on zip serialization
...
(-) still not works correctly
2015-12-05 12:06:47 +03:00
f2164abf1b
Wip on zip serialize fixes
2015-12-05 12:06:45 +03:00
27a29bd035
Start implementing actulal json serialization
2015-12-05 12:06:44 +03:00
1a8faeb0b9
Start implementing map saver
2015-12-05 12:06:42 +03:00
0040b459c3
Add support of CIOApi to CZipStream and CZipLoader (unused, untested)
2015-12-05 12:06:41 +03:00
b3ac146ba9
Define bridge interface to minizip IOAPI
2015-12-05 12:06:40 +03:00
c965f9d02d
Added draft of IO memeory buffer
2015-12-05 12:06:33 +03:00
221ec55f51
Define basic design of output streams
2015-12-05 12:06:32 +03:00
e4b1ef1405
Add "override" to virtual overriden methods
2015-10-13 21:05:36 +03:00
1396476869
Merge pull request #79 from ArseniyShestakov/fixIssue1557
...
Only remove extension if it belongs to specified file type
2015-02-07 18:17:22 +03:00
4eed1716d5
Fix tiny memory leak on opening/closing new game window
...
Find this one when tested huge pack of 5000+ maps. Each time I opened/closed Single Scenario window memory usage was growing for ~1MB.
It's happen because inflateEnd is freed related structures, but not freed inflateState that created outside of zlib code.
2015-02-07 17:30:57 +03:00
8f08effe93
Check that resource type set before setName used
2015-02-06 10:51:32 +03:00
19d1de3142
Only remove extension if it belongs to specified file type
...
This one fixes issue 1557
Now it's possible to load maps with dots in filename.
2015-01-26 16:40:49 +03:00
66b022f93e
initializer lists part1
2014-10-02 19:43:46 +04:00
b551bdb725
Final part of the merge
...
Merging VCMI Dirs refactoring + GUI refactoring with current develop
2014-09-04 20:59:07 +03:00
1647b3670c
Merge pull request #35 from rhn/rhn
...
Fixes to sound handling.
2014-09-04 20:26:32 +03:00
9bef590960
use system version of minizip
2014-09-02 17:00:20 +02:00
958839668c
VCMIDirs update #5
...
- Minor fixes
- string based paths -> boost::filesystem::path paths (I hope it's
final)
- New user data path on windows
- New moving dir method on windows.
2014-08-21 22:26:28 +02:00
a302f6c7ad
VCMIDirs update #3
...
bfs = boost::filesystem;
- Updateting filenames (std::string -> bfs::path) #1
- Added platform detection, and some specyfic boost::filesystem includes
to Global.h
- Updated CBasicLogConfigurator. Now class uses bfs::path pathes.
2014-08-10 23:42:39 +02:00
a6151a5296
added FLAC support
2014-08-06 17:19:53 +02:00
5139378319
- migrated boost::function/ref/bind to std:: variants
2014-08-04 20:33:59 +02:00
8a3b997fa5
fix a few comments. No code changes.
2014-05-21 13:02:20 +04:00
