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

3127 Commits

Author SHA1 Message Date
halx99 1128fc6cca Update README_CN.md 2021-05-18 20:24:21 +08:00
halx99 81ba4ec94d Fix readme reference 2021-05-18 20:23:43 +08:00
halx99 8b9a5acdf9 Fix lua include header 2021-05-18 19:56:36 +08:00
halx99 96cbcce4b0 Merge: 71ebb455a6 2dd4051cbb 
Merge branch 'master' of https://github.com/adxeproject/adxe
 2021-05-18 18:09:06 +08:00
halx99 63d249930b Add cmdline tools 2021-05-18 18:08:59 +08:00
halx99 501db1a209 Update readme 2021-05-18 16:51:46 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 93173d860b Replace jcenter with mavenCentral [ci build] 2021-05-15 12:15:38 +08:00
halx99 e367689ca9 Gradle Plugin no longer support cmake 3.10.0+ 2021-05-15 11:58:56 +08:00
halx99 07a2d3f81f Add some comment 2021-05-15 11:54:17 +08:00
halx99 821492ad8d Fix linux ci 2021-05-15 01:00:20 +08:00
halx99 7aaeb8007d Fix ci [ci build] 2021-05-15 00:44:30 +08:00
halx99 4d7d323eb3 Fix ci [ci build] 2021-05-15 00:33:38 +08:00
halx99 4a12425a1b Fix android ci [ci build] 2021-05-15 00:12:41 +08:00
halx99 dba89b7362 Fix warning [ci build] 2021-05-14 20:50:59 +08:00
halx99 802c740c08 Update AndroidStudio required version to 4.2+ 2021-05-14 12:15:38 +08:00
halx99 b68f7b8948 Update gradle stubs [ci build] 
a. wrapper  to  6.9
b. plugin to 4.2.0
 2021-05-14 12:11:19 +08:00
halx99 3076a97908 Update ios.mini.cmake 2021-05-14 08:22:46 +08:00
halx99 413b0acaa6 Fix #352 [ci build] 2021-05-12 11:18:31 +08:00
halx99 64a1d68d6f Fix cmake issue [ci build] 
Avoid cause check_include_file return unexpected result.
 2021-05-11 23:48:15 +08:00
halx99 a93fbb4d37 Add missing dep [ci build] 2021-05-11 12:23:35 +08:00
halx99 905d101dd8 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 60521eaf68 Fix linux build action [ci build] 
https://github.com/actions/virtual-environments/issues/323
 2021-05-11 10:45:18 +08:00
halx99 c7906e4438 Fix linux ci [ci build] 2021-05-11 09:45:42 +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 fdf0ebc97f Make tests could build at external location [ci build] 2021-05-02 17:23:39 +08:00
halx99 ae66271ef9 Update install-deps-linux.sh 2021-04-29 10:24:32 +08:00
halx99 a7577ba4c7 Merge: d8367d9376 3a3c4ed518 
Merge pull request #348 from c4games/dev

Merge dev to master
 2021-04-28 04:47:16 -07:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 d31e10bcf4 Update readme [ci build] 2021-04-28 17:59:39 +08:00
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