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

37803 Commits

Author SHA1 Message Date
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
halx99 e312fd356e Refactor UserDefault, optmize for huge entities. 2020-02-06 01:08:51 +08:00
weiwest a6edda385b add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
HALX99 30e21d3b08
Merge pull request #35 from weiwest/master 
add windows android start guide
 2020-02-04 22:56:49 +08:00
halx99 b6cf5871cd Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
weiwest 36f0d0b902 add windows android start guide 2020-02-04 21:42:43 +08:00
HALX99 8cb437601f
Merge pull request #34 from halx99/master 
Update deps to v26
 2020-02-04 21:16:49 +08:00
HALX99 da52ffa669
update deps to v26 2020-02-04 21:15:18 +08:00
HALX99 2c5653a95f
Merge pull request #1 from c4games/master 
Fix .so auto link when folder not exists
 2020-02-04 21:11:49 +08:00
halx99 3f78448495 Fix .so auto link when folder not exists 2020-02-04 20:57:20 +08:00
halx99 86d6e5d58d Merge branch 'master' of https://github.com/c4games/engine-v5 2020-02-04 20:55:37 +08:00
halx99 a40c81e984 load .so at AppActivity.java 2020-02-04 19:22:11 +08:00
HALX99 c69c8edda2
Update config.json 2020-02-04 12:40:20 +08:00
halx99 1b33d88416 fix compile issue 2020-02-03 22:01:18 +08:00
halx99 a350f4be88 solve auto link .so for android platform 2020-02-03 21:18:23 +08:00
halx99 6f4b1f4d9e fix link error 2020-02-02 21:53:18 +08:00
HALX99 9632461bea
Merge pull request #33 from simdsoft/deps24 
update deps to v24
 2020-02-02 21:33:40 +08:00
HALX99 215312c94e
Update config.json 2020-02-02 20:32:00 +08:00
halx99 2fb5981500 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2020-01-18 20:41:29 +08:00