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

37721 Commits

Author SHA1 Message Date
HALX99 5a83d24b2f
Merge pull request #57 from c4games/deps-29 
Update deps to v29
 2020-02-14 21:25:46 +08:00
halx99 2bf350beb0 Update deps to v29 2020-02-14 19:14:39 +08:00
halx99 a460438c3b Make astc works on ios platform. 2020-02-14 19:10:01 +08:00
HALX99 363dab75c9
Merge pull request #55 from c4games/fix-issue53 
fix #53
 2020-02-14 18:12:31 +08:00
halx99 5778ac9da1 Refine extensions output. 2020-02-14 16:03:58 +08:00
halx99 70561f2c0e fix compile error 2020-02-14 15:44:46 +08:00
halx99 2fe58e86ae fix #53 2020-02-14 15:18:56 +08:00
HALX99 deb7c48844
Merge pull request #52 from c4games/fix-issue51 
fix #51
 2020-02-12 20:58:25 +08:00
HALX99 f6853a5852
Merge pull request #50 from weiwest/master 
add astc support (Great Job)
 2020-02-12 20:24:29 +08:00
halx99 f36d21c9bf fix #51 2020-02-12 20:15:09 +08:00
weiwest 5d7f58c3ad update deps to v28 2020-02-12 19:30:09 +08:00
weiwest 27343411de update deps to v27 2020-02-12 17:04:03 +08:00
weiwest 89105d0db2 Merge remote-tracking branch 'upstream/master' 2020-02-12 16:58:47 +08:00
weiwest 2a02db76d8 remove test log 2020-02-12 15:52:08 +08:00
weiwest 9496d34470 add astc soft decode support 2020-02-11 23:54:17 +08:00
HALX99 2d3e162e21
Update README.md 2020-02-11 21:03:22 +08:00
HALX99 e131c71b75
Merge pull request #48 from c4games/fix-ios-link-error 
fix ios openssl link error
 2020-02-11 13:32:42 +08:00
HALX99 e698c3ed81 Merge pull request #47 from c4games/ios-build-guides 
Update README.md
 2020-02-08 22:33:14 +08:00
HALX99 3fb83491c5
fix ios openssl link error 2020-02-08 22:10:08 +08:00
HALX99 33e765455c Update README.md 2020-02-08 21:55:36 +08:00
HALX99 33d3721c6a Merge pull request #46 from c4games/win32-tools 
Upgrade win32 compile tools to vs2019
 2020-02-08 21:50:00 +08:00
halx99 0215c5bcf8 Disable lua binding gen test, fix later 2020-02-08 17:03:14 +08:00
halx99 9e0ea2583d fix cmake gen command for vs2019 2020-02-08 15:41:13 +08:00
HALX99 998ac7fc4d
Upgrade win32 compile tools to vs2019 2020-02-08 14:11:28 +08:00
huizhen 6727666f2a
Merge pull request #45 from c4games/reset-ios-toolchain 
Reset ios toolchain
 2020-02-07 23:09:20 +08:00
HALX99 c51140bf74
Reset ios toolchain 2020-02-07 20:59:22 +08:00
HALX99 b43cc90d86
Merge pull request #44 from halx99/master 
Fix travis ci ios build issue
 2020-02-07 19:56:34 +08:00
HALX99 b39b6e9acb
Update ios cmake guide 2020-02-07 19:28:41 +08:00
HALX99 cffc332499
Use ios.toolchain.cmake 2020-02-07 19:26:45 +08:00
HALX99 42c8f486e6
Update README.md 2020-02-07 19:21:19 +08:00
HALX99 7dd9da4ac0
Update README.md 2020-02-07 19:04:26 +08:00
halx99 e0070f910a Add ios.toolchain.cmake 2020-02-07 18:59:44 +08:00
HALX99 ea12142f9a
Merge pull request #2 from c4games/master 
Sync latest from origin repo
 2020-02-07 17:21:35 +08:00
HALX99 9a6d7cc595
Merge pull request #42 from c4games/halx99-appveyor 
Fix travis & appveyor
 2020-02-07 17:19:15 +08:00
HALX99 585b298074
Merge pull request #43 from halx99/master 
fix ci [fork:halx99-appveyor]
 2020-02-07 17:17:50 +08:00
halx99 38564c696d fix ci error for PLATFORM_TARGET_MAC 2020-02-07 16:51:57 +08:00
halx99 f9b8460aeb Sync lua bindings for UserDefault Refactor 2020-02-07 16:45:25 +08:00
HALX99 5c59045b5b
disable other jobs exclude android & ios 2020-02-07 16:41:34 +08:00
HALX99 df688d49ae
test iphoneos 2020-02-07 16:14:27 +08:00
HALX99 8a7a785137
Update appveyor status url 2020-02-07 15:41:05 +08:00
huizhen 4129218d44
Merge pull request #40 from halx99/master 
Refactor UserDefault, cbc128 encrypt support.
 2020-02-07 12:07:10 +08:00
halx99 70cb64854f fix comment. 2020-02-06 23:33:12 +08:00
halx99 9599c936cd Refactor UserDefault, cbc128 encrypt support. 2020-02-06 23:30:33 +08:00
HALX99 45f1fb5265
Merge pull request #39 from halx99/master 
Refactor UserDefault, add plain mode for win32.
 2020-02-06 23:28:33 +08:00
weiwest dbc089d51d add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
halx99 e10155bef4 Refactor UserDefault, add plain mode for win32. 
plain mode: 760ms
binary mode: 11ms
 2020-02-06 21:15:15 +08:00
HALX99 ffcb65fdaa
Merge pull request #38 from c4games/halx99-ios-guide 
Add ios guide to readme.
 2020-02-06 12:52:48 +08:00
HALX99 08ddf4ce33
Add ios guide to readme. 2020-02-06 12:52:13 +08:00
huizhen 1f7a7a6937
Merge pull request #36 from halx99/master 
Refactor UserDefault, use file mapping implementation.
 2020-02-06 12:23:44 +08:00
halx99 21b378ead3 Refactor UserDefault, handle error & fix can't enlarge problem. 2020-02-06 11:55:28 +08:00