Commit Graph

936 Commits

Author SHA1 Message Date
halx99 f75e87c88a Use env ENGINEX_ROOT for templates 2020-11-18 13:01:17 +08:00
halx99 c12701da10 Merge: 53122216ee a708c2f904
Merge branch 'master' of https://github.com/c4games/engine-x
2020-11-18 12:16:36 +08:00
halx99 09e2615e51 Add missing param JNIEnv* for natvie interfaces [ci build] 2020-11-18 12:15:48 +08:00
halx99 a524d61036 Improve lua framework code 2020-11-17 23:17:40 +08:00
halx99 f6e87217bf fix #263 2020-11-17 21:57:35 +08:00
halx99 ad36cdabdb Delete .gitmodules 2020-11-17 20:37:40 +08:00
halx99 d1fc9712b4 fix UserDefault plain mode stack overflow 2020-11-17 19:50:58 +08:00
halx99 a1d1b21642 Merge: 7852cb21e5 45f1519638
Merge branch 'master' of https://github.com/c4games/engine-x
2020-11-16 22:38:59 +08:00
halx99 c17a21eb8c fix #262 2020-11-16 22:38:18 +08:00
halx99 d3eb17324a Update README_CN.md 2020-11-16 17:41:12 +08:00
halx99 b3ab1a075a Update README.md 2020-11-16 17:40:19 +08:00
halx99 44a7d2a9bd Add missing .a files [ci build] 2020-11-16 16:20:21 +08:00
halx99 0b805564dc CI don't needs download deps manually [ci build] 2020-11-16 16:02:47 +08:00
halx99 7376b9757d Embed third parties 2020-11-16 14:47:43 +08:00
halx99 4f725ab0c6 fix compile issue 2020-11-16 14:19:56 +08:00
halx99 d9fea356fc Since we don't support ios x86 simulator yet, set ios default min deployment target to 9.0 is ok 2020-11-15 21:46:24 -08:00
halx99 b341aa31da fix ci warnings 2020-11-15 21:34:53 -08:00
halx99 1ec908d4f9 fix #260 [ci build] 2020-11-16 12:21:27 +08:00
halx99 1c1c8520b1 Delete unused buitin shaders 2020-11-16 11:20:12 +08:00
halx99 b23016612d Add license badge 2020-11-15 17:56:03 +08:00
halx99 bcacf9137e Refine UserDefault comment [ci build] 2020-11-15 13:13:24 +08:00
halx99 9e3ad89089 Update CCUserDefault.cpp 2020-11-15 13:11:53 +08:00
halx99 772e57ef67 Update CCUserDefault.cpp 2020-11-15 13:08:21 +08:00
halx99 c3401087d2 Refine UserDefault comment 2020-11-15 12:26:40 +08:00
halx99 ff662dfffc Refine user default comment 2020-11-15 12:16:54 +08:00
halx99 c727d692a8 fix UserDefault doesn't work with encrypt enabled [ci build] 2020-11-15 11:45:14 +08:00
halx99 133f942a6b fix compile and improve Physics3DConstraint management [ci build] 2020-11-15 00:48:53 +08:00
halx99 fa47ae5f5a Update config.json [ci build] 2020-11-14 13:32:51 +08:00
halx99 4a1bebd3e6 plain include xxhash.h 2020-11-14 12:22:51 +08:00
halx99 74133ec753 Add missing JNIEXPORT 2020-11-13 23:03:05 +08:00
halx99 dc140c7e5f Update ios.mini.cmake 2020-11-13 11:01:48 +08:00
halx99 fdaed7c349 Update ios.mini.cmake 2020-11-13 01:08:26 +08:00
halx99 00127d3f85 Unify ios min deployment target to 10.0 2020-11-13 01:07:41 +08:00
halx99 0995d94239 Update README.md 2020-11-12 23:09:14 +08:00
halx99 a976e217c1 Rollback gradle plugin version 4.0.1, since there is no benefit upgrade to 4.1.0 2020-11-12 22:50:38 +08:00
halx99 db2e468e91 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
halx99 b8a3de050f Try bionic for android ci 2020-11-12 18:07:52 +08:00
halx99 e132a37b2b fix android nasm version print for ci [ci build] 2020-11-12 18:01:27 +08:00
halx99 efb1474aa7 Install nasm for ci [ci build] 2020-11-12 17:48:31 +08:00
halx99 8e19969796 Remove print 2020-11-11 22:33:48 -08:00
Born.Xiao 6a1b561d7e Update CCUserDefault.cpp
write with variable  size,  calculate size use int32_t
2020-11-12 00:32:33 +08:00
halx99 fbc76a480f Delete .lgtm.yml 2020-11-11 18:53:25 +08:00
halx99 86decdb9a9 Merge: 0a410dbf7f 44fb557458
Merge pull request #258 from wtfdnvxk/patch-2

fix ios readme build device description
2020-11-11 01:36:09 -08:00
halx99 f545b0d259 Merge: d1f0a287ac f5fcd5592c
Merge pull request #257 from wtfdnvxk/patch-1

extend lua by register extensions
2020-11-11 01:25:21 -08:00
wtfdnvxk 11f30dc4a0 fix ios readme build device description
if none arch has been defined,then you can use "xcodebuild  -scheme "lua-empty-test" -sdk  iphonesimulator SYMROOT=." to compile the simulator ,or,You can use 'xcodebuild  -scheme "lua-empty-test" -sdk  iphoneos SYMROOT=.' to build in ios device銆?    The Xcode Architectures will show "Standard architecture"
2020-11-11 17:06:03 +08:00
wtfdnvxk d7b26f54f3 Update lua_module_register.cpp
extend lua by register extensions
2020-11-11 16:53:00 +08:00
halx99 7c8df0d187 Remove ENABLE_CJSON_GLOBAL from cmake 2020-11-11 16:37:33 +08:00
halx99 fccc757431 mandatory yasio for lua bindings 2020-11-11 15:51:46 +08:00
halx99 5a4d0139c5 fix cjson can't use 2020-11-11 15:21:29 +08:00
halx99 9da0c223c6 fix ci for ios [ci build] 2020-11-11 15:07:21 +08:00