Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,192 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

39192 Commits

Author SHA1 Message Date
HALX99 5664291631
Merge pull request #342 from rh101/vfs-support 
Ensure FileStream is used for file access where possible
 2021-04-25 18:55:10 -07:00
rh101 17e1cc1d71 Minor code clean-up 2021-04-26 10:45:55 +10:00
RH 20a0747c8d
Merge pull request #8 from rh101/master 
Sync with master
 2021-04-26 10:42:25 +10:00
RH ac45a176a3
Merge branch 'vfs-support' into master 2021-04-26 10:42:09 +10:00
RH 6511da1ef1
Merge branch 'master' into vfs-support 2021-04-26 10:40:16 +10:00
RH 72fc8a6f4d
Merge branch 'vfs-support' into master 2021-04-26 10:39:09 +10:00
RH 03bb24f313
Merge pull request #7 from c4games/master 
Sync with primary
 2021-04-26 10:32:25 +10:00
rh101 85c5705f48 Return error value in FileUtils::getContents if size result is an unexpected value. 2021-04-26 10:29:29 +10:00
rh101 bcafad58ea Ensure code uses FileStream::tell() to get size if required after using FileStream::seek(0, SET_END) 2021-04-26 10:28:33 +10:00
rh101 d51edf3bfa Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
HALX99 ce6117fa65
Fix tool script cocos 2021-04-25 09:22:07 -07:00
rh101 bceabe87c1 Use FileStream instead of fopen to check if file can be opened in read mode 2021-04-26 01:44:50 +10:00
rh101 d76cb66e8e Convert return value to what is expected by FileStream::seek 2021-04-26 01:37:15 +10:00
rh101 434d2730d6 Initialise member variable 2021-04-26 01:05:06 +10:00
halx99 dff3aff1e4 Update lua script 2021-04-25 22:37:52 +08:00
halx99 6edff0c70e [libjpeg-turbo] Execlude execute targets 2021-04-25 22:15:25 +08:00
halx99 05d96aaa51 Update libjpeg-turbo to v2.1.0 [ci build] 2021-04-25 21:41:28 +08:00
HALX99 20b5157600
Merge pull request #343 from rh101/curl-fix-filestream 
Fix for downloader crash due to uninitialised variables
 2021-04-25 18:34:29 +08:00
rh101 73e45e33c2 Update usage of createDownloadFileTask 2021-04-25 18:36:20 +10:00
rh101 b1da56d401 Fix downloader crash due to uninitialised variables. 2021-04-25 18:20:25 +10:00
RH d1027ab263
Merge pull request #6 from c4games/master 
Sync with primary
 2021-04-25 18:14:50 +10:00
rh101 ce1a24cb15 Ensure FileStream is used for file access where possible 2021-04-25 17:22:43 +10:00
HALX99 8b8b015b02
Merge pull request #341 from rh101/vfs-support 
Add support for FileStream in ZipUtils and ZipFile
 2021-04-25 14:21:19 +08:00
rh101 3d8884721f Add function comments to detail the expected parameters and return values of a FileStream 2021-04-25 15:27:25 +10:00
rh101 ed177ce084 Removed incorrect delete statement 2021-04-25 14:42:42 +10:00
rh101 521e2cad4c Verify the amount of string space we have to replace the zip extension 2021-04-25 12:15:56 +10:00
rh101 2cdd688166 Initialise member variable 2021-04-25 02:47:21 +10:00
rh101 f68521c4d0 Minor code cleanup 2021-04-25 02:45:04 +10:00
rh101 72bc0bf818 Removed redundant code 2021-04-25 02:43:03 +10:00
rh101 1238a08662 Add support for FileStream in ZipUtils and ZipFile 2021-04-25 02:39:47 +10:00
halx99 2a1459b27b Update cmake & readme 2021-04-24 23:51:23 +08:00
halx99 f53cfe4ebf Update c-ares [ci build] 2021-04-24 23:34:41 +08:00
halx99 578ab97d82 Update tsl 2021-04-24 23:15:47 +08:00
halx99 ed4433f487 Add missing include 2021-04-24 23:15:32 +08:00
halx99 3f0c9baef7 Simple box2d cmake 2021-04-24 22:49:20 +08:00
halx99 5ab0b04d01 Add CMake macro BUILD_TESTS=OFF to support exclude all tests project 2021-04-24 22:47:37 +08:00
RH 6fbebe9617
Merge pull request #5 from c4games/master 
Sync with primary
 2021-04-24 23:40:34 +10:00
halx99 540c9375ff Update fairygui runtime [ci build] 2021-04-24 18:53:21 +08:00
halx99 63ac9904c4 Fix crash from pr: #340 2021-04-24 18:15:54 +08:00
halx99 39b5e14489 Update spine runtimes 2021-04-24 18:14:30 +08:00
halx99 320140b154 Fix clang-format props 2021-04-24 18:13:28 +08:00
HALX99 f97a6819e8
Update .clang-format 2021-04-24 17:11:04 +08:00
halx99 01f2ce3a2d Fix indent with clang-format [ci build] 2021-04-24 16:58:41 +08:00
HALX99 dd69c21c0e
Merge pull request #340 from rh101/vfs-support 
Enhance FileStream support to allow usage of virtual file systems
 2021-04-24 16:30:26 +08:00
rh101 e1a9141a00 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +10:00
rh101 5b3b0989b4 Remove redundant std::move 2021-04-23 22:00:33 +10:00
rh101 373c9262c4 Added getNativeWritableAbsolutePath() which will always return the underlying file system raw path. 
Re-enabled memory mapped UserDefault usage, since it now has access to the raw file system path.
 2021-04-23 01:00:00 +10:00
rh101 cd0c5bfcee Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support 2021-04-23 00:01:47 +10:00
rh101 2aa2d69151 Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH b7506fed0c
Merge pull request #4 from rh101/master 
Sync with master
 2021-04-22 21:49:43 +10:00