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

51 Commits

Author SHA1 Message Date
halx99 c15442eaad Fix some warnings 2021-10-09 13:48:56 +08:00
RH 56fc4513ef FileStream::size() implemented (#365) 
* Add FileStream::size()
Add ZipFile::zfsize()

* Use FileStream::size()
 2021-05-31 15:08:44 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 0511520281 Merge: 7f1ca55a97 1efe0091a8 
Merge pull request #347 from rh101/imgui-fix

ImGUI font crash fix when using virtual file system
 2021-04-27 23:29:22 -07:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
rh101 668e96cadd Use unique_ptr for FileUtils::openFileStream 
Fix OGG audio playback due to incorrect tell() method
Fix unzip close() override method not deleting FileStream pointer.
 2021-04-26 14:21:56 +10:00
RH 5b168e3bb6 Merge: 03bb24f313 85c5705f48 
Merge branch 'vfs-support' into master
 2021-04-26 10:39:09 +10:00
RH 0e2247a2d9 Merge: d1027ab263 ce6117fa65 
Merge pull request #7 from c4games/master

Sync with primary
 2021-04-26 10:32:25 +10:00
rh101 ff60724c9e Return error value in FileUtils::getContents if size result is an unexpected value. 2021-04-26 10:29:29 +10:00
rh101 e6990d0b36 Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
halx99 be9bd61131 Fix tool script cocos 2021-04-25 09:22:07 -07:00
rh101 fa4ed8a975 Initialise member variable 2021-04-26 01:05:06 +10:00
halx99 87be236932 Merge: 8b8b015b02 b1da56d401 
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 5509d0f80d Update usage of createDownloadFileTask 2021-04-25 18:36:20 +10:00
RH c8c4c2d703 Merge: 6fbebe9617 8b8b015b02 
Merge pull request #6 from c4games/master

Sync with primary
 2021-04-25 18:14:50 +10:00
rh101 c26a5e7bd8 Ensure FileStream is used for file access where possible 2021-04-25 17:22:43 +10:00
rh101 155fe98406 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +10:00
rh101 54ffa13dff 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 dd5f77c3d5 Merge: 15c8f2298d 0886473e1b 
Merge pull request #4 from rh101/master

Sync with master
 2021-04-22 21:49:43 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 ac21c27140 Build pugixml from sources for all platforms (#241) 2020-10-21 12:28:34 +08:00
halx99 cabc917bff Move getFileDataFromZip from FileUtils to ZipFile and mark it as deprecated 2020-09-06 17:00:20 +08:00
halx99 e75a29a393 fix #179 2020-08-28 11:04:14 +08:00
halx99 083d14f342 Improve code quality 2020-08-18 14:29:09 +08:00
halx99 a3a231495c Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 4214ed6add Add missing optimize from v3 2020-08-05 13:10:37 +08:00
halx99 8f541a61a7 Merge: 5f96ce8981 3e95b8ccf3 
Merge pull request #135 from halx99/unify-plist-ops

Unify plist implementation, remove apple specific sources.
 2020-08-02 20:22:36 -07:00
halx99 588e977ef0 Merge: 8cc189fb4d 6fd4d6e4ab 
Merge pull request #134 from halx99/fullscreen-mode

Refactor full screen support
 2020-08-02 20:03:07 -07:00
halx99 d6958498d4 Unify plist implementation, remove apple specific sources. 2020-08-03 10:48:26 +08:00
halx99 bd9a409dd7 Add wav testcase 2020-08-01 19:25:39 +08:00
halx99 44276b824a Merge: 58403292cd bfd1709ab7 
Merge pull request #108 from halx99/master

Optimzie writeStringToFile
 2020-06-14 16:29:40 +08:00
halx99 8f3c82a287 Merge: 80f33f376c 208bc9fe6f 
Merge pull request #107 from halx99/master

Auto copy angle lib to target bin directory
 2020-06-14 16:23:58 +08:00
halx99 7cd562750e Optimzie writeStringToFile 2020-06-14 15:54:55 +08:00
halx99 98cb60f8bb fix ios compile error 2020-06-14 13:58:29 +08:00
halx99 489fb1a50a finish angle dependencies auto copy for win32, make flatbuffers dep header only 2020-06-14 12:50:20 +08:00
halx99 52058861a0 Refactor CCValue. 2020-03-03 19:24:07 +08:00
halx99 7d183d5a39 Update CCFileUtils.cpp 2019-11-28 09:59:18 +08:00
halx99 ac789dbf81 a. use win32 api to get fie size; b. use int64_t for file size, c. use stat to check whether file exist for android platform. 2019-11-27 15:09:45 +08:00
halx99 ada10077b5 Merge: 72c1f27ce4 8cb40c339a 
Merge pull request #3 from simdsoft/update-readme

Update README.md
 2019-11-25 09:36:20 -08:00
halx99 00ededdbb4 skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
halx99 c77560fb80 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 075aadee32 Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 a56cddfefe Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 0ab49ddf22 Merge: 98a3bd35f0 f332ae77c1 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-24 23:16:11 +08:00
halx99 441e1f1283 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 4d92a64c03 Use xsxml for sax parser, rapidxml could be removed 2019-11-24 21:01:15 +08:00