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

1396 Commits

Author SHA1 Message Date
halx99 30ca89005f Update setup_android.py 2021-04-28 17:56:40 +08:00
halx99 69d2631389 Sets ndk minimum required version to r19c [ci build] 2021-04-28 17:48:26 +08:00
halx99 7cbfd84f95 Enable build curl with openssl [ci build] 2021-04-28 15:10:28 +08: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
halx99 0ef3d6f0e0 Building glfw,freetype,openal,curl from sources [ci build] 2021-04-28 12:43:51 +08:00
halx99 d734599c1c NavMesh Use lz4 instead fastlz [ci build] 2021-04-26 22:39:44 +08:00
halx99 0f12e59e3b Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20662 2021-04-26 19:00:43 +08:00
halx99 72fa15f8f3 Fix cpp-tests exit crash when tableView in scrolling [ci build] 2021-04-26 17:55:55 +08:00
halx99 68a40694a8 Fix ci warnings [ci build] 2021-04-26 17:28:58 +08:00
halx99 ff24bdf192 Optimize macro posix_fsetsize, use ',' is better [ci build] 2021-04-26 17:02:28 +08:00
rh101 0583f9a4e0 Get the raw pointer on creation of the FileStream to avoid any accidental usage of the unique_ptr. 2021-04-26 17:31:34 +10:00
rh101 13115cc789 Let the OGG function overrides handle freeing memory of the FileStream pointer. 2021-04-26 17:30:18 +10:00
rh101 3281c7349a Clear unique_ptr with reset(). 2021-04-26 15:46:59 +10:00
rh101 b923b1a678 Use reset() to clear unique_ptr. 
Use value initialization for unique_ptr.
Change AudioDecoderOgg override functions to use FileStream* instead of unique_ptr.
Remove redundant code.
 2021-04-26 15:43:33 +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
rh101 23301e563e Minor code clean-up 2021-04-26 10:45:55 +10:00
RH ba6f6dfcfa Merge: 85c5705f48 ce6117fa65 
Merge branch 'master' into vfs-support
 2021-04-26 10:40:16 +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 833f27f499 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 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 4745016bc2 Use FileStream instead of fopen to check if file can be opened in read mode 2021-04-26 01:44:50 +10:00
rh101 3eb42e00c7 Convert return value to what is expected by FileStream::seek 2021-04-26 01:37:15 +10:00
rh101 fa4ed8a975 Initialise member variable 2021-04-26 01:05:06 +10:00
halx99 600e96c54c Update lua script 2021-04-25 22:37:52 +08: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
rh101 abb27ce2f3 Fix downloader crash due to uninitialised variables. 2021-04-25 18:20:25 +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
halx99 964e515f48 Merge: 2a1459b27b 3d8884721f 
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 0867aa48a9 Add function comments to detail the expected parameters and return values of a FileStream 2021-04-25 15:27:25 +10:00
rh101 5cc21f52ba Removed incorrect delete statement 2021-04-25 14:42:42 +10:00
rh101 3dbdd7b5ee Verify the amount of string space we have to replace the zip extension 2021-04-25 12:15:56 +10:00
rh101 8703cad209 Initialise member variable 2021-04-25 02:47:21 +10:00
rh101 84be1fa014 Minor code cleanup 2021-04-25 02:45:04 +10:00
rh101 a819f310b2 Removed redundant code 2021-04-25 02:43:03 +10:00
rh101 cce67f688e Add support for FileStream in ZipUtils and ZipFile 2021-04-25 02:39:47 +10:00
halx99 3129918431 Add CMake macro BUILD_TESTS=OFF to support exclude all tests project 2021-04-24 22:47:37 +08:00
halx99 6f520734c1 Update fairygui runtime [ci build] 2021-04-24 18:53:21 +08:00
halx99 da1038b147 Fix crash from pr: #340 2021-04-24 18:15:54 +08:00
halx99 c40b803244 Update spine runtimes 2021-04-24 18:14:30 +08:00
halx99 9907570bc0 Fix clang-format props 2021-04-24 18:13:28 +08:00
halx99 34c6005316 Update .clang-format 2021-04-24 17:11:04 +08:00
halx99 5484825229 Fix indent with clang-format [ci build] 2021-04-24 16:58:41 +08:00
rh101 155fe98406 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +10:00
rh101 e1ce966be2 Remove redundant std::move 2021-04-23 22:00:33 +10:00