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

38298 Commits

Author SHA1 Message Date
halx99 755714c103 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
HALX99 dcfd65427b
Merge pull request #261 from halx99/try-bionic-android-ci 
Try bionic for android ci
 2020-11-12 03:24:42 -08:00
halx99 119560af91 Try bionic for android ci 2020-11-12 18:07:52 +08:00
halx99 38fd8e71aa fix android nasm version print for ci [ci build] 2020-11-12 18:01:27 +08:00
halx99 023f72f2b9 Install nasm for ci [ci build] 2020-11-12 17:48:31 +08:00
HALX99 ffea9bc6c9
Update config.json [ci build] 2020-11-12 17:18:19 +08:00
halx99 f7006b2034 Remove print 2020-11-11 22:33:48 -08:00
HALX99 707131790b
Merge pull request #259 from x8710162/patch-1 
Fix crash when enable encrypt for UserDefault
 2020-11-11 15:26:35 -08:00
Born.Xiao fce153cdb1
Update CCUserDefault.cpp 
write with variable  size,  calculate size use int32_t
 2020-11-12 00:32:33 +08:00
HALX99 e4985af560
Update config.json [ci build] 2020-11-11 19:51:51 +08:00
HALX99 10367dfb36
Delete .lgtm.yml 2020-11-11 18:53:25 +08:00
HALX99 2d536536a8
Merge pull request #258 from wtfdnvxk/patch-2 
fix ios readme build device description
 2020-11-11 01:36:09 -08:00
HALX99 0a410dbf7f
Merge pull request #257 from wtfdnvxk/patch-1 
extend lua by register extensions
 2020-11-11 01:25:21 -08:00
wtfdnvxk 44fb557458
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 f5fcd5592c
Update lua_module_register.cpp 
extend lua by register extensions
 2020-11-11 16:53:00 +08:00
halx99 d1f0a287ac Remove ENABLE_CJSON_GLOBAL from cmake 2020-11-11 16:37:33 +08:00
halx99 84741ab567 Update config.json [ci build] 2020-11-11 16:30:44 +08:00
halx99 7cf17f70c3 Remove unused file 2020-11-11 16:22:03 +08:00
halx99 0bc8728342 mandatory yasio for lua bindings 2020-11-11 15:51:46 +08:00
halx99 e0a36031c9 fix cjson can't use 2020-11-11 15:21:29 +08:00
halx99 58ff3a5f4b fix ci for ios [ci build] 2020-11-11 15:07:21 +08:00
halx99 b68c8601d8 fix nasm detect variable CMAKE_ASM_NASM_COMPILER_LOADED not correct [ci build] 2020-11-11 13:51:34 +08:00
halx99 465831759e Make nasm compiler optional [ci build] 2020-11-11 13:27:52 +08:00
halx99 b921ad8a92 Since thirdparty libs README.md have detail license list, licenses folder could be remove 2020-11-11 13:26:54 +08:00
HALX99 6d3f321694
Update config.json [ci build] 2020-11-11 13:05:10 +08:00
halx99 649f1c7a62 Try enable nasm compiler for libjpeg-turbo boost 2020-11-11 10:31:41 +08:00
halx99 8bf0039751 Add compiler flags -mfloat-abi=softfp for android armv7? 2020-11-10 14:36:55 +08:00
HALX99 a8f0cc442a
fix #242 [ci build] 2020-11-10 14:08:46 +08:00
HALX99 ab21e1f750
Update config.json [ci build] 2020-11-09 23:59:26 +08:00
halx99 c72d21b1a3 fix android ci [ci build] 2020-11-09 19:40:43 +08:00
halx99 b5e9f00307 fix ci [ci build] 2020-11-09 18:27:52 +08:00
HALX99 8698214b9e
Update run-scripts.sh [ci build] 2020-11-09 17:53:23 +08:00
HALX99 5f66e77575
Update config.json [ci build] 2020-11-09 16:57:03 +08:00
HALX99 8faa3c9fd8
Update config.json [ci build] 2020-11-08 15:58:55 +08:00
halx99 7d1c669231 Sets box2d as default physics 2d engine 2020-11-08 13:20:36 +08:00
halx99 c9408aadad Merge branch 'master' of https://github.com/c4games/engine-x into master 2020-11-08 13:12:06 +08:00
halx99 5da2894e1b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 f80a6ef25c Update config.json [ci build] 2020-11-07 11:53:01 +08:00
halx99 520cc31f1b Add cmake option -DLUA_ENGINE=luajit to switch lua engine to luajit [ci build] 2020-11-07 10:36:22 +08:00
halx99 1d4527772e Update README for xcode12 build simulator guide 2020-11-07 10:20:59 +08:00
HALX99 f60e686454
Update README_CN.md 2020-11-06 21:13:56 +08:00
HALX99 76f9e22f9f
Merge pull request #256 from halx99/matching-ds-state 
[Metal] matching depth stencil state
 2020-11-06 10:54:19 +08:00
HALX99 d4284b880e
Update comment 2020-11-06 09:33:26 +08:00
halx99 a2a7166808 [Metal] matching depth stencil state 2020-11-06 08:56:25 +08:00
halx99 8e35201726 fix #255 [ci build] 2020-11-05 22:51:33 +08:00
halx99 449d8ce0e2 fix #255 [ci build] 2020-11-05 22:24:30 +08:00
HALX99 8a1c874af0
Create .lgtm.yml 2020-11-05 19:39:02 +08:00
halx99 c5493b4230 Update extension spine README.md 2020-11-04 23:28:51 +08:00
halx99 f90046f0ac Tidy extension spine folder structure [ci build] 2020-11-04 23:17:05 +08:00
halx99 d5d11d203a fix lua bindings [ci build] 2020-11-04 19:35:58 +08:00