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

38583 Commits

Author SHA1 Message Date
halx99 36965d2e49 Fix #352 [ci build] 2021-05-12 11:18:31 +08:00
halx99 6aea443282 Fix cmake issue [ci build] 
Avoid cause check_include_file return unexpected result.
 2021-05-11 23:48:15 +08:00
HALX99 c635091618
Add missing dep [ci build] 2021-05-11 12:23:35 +08:00
HALX99 273e9120f6
Fix linux build action [ci build] 
We simply upgrade to ubuntu-20.04 since github action ubuntu-18.04 broken on 2021.5.1X
 2021-05-11 11:30:00 +08:00
HALX99 dd12a29cb1
Fix linux build action [ci build] 
https://github.com/actions/virtual-environments/issues/323
 2021-05-11 10:45:18 +08:00
HALX99 dca5df1ae9
Fix linux ci [ci build] 2021-05-11 09:45:42 +08:00
HALX99 7bd2010995
Explicit disable libssh2 dep for libcurl [ci build] 2021-05-09 00:54:05 +08:00
HALX99 2c7830246a
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 3a7bb58045 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 3348f10813 Make tests could build at external location [ci build] 2021-05-02 17:23:39 +08:00
HALX99 4d2a754b97
Update install-deps-linux.sh 2021-04-29 10:24:32 +08:00
halx99 ffdde101a5 glfw as child window support 2021-04-28 23:43:00 +08:00
halx99 7ac709d9ec Update CMakeLists.txt 2021-04-28 21:01:55 +08:00
HALX99 b167bb3df9
Merge pull request #348 from c4games/dev 
Merge dev to master
 2021-04-28 04:47:16 -07:00
HALX99 d8367d9376
Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 3a3c4ed518 Update cmakelist 2021-04-28 18:58:11 +08:00
halx99 482793036d Update readme [ci build] 2021-04-28 17:59:39 +08:00
HALX99 3b2c927a01
Update setup_android.py 2021-04-28 17:56:40 +08:00
HALX99 5b47d8f839
Sets ndk minimum required version to r19c [ci build] 2021-04-28 17:48:26 +08:00
halx99 89957435da Fix FindHarfBuzz.cmake when version not match [ci build] 2021-04-28 17:04:04 +08:00
halx99 881c7672c8 Fix FindHarfBuzz.cmake [ci build] 2021-04-28 16:52:28 +08:00
HALX99 15fea25204
fix ci 2021-04-28 15:50:03 +08:00
halx99 b45b658dbc Don't find harfbuzz [ci build] 2021-04-28 15:43:27 +08:00
halx99 4d532f09a7 fix linux build [ci build] 2021-04-28 15:30:24 +08:00
halx99 100f23990b Enable build curl with openssl [ci build] 2021-04-28 15:10:28 +08:00
HALX99 4cd026c920
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 1efe0091a8 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 067f55609b
Fix ci [ci build] 2021-04-28 13:13:41 +08:00
halx99 617f7a5f15 Building glfw,freetype,openal,curl from sources [ci build] 2021-04-28 12:43:51 +08:00
halx99 7f1ca55a97 NavMesh Use lz4 instead fastlz [ci build] 2021-04-26 22:39:44 +08:00
halx99 d0426578d5 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20662 2021-04-26 19:00:43 +08:00
halx99 c1063ea03d Fix cpp-tests exit crash when tableView in scrolling [ci build] 2021-04-26 17:55:55 +08:00
halx99 5b13927d47 Fix ci warnings [ci build] 2021-04-26 17:28:58 +08:00
halx99 bc4429d449 Optimize macro posix_fsetsize, use ',' is better [ci build] 2021-04-26 17:02:28 +08:00
HALX99 a0d9bd218f
Merge pull request #345 from rh101/filestream-unique-ptr 
Use unique_ptr for FileStream
 2021-04-26 01:44:27 -07:00
rh101 19995f863b 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 c7aa1d4f00 Let the OGG function overrides handle freeing memory of the FileStream pointer. 2021-04-26 17:30:18 +10:00
rh101 6f47d44b81 Clear unique_ptr with reset(). 2021-04-26 15:46:59 +10:00
rh101 b865d9e18e 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 ef6bedd069 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 f54637b0b6
Merge pull request #9 from c4games/master 
Sync to primary
 2021-04-26 13:16:44 +10:00
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