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

327 Commits

Author SHA1 Message Date
halx99 b39d318a0f fix ci error 2020-05-18 09:16:10 +08:00
weiwest a998fe8c14 Merge: 2a02db76d8 2d3e162e21 
Merge remote-tracking branch 'upstream/master'
 2020-02-12 16:58:47 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 61b9e21b51 Merge: e698c3ed81 3fb83491c5 
Merge pull request #48 from c4games/fix-ios-link-error

fix ios openssl link error
 2020-02-11 13:32:42 +08:00
halx99 579eeb5e7b Merge: 33d3721c6a 33e765455c 
Merge pull request #47 from c4games/ios-build-guides

Update README.md
 2020-02-08 22:33:14 +08:00
halx99 9b3dfe29a7 fix ios openssl link error 2020-02-08 22:10:08 +08:00
halx99 10e3965bf8 fix cmake gen command for vs2019 2020-02-08 15:41:13 +08:00
halx99 eec29eb3be Reset ios toolchain 2020-02-07 20:59:22 +08:00
halx99 fcbc5afbb3 Merge: b39b6e9acb cffc332499 
Merge pull request #44 from halx99/master

Fix travis ci ios build issue
 2020-02-07 19:56:34 +08:00
halx99 b2f30327d7 Update ios cmake guide 2020-02-07 19:28:41 +08:00
halx99 3c71559b17 Use ios.toolchain.cmake 2020-02-07 19:26:45 +08:00
halx99 209fbae7bf Add ios.toolchain.cmake 2020-02-07 18:59:44 +08:00
halx99 25ec31f938 test iphoneos 2020-02-07 16:14:27 +08:00
Arnold ecd81c77dc [CI ]add cocos new for iOS (#20380) 2019-11-30 16:58:49 +08:00
halx99 0538506b05 update audio, deps-9, ci for windows 2019-11-30 16:20:25 +08:00
halx99 7723c0e5f1 Update run-script.sh 2019-11-30 07:08:58 +08:00
halx99 7af7b6494c Update config.json 2019-11-30 06:19:15 +08:00
halx99 45dbdc8c7d fix indent 2019-11-30 06:17:33 +08:00
halx99 f66674ab9c Update run-script.sh 2019-11-30 06:15:54 +08:00
halx99 d5af773970 Merge: f8e6c06286 cea283c489 
Merge pull request #11 from simdsoft/sync-v4

Sync v4
 2019-11-26 08:49:56 -08:00
halx99 217962e748 Merge: 3cab821c25 8ff2ea18c2 
Merge pull request #10 from simdsoft/v5-deps-5

update deps to v5-deps-5
 2019-11-26 08:28:03 -08:00
Arnold 69b9b1fe4d fix appvenyor env (#20372) 2019-11-26 23:40:57 +08:00
halx99 00ededdbb4 skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
halx99 ba2b8b3b6d Merge: 6078a4c922 aad1a18a8f 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 20:26:43 +08:00
halx99 c77560fb80 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 cf15088dd5 Temporary disable auto luabindings push 2019-11-25 19:48:31 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00