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

751 Commits

Author SHA1 Message Date
aismann 8139894edd replace push_back() vs emplace_back() on extension (#785) 2022-08-09 09:54:53 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 ddc7d8ccd0 Merge: f40c44755f 7a7c8fe2ae 
Merge branch 'dev' of https://github.com/axis-project/axis into dev
 2022-08-06 22:03:14 +08:00
halx99 714d814288 Improve android setup tools 
- Rename ANDROID_SDK to ANDROID_SDK_ROOT, refer to: https://developer.android.google.cn/studio/command-line/variables
- CMake: Use ndk in sdk_root/ndk/xxx/
 2022-08-06 22:02:58 +08:00
halx99 64ec0587a5 Committing genbindings changes 2022-08-06 12:11:55 +00:00
Turky Mohammed 818eb3d754 [PROPOSAL] Add wireframe rendering and function classification improvements. (#778) 
* Add wireframe rendering and function classification improvements.

* Fix platform compilation.

* Update CommandBufferGL.cpp

GL_LINE and GL_FILL are no present in mobile devices, so the raw value has been used instead.

* Update CommandBufferGL.cpp

* Try fix IOS compilation

* Update CommandBufferMTL.h [skip ci]

* GLES & D3D11 wireframe

Added crude but okay wireframe mode for GLES and D3D11 devices.
 2022-08-06 16:17:55 +08:00
halx99 ca3c6fe1fd Fix #776 2022-08-04 21:05:48 +08:00
tkzcfc 8e6d06e9fe Support spine binary files (#777) 2022-08-04 20:11:11 +08:00
涓€绾跨伒 c28df20133 Merge: 654326ec5a 6c08914f74 
Merge pull request #772 from askamn/dev

Replace getSpriteFrameByName() with findFrame() in cocos-studio
 2022-08-03 09:53:53 +08:00
pietpukkel 1a6575ae52 Support for Apple Silicon / M1 
Added universal libraries where needed and changed PNG CMake file to include ARM files when generating Mac XCode project.
 2022-08-02 17:48:03 +02:00
unknown d6e6e81505 Replace getSpriteFrameByName() with findFrame() in cocos-studio 2022-08-02 20:01:44 +05:30
halx99 2f90855c0a Fix live2d_tests android build 2022-08-02 17:55:42 +08:00
halx99 752c4d1d16 Committing genbindings changes 2022-08-02 00:29:11 +00:00
halx99 dec34b4471 Sync spine=3.8 latest 2022-07-26 21:04:27 +08:00
tkzcfc 839097ed95 [Lua Binding] Support return type 'ResourceData' (#763) 2022-07-22 13:13:22 +08:00
aismann 2a2e8a1e95 Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
halx99 07906b96e1 Fix #758 2022-07-20 18:41:33 +08:00
halx99 c4feff6e3a Committing genbindings changes 2022-07-20 00:57:28 +00:00
halx99 57a65dc8ce Committing genbindings changes 2022-07-19 10:58:12 +00:00
halx99 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
halx99 9c97f210df Remove check since axis allways enable string-pooling 2022-07-16 17:53:01 +08:00
涓€绾跨伒 a5e442b33c Merge: 2e0ac94240 4974d1181c 
Merge pull request #750 from axis-project/migrate-macros

Migrate macros 'CC_' to 'AX_'
 2022-07-16 12:45:47 +08:00
halx99 e90579ed96 Sync platform macros [skip ci] 2022-07-16 10:53:30 +08:00
halx99 c16a33e347 Migrate more macors 2022-07-16 10:43:05 +08:00
涓€绾跨伒 ac1872494c Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 41d2c44308 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
halx99 05805987d5 Sync docs for namespace migrate 2022-07-15 18:40:42 +08:00
halx99 11be5350f9 Fix lua templte 2022-07-12 23:21:04 +08:00
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
halx99 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 765d3f5332 Replace CC_ with AX_ 2022-07-08 02:17:41 +03:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
Turky Mohammed d3c3fe9538 Merge: b4d04f4df9 1c02999878 
Merge branch 'adxeproject:dev' into improve-engine-types
 2022-07-06 07:21:13 +03:00
DelinWorks b9547e5407 Update FastRNG.h 2022-07-06 07:20:40 +03:00
halx99 a5e957de9f Fix ci 2022-07-05 23:47:25 +08:00
halx99 e1757a275f Merge: 3a070cd801 9d2ed962e6 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2022-07-05 15:53:50 +08:00
halx99 6aaff5cda8 Delete *.obj to avoid missing 3d model .obj 
a. build_xxx, out_xxx in .gitignore is enough ignore code .obj
 2022-07-05 15:53:33 +08:00
halx99 36caefd1d0 Committing genbindings changes 2022-07-05 07:53:11 +00:00
Turky Mohammed 656babac78 [IMPROVMENT] Change class name `Sprite3D` to `MeshRenderer` (#705) 
* First draft [skip ci]

* Improve comments [skip ci]

* Rename MeshRendererMaterial to MeshMaterial [skip ci]

* Update dependent classes.

* Replace occurrences of Sprite3D with MeshRenderer.

* Update cpp-tests and extensions.

* Fix compilation.

* Try fixing lua-bindings

* Try fixing lua-bindings

* Update lua_cocos2dx_3d_manual.cpp [skip ci]

* Create RENAMED_TYPES.md
 2022-07-05 14:48:46 +08:00
halx99 5edbfa5448 [spine] Use currentState to setup shader stubs 2022-07-05 14:40:18 +08:00
halx99 db7681bb8b [Spine] Use backend shader definations 2022-07-05 14:36:04 +08:00
halx99 ba582903fc Spine runtime can use official code 2022-07-05 14:13:15 +08:00
DelinWorks d50d34ea3b Separate renderer enums to their own file. 2022-07-04 19:52:17 +03:00
halx99 9af6fc8c88 Committing genbindings changes 2022-07-04 16:47:16 +00:00
涓€绾跨伒 e6ae7c44b3 Merge: 555f847c1f 6dd8b2c74a 
Merge pull request #702 from DelinWorks/improve-engine-types

[PROPOSAL] Move global enums to their own file.
 2022-07-05 00:39:20 +08:00
DelinWorks 96158090db Add stride functions and remove unneeded UNSPEC value. 2022-07-04 19:20:04 +03:00
DelinWorks 7e199cce21 Update lua_cocos2dx_auto.cpp 2022-07-04 18:34:50 +03:00
halx99 a31ba3caae Improve meshdata load 
- Avoid GC alloc when store indices
- Fix indices iterator by IndexArray::for_each
 2022-07-04 23:23:33 +08:00
DelinWorks 49508bd13c Improve function naming. 2022-07-04 17:45:23 +03:00
halx99 0b4363bfc0 Refator sampler name in shader 2022-07-04 21:26:48 +08:00
DelinWorks a8d704babe Improve function naming and add descriptions. 2022-07-04 05:55:29 +03:00
DelinWorks 6a7a77c604 Update CCDirector.h 2022-07-04 04:58:13 +03:00
halx99 38743291e2 Improve class IndexArray 2022-07-04 09:13:06 +08:00
DelinWorks c97042be2e Fix android arm64 incorrect random number generation. 2022-07-04 03:28:55 +03:00
DelinWorks 35d3df7075 Fix mobile compilation. 
Treat `CC_ENABLE_CACHE_TEXTURE_DATA` portion of code accordingly.
 2022-07-03 22:50:19 +03:00
DelinWorks a4be3feda6 Update lua_cocos2dx_auto.cpp 2022-07-03 21:40:51 +03:00
DelinWorks 0ff762b835 Move global enums to their own file. 2022-07-03 20:43:55 +03:00
halx99 5f4e2c0463 [WIP] Wrapper IndexArray with byte_buffer 2022-07-03 17:24:10 +08:00
halx99 e0e7b2a6c5 Committing genbindings changes 2022-07-03 07:36:16 +00:00
halx99 7ef1ab7eb0 Committing genbindings changes 2022-06-30 13:51:59 +00:00
涓€绾跨伒 6d2bc9bbf2 Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
halx99 18f7def462 Committing genbindings changes 2022-06-30 12:22:46 +00:00
涓€绾跨伒 5ef42d4e39 Merge: 42fc96bdac 3d1690cc25 
Merge pull request #681 from adxeproject/refactor-layer-new

Use sprite to implement layer color for auto batch draw
 2022-06-30 20:13:30 +08:00
涓€绾跨伒 118c1af907 Merge: 752d3150eb f52bc9472d 
Merge pull request #682 from aismann/poly2tri

poly2tri:  Version: git 81612cb  (until May 20, 2022)
 2022-06-30 19:07:49 +08:00
halx99 32f3777128 Fix ci 2022-06-30 18:15:43 +08:00
aismann 9f060fbd99 Version: git 81612cb (until May 20, 2022) 2022-06-30 12:13:55 +02:00
halx99 502d80ede1 Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +08:00
halx99 f48be5bf4a Committing genbindings changes 2022-06-28 09:42:02 +00:00
涓€绾跨伒 6d1a2e70e7 Merge: 040a64b920 884a4c3b1d 
Merge pull request #675 from adxeproject/unify-fps-limit

Unify frame rate control logical to director mainLoop
 2022-06-28 17:33:00 +08:00
涓€绾跨伒 8b42852d1f Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
halx99 0acbfdb35a Committing genbindings changes 2022-06-28 08:51:45 +00:00
涓€绾跨伒 614397d0f4 Merge: 7f795d7a6c c6c07428bf 
Merge pull request #677 from rh101/rendertarget-fix

Make the render target selectable for RenderTexture
 2022-06-28 16:39:59 +08:00
halx99 f8c036e621 Improve frame rate control precision 2022-06-28 16:33:50 +08:00
rh101 62af2299a6 Allow the selection of a shared or new render target for each instance of RenderTexture 
Add a method to check if the RenderTexture is using a shared render target
 2022-06-28 17:42:33 +10:00
halx99 6d9c4ea327 Fix ci 2022-06-28 14:53:39 +08:00
halx99 7591ed14cd Committing genbindings changes 2022-06-25 07:30:20 +00:00
涓€绾跨伒 79a1399b7c [CMake] Remove dup link 2022-06-25 15:23:40 +08:00
aismann b4a7e3823f Revert "Small improvemnts" 
This reverts commit 945b65716f.
 2022-06-25 02:06:31 +02:00
aismann b79fab0a97 Small improvemnts 2022-06-25 02:00:10 +02:00
涓€绾跨伒 d8a66d4897 Merge: 61c159d3d0 932c3bcffa 
Merge pull request #668 from adxeproject/adxe-ext-live2d

Add extension Live2D support
 2022-06-24 16:23:26 +08:00
涓€绾跨伒 0e94f96b8a Merge: 6431cd1256 e4b891e550 
Merge pull request #667 from FireStorm2012/FireStorm2012-patch-1

Fix print log format
 2022-06-24 15:46:45 +08:00
halx99 e6accc2f7e Add extension Live2D support 
Live2D sdk version: 4-r.4, reelase date: 2021/12/09
 2022-06-24 15:18:08 +08:00
FireStorm2012 9de425666b Update lua_xml_http_request.cpp 
print log bugfix
 2022-06-24 15:01:26 +08:00
halx99 52f6bcb989 Committing genbindings changes 2022-06-24 06:28:59 +00:00
halx99 ee3605c991 Improve renderer 2022-06-24 14:18:48 +08:00
halx99 1122db3ec8 Improve code style 2022-06-24 03:09:50 +08:00
halx99 6068b0389e Committing genbindings changes 2022-06-19 17:57:08 +00:00
halx99 4cf6c52cf4 string_view 2022-06-20 01:49:50 +08:00
DelinWorks 2de02067d3 flag camera as Initialized in custom create functions. 2022-06-17 20:41:38 +03:00
涓€绾跨伒 19e96d53c8 Rename is64BitIOSDevice to is64BitMobileDevice 2022-06-17 22:54:52 +08:00
涓€绾跨伒 0c431fddf1 Fix ci 2022-06-17 22:50:29 +08:00
halx99 61956d8dd6 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +08:00
Turky Mohammed 5a0f0f9073 Merge: 101f09d912 820ad21a46 
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature
 2022-06-17 17:16:55 +03:00
DelinWorks fed10a0197 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
halx99 482df4befc Committing genbindings changes 2022-06-16 13:25:34 +00:00
涓€绾跨伒 9b50a8e8c3 Improve text rendering (#652) 
* Improve text-rendering
a. Separate outline texture data upload for GL and Metal backend
b. Fix memory leak of FontAtlas::_currentPageDataRGBA
b. Add FontFreeType::setMissingGlyphCharacter for rendering a missing char
d. Improve FontFreetype::renderCharAt with memcpy
 2022-06-13 01:44:31 +08:00
Turky Mohammed 87e4fad96c Merge: a2bea19e1e 3ac444efa6 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-12 17:26:54 +03:00
DelinWorks 237a3ccbad Improve emission shapes workflow. 
`ps->addEmissionShape(ParticleSystem::createConeShape({ -2000, 0 }, 400, 90, 50));` is the new workflow.
 2022-06-11 18:06:43 +03:00
halx99 1e080a0f60 Committing genbindings changes 2022-06-09 09:21:12 +00:00
halx99 7943dce776 Committing genbindings changes [skip ci] 2022-06-09 08:51:15 +00:00
涓€绾跨伒 b6790e40e4 Merge: 1cdbf8c273 d2e96534d2 
Merge pull request #645 from aismann/patch-1 [skip ci]

Update readme.md
 2022-05-25 18:17:43 +08:00
DelinWorks e6c13ac358 Revert stashed changes temporarily. 2022-05-25 10:20:35 +03:00
halx99 3123ede6b3 Committing genbindings changes [skip ci] 2022-05-25 02:36:38 +00:00
Turky Mohammed d0b551d26b Merge: 6e1d48835e 193ed82788 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 16:55:30 +03:00
DelinWorks 5239256b13 Improve particle RNG and add useful functions 
Replaced M11 RNG with KISS RNG which is better and fixes a problem with particle strafing, added the ability to pause the entire particle system (useful for pause menus) and ability to control particle system time speed multiplier 馃挭馃ザ
 2022-05-23 16:04:09 +03:00
halx99 71c27f43d8 Fix ios device install problems 
- lua template missing `CFBundleExecute`
- Use `_` instead tests project to avoid unknown error
 2022-05-23 17:03:07 +08:00
DelinWorks 4f7bbcdb48 Add TODO 2022-05-21 16:56:56 +03:00
halx99 38510615db Improve code style 2022-05-21 21:55:48 +08:00
DelinWorks 0a8035c12c Add sprite frame and animation descriptors support 2022-05-21 16:48:46 +03:00
halx99 6dfbe87c3b Fix parameter order 2022-05-20 17:03:26 +08:00
halx99 d84e14e290 Committing genbindings changes [skip ci] 2022-05-18 05:00:01 +00:00
halx99 dffaf9b8d7 Enable video & webview lua-tests on windows 2022-05-18 12:52:05 +08:00
涓€绾跨伒 1a626761a6 Fix include 2022-05-16 08:06:51 +08:00
halx99 a2fcc61a10 Committing genbindings changes [skip ci] 2022-05-13 13:15:09 +00:00
halx99 c3f40d2b36 Improvements and bug fixes 
Improve ResizableBufferAdapter style

Improve extesnion adxelua

Improve code quality

Fix lua-tests BillBoardTest

Sync texture pixel format enum values for adxelua

Fix luaval_to_vec2 parameter location

Improve windows workflow

Improve cmake scripts

Take care Texture2D::setDefaultAlphaPixelFormat use
 2022-05-13 21:06:29 +08:00
halx99 a6dbeb029e Committing genbindings changes [skip ci] 2022-04-28 04:20:11 +00:00
halx99 cc5509f23a Update copyright notices 2022-04-25 19:15:46 +08:00
halx99 c441e517ed Committing genbindings changes [skip ci] 2022-04-25 01:43:44 +00:00
涓€绾跨伒 479c45ca9a Update README.md 2022-03-30 15:40:06 +08:00
halx99 fad7ac3258 Improve LuaObjcBridge 2022-03-25 10:35:18 +08:00
halx99 a236e9481e Committing genbindings changes [skip ci] 2022-03-18 14:27:43 +00:00
halx99 4a2cd4a4fb Committing genbindings changes [skip ci] 2022-03-18 13:52:57 +00:00
halx99 a576a42002 Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
deal f6fa99b184 Update README.md [skip ci] 2022-02-25 19:09:06 +08:00
halx99 323ed9431b Renaming extension ImGuiEXT to ImGui 
The singleton class ImGuiEXT also was renamed to ImGuiPresenter
 2022-02-25 19:03:09 +08:00
halx99 55f656d9db Committing genbindings changes [skip ci] 2022-02-24 11:08:25 +00:00
halx99 3452ab798d Update project urls 2022-02-24 18:51:36 +08:00
halx99 5e893f3b4d Update project urls 2022-02-24 18:45:25 +08:00
halx99 f7d3d37ae5 [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 87c51c656c Update plainlua to 5.4.4, pugixml to 1.12.1 2022-02-17 18:06:19 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
halx99 bee4c310da Fix WidgetPropertiesReader::getWidgetReaderClassName incorrect 2022-02-16 11:54:48 +08:00
halx99 9b3f4c3f71 Committing genbindings changes [skip ci] 2022-02-15 23:01:37 +00:00
deal 79c8ec3431 Fix #584 2022-02-12 19:56:00 +08:00
halx99 93e250889f Improve some code for #543 2022-02-08 21:54:21 +08:00
halx99 fcbc95bd47 Done #579, update ImGui to 1.87 2022-02-08 12:43:16 +08:00
halx99 bc1d0223c0 Remove unnecessary parameter 2022-02-06 13:06:49 +08:00
deal aca3448bc3 Fix #576 2022-02-03 15:45:58 +08:00
deal de13c4bcba Delete unused 2022-01-23 11:01:42 +08:00
halx99 5486d94646 Fix lua_xml_http_request dataSize incorrect 2022-01-18 18:39:58 +08:00
deal d8dc6c8453 hard to link fmt-header-only[skip ci] 
target_link_libraries(fairygui fmt-header-only)
 2022-01-08 15:25:50 +08:00
deal f3b3b5a0b1 Update CMakeLists.txt 2022-01-08 14:01:43 +08:00
halx99 5a2807433e [spine] Improve RTTI compare performance when compiler string pooling enabled 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2012

Signed-off-by: halx99 <halx99@live.com>
 2022-01-05 14:10:05 +08:00
halx99 14a3a0de93 Fix ClippingAttachment doesn't work 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2011

Reported by: @kangleblue

Signed-off-by: halx99 <halx99@live.com>
 2022-01-04 22:38:02 +08:00
halx99 cd98e6c880 Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 2819d4f10d Improve vec2, vec3, vec4 lua storage 
a. store as fixed size array
b. use metatable access via: x, y, z, w
c. For vec2
- vec2[0] could be access via x or w(idth) or u
- vec2[1] could be access via y or h(eight) or v
 2022-01-03 22:06:49 +08:00
halx99 74271f207b Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 8beea3967f Fix ci 2021-12-31 16:29:11 +08:00
halx99 f80ddd3505 Fix ci [skip ci] 2021-12-31 15:49:45 +08:00
deal 4044d34699 Update CMakeLists.txt 2021-12-31 14:47:57 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00
deal f32280ff42 Merge: 687d15f16e 369de31853 
Merge pull request #560 from adxeproject/ahead

Merge ahead to dev
 2021-12-31 12:12:40 +08:00
halx99 64d7b55366 Update ci branch name 2021-12-31 11:00:35 +08:00
halx99 fa199da794 Improve string_view for some file 2021-12-30 09:48:39 +08:00
halx99 80f650981f Committing clang-format changes 2021-12-29 11:31:28 +00:00
deal a813aac10e Merge: 6639f55c0f bec2e07a00 
Merge pull request #561 from adxeproject/dev

Merge Crash Fix #559 from dev
 2021-12-28 21:27:32 +08:00
halx99 13927aa1bc Fix #559, match number type for get CURLINFO_RESPONSE_CODE 
a. On linux x64, will crash with stack protector

Reported by @rh101

Signed-off-by: halx99 <halx99@live.com>
 2021-12-28 21:00:45 +08:00
halx99 4a9e784140 Fix linux build 2021-12-28 19:16:15 +08:00
halx99 36e3a924a6 Fix ci 2021-12-28 19:10:50 +08:00
halx99 b0aee13b7f Committing clang-format changes 2021-12-28 08:06:23 +00:00
halx99 4ea331fb20 string_view for lua bindings 2021-12-28 15:46:32 +08:00
halx99 60cea769f9 string_view for apple 2021-12-28 11:48:48 +08:00
halx99 6bba4ce24b Merge: d397854ead 9eeeb151a1 
Merge commit
 2021-12-28 11:07:12 +08:00
halx99 c93849c6de Commit chnages 2021-12-28 11:05:34 +08:00
halx99 f905bf5c23 Committing clang-format changes 2021-12-28 03:00:34 +00:00
halx99 b93d2419cc string_view for android 2021-12-27 19:24:35 +08:00
halx99 4045ae05c1 Modify fairygui for string_view 2021-12-27 15:10:29 +08:00
halx99 b63f815488 Modify some extensions for string_view 2021-12-27 13:52:08 +08:00
halx99 5ba5049146 Huge changes for all string_view 2021-12-26 23:26:34 +08:00
halx99 8f83250ba4 Committing clang-format changes 2021-12-25 02:04:45 +00:00
halx99 abf1cff328 Fix compile 2021-12-24 22:58:29 +08:00
halx99 814971fd68 Fix encoding 2021-12-24 21:16:08 +08:00
halx99 1b02f8b4d3 Fix encodings 2021-12-24 21:11:44 +08:00
halx99 ef20898f9a Fix encodings 2021-12-24 20:50:31 +08:00
halx99 6c30619021 Improve starter lua template HellLua 
a. Use lua search path for scripts instead FileUtils
b. Put new lua search path to front of LuaStack
 2021-12-19 14:59:00 +08:00
halx99 52de9ba400 [HttpClient] Use `byte_buffer` instead `std::vector<char>` 2021-12-10 19:15:48 +08:00
halx99 1ee106007a Remove all unnecessary nothrow 2021-12-08 00:11:53 +08:00
aismann 493cb44394 change all setString(const std::string & ...) to setString(std::string_view ...) 
Change all methods inherited from virtual void setString(std::string_view label) = 0;
 2021-11-30 20:35:34 +01:00
halx99 12f1f5929d Fix compile 2021-11-26 18:13:33 +08:00
halx99 fd5ed93093 Move ntcvt directory 2021-11-26 17:19:50 +08:00
halx99 41669f0a7f Improve skipBOM 2021-11-22 13:58:41 +08:00
halx99 251c95ff2d Fix cocos2dx_lua_loader 2021-11-17 20:59:12 +08:00
halx99 eb5dcb6cfc Refine cocos2dx_lua_loader logic 2021-11-16 14:12:32 +08:00
halx99 f7128789a0 Fix lua state usage 2021-11-15 19:05:08 +08:00
halx99 4b9ae12a7c Compatible lua getXXXSize API for get width,height from vec2 2021-11-12 19:12:29 +08:00
halx99 0016ea2b62 Sync fix 2021-11-11 18:33:46 +08:00
halx99 31ed6d97a9 Fix fairygui compilation 2021-11-11 18:04:38 +08:00
halx99 c6945c44e5 Add `CCValue` int64_t/uint64_t support 2021-11-09 14:29:15 +08:00
halx99 0f25bc842c Remove unnecessary function 2021-10-23 23:36:48 +08:00
halx99 554412f4fd Use struct `Vec2` instead `Size` 2021-10-23 23:27:14 +08:00
halx99 a49bba32ef Merge: 846231e2f1 cc1d09d04d 
Merge pull request #521 from adxeproject/refine-lua-loader

Refactor lua loader, reload lua with file name as-is
 2021-10-12 14:18:02 +08:00
halx99 8d2dd47cc6 Fix #522 2021-10-12 13:16:27 +08:00
halx99 8d0725c6b1 Remove unused 2021-10-12 13:12:44 +08:00
halx99 20a399c28c lua load, better code style 2021-10-12 13:07:05 +08:00
halx99 e7364964c4 lua loader, more better pefromance 2021-10-12 12:35:03 +08:00
halx99 ec275dce76 Remove unused 2021-10-12 12:18:38 +08:00
halx99 d8fdcc3be9 More standard 2021-10-12 12:11:48 +08:00
halx99 0b12c01019 Don't try different file ext, load as-is for lua load 2021-10-11 23:23:30 +08:00
halx99 dde1956e02 Reduce file exist check 2021-10-11 22:57:21 +08:00
halx99 ca7cc4f697 Refine lua loader 2021-10-11 22:34:41 +08:00
halx99 3474de5263 Fix ci 2021-10-11 13:44:28 +08:00
halx99 77404fd02a Code style 2021-10-11 12:15:41 +08:00
halx99 c15442eaad Fix some warnings 2021-10-09 13:48:56 +08:00
halx99 efce326cd9 Use lua-5.4.3 as default plainlua version 
see also: #332
 2021-10-08 16:15:33 +08:00
halx99 7c940546a5 Fix #508 warnings 2021-09-26 21:52:36 +08:00
halx99 abca030baf Fix warnings 2021-09-26 21:03:41 +08:00
halx99 5a2afd2d43 Refine ImGuiEXT 2021-09-26 19:56:34 +08:00
halx99 24f76a53b3 Fix #507 2021-09-26 12:05:42 +08:00
halx99 629625a976 Fix #505 2021-09-23 14:53:57 +08:00
halx99 01f34d1e74 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 fb980f51ab Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +08:00
姒嗘煶鏉? 35b658c90e Merge: f5663f279c d73d937894 
Merge remote-tracking branch 'upstream/dev' into dev
 2021-09-05 20:45:32 +08:00
姒嗘煶鏉? 0aff165959 [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 764c17e86e LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
rh101 e9fe5aa3a8 Update lua bindings 2021-09-02 21:24:45 +10:00
rh101 4e7db23d38 Remove getLong() method 
Change %du to %u, and %lx to %x
Use "stdint.h" instead of <cstdint> for TGAlib.h
 2021-09-02 20:30:20 +10:00
姒嗘煶鏉? 64e2cdd8d9 [fix]The problem of inaccurate maximum width limit when using system fonts. 2021-09-02 17:15:03 +08:00
rh101 eba8696d65 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
halx99 0cee74a4bf Fix part of #487 2021-09-02 11:43:27 +08:00
halx99 0a4d3ee73d Merge: cb81a61530 a762c94904 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2021-09-01 10:10:46 +08:00
halx99 756ff065c8 Enum compatible [skip ci] 2021-08-31 15:50:18 +08:00
halx99 be5eff1d5a Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 97fbec0b36 Merge: 95b9969365 80e0e3b941 
Merge pull request #485 from adxeproject/fix-spine-uniform-location-mismatch

Fix spine command pipeline state uniform location mismatch
 2021-08-30 18:57:36 +08:00
halx99 32b86c53c9 Update changelog 2021-08-30 17:55:00 +08:00
halx99 1a7d23eff5 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
aismann 74dfe14b16 Merge: 1c05947474 7dd7422abd 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 08:33:22 +02:00
halx99 fc1c901209 Macro compatible 2021-08-27 13:54:05 +08:00
aismann 0baf946df7 Merge: cbeeb8d8ab 3990cc765d 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 07:49:17 +02:00
aismann 6632c5c3f6 Debug 64bit build error 
Severity        Code    Description     Project File    Line    Suppression State
Error (active)  E0075   operand of '*' must be a pointer but has type "bool"    cpp-tests       D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp   153
 2021-08-27 07:47:22 +02:00
halx99 44ea2208a6 Delete x-studio.cmake 2021-08-27 13:23:51 +08:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 fa1f2f2d33 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 5d0565b900 Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 860400cb8c Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 d59bcadf23 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 45b5a9f689 Update imgui 2021-08-23 17:49:38 +08:00
halx99 426aa0db93 Merge: b48133e9c6 c9ebafe501 
Merge pull request #466 from rh101/fix-sprite-test-crashes

Fixes for crashes in sprite and sprite cache tests
 2021-08-19 14:35:44 +08:00
rh101 ad3e3380e2 Fixes for crashes in sprite and sprite cache tests 2021-08-19 15:43:18 +10:00
aismann 4ec017f4bc class PhysicsDebugNodeBox2D cleanup 2021-08-19 06:03:58 +02:00
aismann 18184b1d31 fix 2021-08-18 06:00:43 +02:00
aismann 2ab8f26871 Update CCPhysicsDebugNodeBox2D.cpp 2021-08-18 05:31:33 +02:00
aismann 5f086208a0 Important API change for naming convention 
rename
class DebugDraw
to
PhysicsDebugNodeBox2D
 2021-08-18 05:23:03 +02:00
aismann 288941a63f cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 bd4d07b86e Update LUA bindings 2021-08-18 01:01:56 +10:00
rh101 4a0d48d93e Fix for incorrect method name 2021-08-17 14:51:17 +10:00
rh101 c60f66c9bb Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 7a6734408d Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
halx99 de54082c76 Update lua bindings 2021-08-14 13:22:03 +08:00
aismann 39dbbc4713 More improvements (#455) 2021-08-14 10:28:28 +08:00
halx99 fd9422d36d Update lua bindings 2021-08-13 20:36:10 +08:00
halx99 84a84a8931 Merge: 39eb09daad 861c356bb4 
Merge pull request #447 from aismann/Box2D_TestBed_improvement

Box2D_TestBed_improvement
 2021-08-12 15:34:24 +08:00
aismann d0a18036b5 Update README.md 2021-08-12 07:03:14 +02:00
aismann c94562d417 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 5254edc733 Update spine-3.8 runtime to latest 
Maybe no further update until upgrade to spine-4.x
 2021-08-07 00:59:58 +08:00
halx99 50c270e8f5 Merge: 0a682f0dc1 c2b44cc7e1 
Merge pull request #445 from aismann/Box2D-Basic-Clean-code-and-speed-optimized

Box2D - Basic ready for use (clean code and speed optimized)
 2021-08-06 19:40:32 +08:00
aismann 97a6104516 Update README.md 2021-08-06 12:19:45 +02:00
aismann 4c6f9fcc3d Box2D - Basic ready for use 2021-08-06 09:35:29 +02:00
aismann b5d0326e6e Add DebugDraw to Box2DTest, Improve Box2D-Testbed add some new classes to physics-nodes (#444) 
* Update AppDelegate.cpp

Add '*Debug*' on the title

* Update CCPhysicsDebugNodeBox2D.h

* Improve Box2D-TestBed

* improvements

* Update CCPhysicsDebugNodeBox2D.cpp

* Improve the 2d physics stuff

* dirty fix for build android:

* Fix fatal error: 'GLFW/glfw3.h' file not found

* Add DebugDraw to  Box2DTest, Improve Box2DTestBed, Add some new physicnodes

* fix settings, unknow  labelDebugDraw;
 2021-08-05 17:23:55 +08:00
halx99 8a9b74fc4d Fix ci 2021-07-19 08:10:37 +08:00
halx99 af027f0161 Update lua_xml_http_request.cpp 2021-07-19 01:29:08 +08:00
halx99 f0a2bd416a Improve code quality 2021-07-17 23:32:31 +08:00
halx99 bd6bbaf4d7 Update fairygui 2021-07-17 19:51:27 +08:00
halx99 6acbbaf80f Tidy thirdparty lua-cjson 2021-07-16 11:17:34 +08:00
halx99 4b7e098e65 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 ec5ef59474 Improve code quality 2021-07-15 23:03:43 +08:00
halx99 36042fdb55 Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
aismann b9942e0ac3 Update README.md 2021-07-08 07:42:15 +02:00
halx99 4d6ece53f2 Sync lua bindings [ci build] 2021-06-27 21:47:15 +08:00
halx99 10c1ed15ef Refactor dual sampler shader [ci build] 
Since not only etc1 could use sepreate RGB, A to two texture samplers, we unify the shader name.
 2021-06-27 20:58:50 +08:00
aismann 2f9d7c5d3f Fix CCPhyhsicsDebugNode Polygon stuff, add all bench tests, ... (#403) 
* Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.

* Improve Chipmunk2D- TestBed and starting the code cleanup ...

* Fix CCPhyhsicsDebugNode Ploygon stuff,  add all bench tests, improve  same demos, code cleanup
 2021-06-26 17:46:06 +08:00
halx99 72d1ba9ea6 Merge: df58dd753c 2397d54daf 
Merge branch 'dev' into Chipmunk2D
 2021-06-24 17:04:04 +08:00
aismann dbcb5816fe Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 14dc7f05f9 Reimplement HttpClient based on yasio (#390) 
* [WIP] Reimplement HttpClient based on yasio
This change will make HttpClient support concurrency request

* [WIP] Reimplement HttpClient based on yasio
a. timeoutForRead support
b. Improve code

* [WIP] Reimplement HttpClient based on yasio [ci build]

* [WIP] Fix ci [ci build]

* [WIP] Reimplement HttpClient based on yasio [ci build]
PUT,DELETE support

* [WIP] Reimplement HttpClient based on yasio [ci build]
HttpClientTest works

* Update HttpClient.cpp

* HttpClientTest: enable sslVerifaction test

* Update HttpResponse.h

* Sync luabindings [ci build]

* Add chrome UA test

* Fix ci [ci build]

* The timer for read timeout should be associated with per channel

* Remove unused function

* Update url
 2021-06-24 12:33:07 +08:00
aismann d7b13b36d7 Chipmunk2D - TestBed Add more examples and improve using the original source 2021-06-18 16:52:56 +08:00
halx99 cbb1df02c4 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
halx99 9ed3be94c0 Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 e5237503fb Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 8b9d3ce3cd Revert "Fix imgui draw frame cause drawNode Afterimage" 2021-06-17 21:16:30 +08:00
halx99 f0f4ea4567 Fix imgui draw frame cause drawNode Afterimage 2021-06-17 12:20:23 +08:00
aismann a8f7a7d7c1 Improve the "Physics part" (#379) 
* 1. Add "initial" Chipmunk - TestBed

More demos comes later.

* 2. Removed unused source

* Update CMakeLists.txt

* Some fixes #1

* workaround #1

* workaround #1
 2021-06-16 19:34:09 +08:00
halx99 c513e20e2f Update imgui to 1.84 WIP [ci build] 2021-06-15 22:30:54 +08:00
halx99 b330ff28ae Fixup [ci build] 2021-06-08 22:15:21 +08:00
halx99 d526527c9d Rename external to thirdparty [ci build] 2021-06-08 20:45:55 +08:00
halx99 6c558db560 Update README.md 2021-05-24 17:54:18 +08:00
halx99 8b9a5acdf9 Fix lua include header 2021-05-18 19:56:36 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 7cbfd84f95 Enable build curl with openssl [ci build] 2021-04-28 15:10:28 +08:00
halx99 0511520281 Merge: 7f1ca55a97 1efe0091a8 
Merge pull request #347 from rh101/imgui-fix

ImGUI font crash fix when using virtual file system
 2021-04-27 23:29:22 -07:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
halx99 72fa15f8f3 Fix cpp-tests exit crash when tableView in scrolling [ci build] 2021-04-26 17:55:55 +08:00
halx99 68a40694a8 Fix ci warnings [ci build] 2021-04-26 17:28:58 +08:00
rh101 b923b1a678 Use reset() to clear unique_ptr. 
Use value initialization for unique_ptr.
Change AudioDecoderOgg override functions to use FileStream* instead of unique_ptr.
Remove redundant code.
 2021-04-26 15:43:33 +10:00
rh101 668e96cadd Use unique_ptr for FileUtils::openFileStream 
Fix OGG audio playback due to incorrect tell() method
Fix unzip close() override method not deleting FileStream pointer.
 2021-04-26 14:21:56 +10:00
RH 5b168e3bb6 Merge: 03bb24f313 85c5705f48 
Merge branch 'vfs-support' into master
 2021-04-26 10:39:09 +10:00
RH 0e2247a2d9 Merge: d1027ab263 ce6117fa65 
Merge pull request #7 from c4games/master

Sync with primary
 2021-04-26 10:32:25 +10:00
rh101 e6990d0b36 Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
halx99 be9bd61131 Fix tool script cocos 2021-04-25 09:22:07 -07:00
rh101 fa4ed8a975 Initialise member variable 2021-04-26 01:05:06 +10:00
halx99 600e96c54c Update lua script 2021-04-25 22:37:52 +08:00
halx99 87be236932 Merge: 8b8b015b02 b1da56d401 
Merge pull request #343 from rh101/curl-fix-filestream

Fix for downloader crash due to uninitialised variables
 2021-04-25 18:34:29 +08:00
rh101 5509d0f80d Update usage of createDownloadFileTask 2021-04-25 18:36:20 +10:00
RH c8c4c2d703 Merge: 6fbebe9617 8b8b015b02 
Merge pull request #6 from c4games/master

Sync with primary
 2021-04-25 18:14:50 +10:00
rh101 c26a5e7bd8 Ensure FileStream is used for file access where possible 2021-04-25 17:22:43 +10:00
halx99 964e515f48 Merge: 2a1459b27b 3d8884721f 
Merge pull request #341 from rh101/vfs-support

Add support for FileStream in ZipUtils and ZipFile
 2021-04-25 14:21:19 +08:00
rh101 cce67f688e Add support for FileStream in ZipUtils and ZipFile 2021-04-25 02:39:47 +10:00
halx99 6f520734c1 Update fairygui runtime [ci build] 2021-04-24 18:53:21 +08:00
halx99 c40b803244 Update spine runtimes 2021-04-24 18:14:30 +08:00
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 473e51cee7 Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 19ef72f788 Properly set gc mode for lua-5.4 [ci build] 2021-03-27 19:49:19 +08:00
halx99 4f0f713977 Merge: 6a868299f5 9aebfd4b0d 
Merge pull request #331 from c4games/cmake-improve

Improve cmake scripts
 2021-03-13 18:46:32 +08:00
halx99 b8892e446b Merge: 91bfb7c8ff a5cf017e0f 
Merge pull request #330 from c4games/lua54-compat

Lua 5.4 compatible
 2021-03-13 18:46:13 +08:00
halx99 d7610b8c77 Improve cmake scripts 
a. rename project 'plainluac' to 'luac'
b. add executable project 'lua'
c. unify cmake runtime directory to bin
 2021-03-13 18:18:40 +08:00
halx99 261bea4234 Lua 5.4 compatible 2021-03-13 16:47:09 +08:00
halx99 757e7edbf7 lua api compatible 2021-01-09 18:32:22 +08:00
halx99 984c164c57 Sync yasio to 3.35.0 [ci build] 2020-12-21 18:12:13 +08:00
aismann f38b271650 Update controller.cpp 
"Node: Physics" using Chipmunk2D (hardcoded on e.g.: CCPhysicsBody.cpp)

Maybe a Wiki entry is also usefull?
 2020-12-20 07:11:13 +01:00
halx99 b92c3d30c4 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 78aaf568c6 fix FUISprite gray to normal doesn't work 2020-12-10 16:54:59 +08:00
halx99 04db04ad93 Merge: 3f4178cc27 dbf81d7511 
Merge pull request #295 from aismann/master

CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann fd70034958 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 73b2b175d9 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
 2020-12-01 16:39:28 +01:00
halx99 43f5a305c8 Merge: 079ecdbbec 5e249bf6f8 
Merge pull request #293 from aismann/master

Chipmunk2D and Box2D works together now (add two new classes) and FIX  ImGuiEXTTest window size problem
 2020-12-01 01:52:47 -08:00
aismann 18cc4a9eb4 Update README.md 
change wiki link:  https://github.com/c4games/engine-x-wiki
 2020-12-01 10:32:09 +01:00
aismann 91843b3fae Chipmunk2D and Box2D works together now (add two new classes) 
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
 2020-12-01 10:15:30 +01:00
halx99 910c1d95a7 Sync extension fairygui 2020-11-26 17:40:32 +08:00
Oren Bengigi f7c9666c41 Fix manifest version greater check 2020-11-18 20:43:49 +02:00
halx99 dd5f706dff Refine jni methods decls [ci build] 2020-11-18 13:25:00 +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 c17a21eb8c fix #262 2020-11-16 22:38:18 +08:00