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

38525 Commits

Author SHA1 Message Date
halx99 f543356bb7 Sync yasio to 3.33.4 [ci build] 2020-11-25 19:07:21 +08:00
halx99 1a9d91127f fix cocos chmod 2020-11-24 19:08:28 -08:00
halx99 596302509c Merge branch 'master' of https://github.com/c4games/engine-x 2020-11-24 18:10:47 +08:00
halx99 5821233e45 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20614 2020-11-24 18:10:28 +08:00
HALX99 7e55ef9bd1
Update README.md 2020-11-24 17:27:48 +08:00
halx99 9b51c1c614 Sync yasio to 3.33.9 2020-11-24 16:52:03 +08:00
HALX99 d31566c157
Merge pull request #277 from aismann/master 
Update cocos.bat
 2020-11-23 01:27:53 -08:00
Eismann a606572775 Update cocos.bat 2020-11-23 09:55:07 +01:00
HALX99 a10d7701b8
Merge pull request #276 from aismann/master 
Same as on 3.17 (with small changes)
 2020-11-22 23:43:18 -08:00
Eismann eee60b9d99 Same as on 3.17 (with small changes) 2020-11-23 07:46:09 +01:00
HALX99 0d04e20b50
fix metal znear range for viewport 
https://developer.apple.com/documentation/metal/mtlrendercommandencoder/1515527-setviewport?language=objc
 2020-11-23 09:30:51 +08:00
HALX99 cb3ee0fcd5
Merge pull request #273 from aismann/master 
Add "Box2d - Basic" test
 2020-11-19 22:52:19 -08:00
Eismann c364c9adb5 Update Box2dTest.h 2020-11-20 07:05:21 +01:00
Eismann 424666e59c Update CMakeLists.txt 2020-11-20 06:38:09 +01:00
Eismann 7c06461594 add Box2D to CMakeList 2020-11-20 06:19:30 +01:00
Eismann 178ce9f5cf Add BOX2D test 
Add BOX2D test
 2020-11-20 04:51:47 +01:00
HALX99 ef7db2c660
Update README_CN.md 2020-11-19 23:38:05 +08:00
HALX99 d03c4a301c
Update README.md 2020-11-19 23:37:19 +08:00
HALX99 6be0f85e15
Merge pull request #270 from aismann/patch-14 
Update README.md
 2020-11-19 02:18:48 -08:00
HALX99 7c8226eb97
Merge pull request #271 from aismann/patch-15 
Update README.md
 2020-11-19 01:09:48 -08:00
aismann 423b324de9
Update README.md 2020-11-19 08:40:49 +01:00
HALX99 6610b73f79
Merge pull request #269 from aismann/patch-13 
Update README.md
 2020-11-18 22:34:08 -08:00
aismann 3de1dd5e85
Update README.md 2020-11-19 07:18:00 +01:00
aismann 44a02b7ea7
Update README.md 2020-11-19 06:48:12 +01:00
HALX99 1059485e52
Merge pull request #268 from Obg1/master 
Fix manifest version greater check
 2020-11-18 15:41:53 -08:00
Oren Bengigi a6b3b7050a Fix manifest version greater check 2020-11-18 20:43:49 +02:00
HALX99 6c1f45717b
Merge pull request #266 from aismann/patch-12 
Update README.md
 2020-11-18 04:11:10 -08:00
HALX99 277c59adeb
Merge pull request #265 from aismann/patch-11 
Update README.md
 2020-11-18 04:05:31 -08:00
HALX99 d162416f96
Add mising #endif 2020-11-18 20:04:33 +08:00
aismann 92714a14cf
Update README.md 
add some links
 2020-11-18 12:50:44 +01:00
aismann bb6ebc3628
Update README.md 
some more small stuff (hope thats all ;))
 2020-11-18 12:37:28 +01:00
HALX99 4bfa6d4bf9
Remove unnecessary targets for cpp template 2020-11-18 18:35:00 +08:00
halx99 1bd6f5680f Refine jni param types 2020-11-18 18:19:14 +08:00
halx99 efb5442e7a Merge branch 'master' of https://github.com/c4games/engine-x 2020-11-18 18:18:07 +08:00
halx99 eeafffe2f1 jni match natvie API param types 2020-11-18 18:17:55 +08:00
HALX99 1444881c7f
Merge pull request #264 from aismann/patch-10 
Update README.md
 2020-11-18 01:40:38 -08:00
aismann 210b57ef0e
Update README.md 2020-11-18 09:55:19 +01:00
halx99 18a265c125 Add missing luaconf.h for luajit 2020-11-18 13:25:40 +08:00
halx99 ca42ef08ba Refine jni methods decls [ci build] 2020-11-18 13:25:00 +08:00
halx99 32b007ff88 Use env ENGINEX_ROOT for templates 2020-11-18 13:01:17 +08:00
halx99 1051d38562 Merge branch 'master' of https://github.com/c4games/engine-x 2020-11-18 12:16:36 +08:00
halx99 53122216ee Add missing param JNIEnv* for natvie interfaces [ci build] 2020-11-18 12:15:48 +08:00
halx99 a708c2f904 Improve lua framework code 2020-11-17 23:17:40 +08:00
halx99 acc064770c fix #263 2020-11-17 21:57:35 +08:00
HALX99 3cd3db93a0
Delete .gitmodules 2020-11-17 20:37:40 +08:00
HALX99 5ff9f4786e
fix UserDefault plain mode stack overflow 2020-11-17 19:50:58 +08:00
halx99 702887ba3c Merge branch 'master' of https://github.com/c4games/engine-x 2020-11-16 22:38:59 +08:00
halx99 7852cb21e5 fix #262 2020-11-16 22:38:18 +08:00
HALX99 45f1519638
Update README_CN.md 2020-11-16 17:41:12 +08:00
HALX99 9aaf62b2d6
Update README.md 2020-11-16 17:40:19 +08:00