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

1926 Commits

Author SHA1 Message Date
halx99 600fdd5962 Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
halx99 47db7aff28 Remove check since axis allways enable string-pooling 2022-07-16 17:53:01 +08:00
一线灵 ee8877615d
Merge pull request #750 from axis-project/migrate-macros 
Migrate macros 'CC_' to 'AX_'
 2022-07-16 12:45:47 +08:00
halx99 4974d1181c Sync platform macros [skip ci] 2022-07-16 10:53:30 +08:00
halx99 c0a4371879 Migrate more macors 2022-07-16 10:43:05 +08:00
一线灵 2e0ac94240
Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 f3ac6ea871 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
halx99 dc0670cbd8 Sync docs for namespace migrate 2022-07-15 18:40:42 +08:00
halx99 85e9ae3fa5 Fix lua templte 2022-07-12 23:21:04 +08:00
一线灵 406f962cad
Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
一线灵 279337f17f
Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
halx99 9ee4181976 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
halx99 fff2bd59ed Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks e73b2492c5 Replace CC_ with AX_ 2022-07-08 02:17:41 +03:00
DelinWorks 49b6dda016 Fix CMAKE 2022-07-08 02:10:35 +03:00
halx99 cabb87a6ca Fix ci 2022-07-05 23:47:25 +08:00
halx99 9d2ed962e6 Committing genbindings changes 2022-07-05 07:53:11 +00:00
Turky Mohammed fb4e263b8b
[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 8d7f133e7c [spine] Use currentState to setup shader stubs 2022-07-05 14:40:18 +08:00
halx99 0f9a79899b [Spine] Use backend shader definations 2022-07-05 14:36:04 +08:00
halx99 91e57e7dd3 Spine runtime can use official code 2022-07-05 14:13:15 +08:00
halx99 4d5f644518 Committing genbindings changes 2022-07-04 16:47:16 +00:00
一线灵 b51e50a498
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 6dd8b2c74a Update lua_cocos2dx_auto.cpp 2022-07-04 18:34:50 +03:00
halx99 768a8bd5e1 Refator sampler name in shader 2022-07-04 21:26:48 +08:00
DelinWorks 88bf095310 Update lua_cocos2dx_auto.cpp 2022-07-03 21:40:51 +03:00
halx99 5288b7a513 Committing genbindings changes 2022-07-03 07:36:16 +00:00
halx99 1d74df858b Committing genbindings changes 2022-06-30 13:51:59 +00:00
一线灵 bfe12be7b6
Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
halx99 cf45042ba8 Committing genbindings changes 2022-06-30 12:22:46 +00:00
halx99 38f2b5ca9d Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +08:00
halx99 af3435ff69 Committing genbindings changes 2022-06-28 09:42:02 +00:00
一线灵 de04f33b5e
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
halx99 040a64b920 Committing genbindings changes 2022-06-28 08:51:45 +00:00
halx99 c464e0b2c3 Fix ci 2022-06-28 14:53:39 +08:00
halx99 64b69ad5b5 Committing genbindings changes 2022-06-25 07:30:20 +00:00
一线灵 ea2f4259fb
[CMake] Remove dup link 2022-06-25 15:23:40 +08:00
一线灵 19e16adae5
Merge pull request #668 from adxeproject/adxe-ext-live2d 
Add extension Live2D support
 2022-06-24 16:23:26 +08:00
halx99 932c3bcffa Add extension Live2D support 
Live2D sdk version: 4-r.4, reelase date: 2021/12/09
 2022-06-24 15:18:08 +08:00
FireStorm2012 e4b891e550
Update lua_xml_http_request.cpp 
print log bugfix
 2022-06-24 15:01:26 +08:00
halx99 6431cd1256 Committing genbindings changes 2022-06-24 06:28:59 +00:00
halx99 1889180a75 Improve renderer 2022-06-24 14:18:48 +08:00
halx99 00fd69bfdf Improve code style 2022-06-24 03:09:50 +08:00
halx99 08c142eb4a Committing genbindings changes 2022-06-19 17:57:08 +00:00
一线灵 31d859f17e
Rename is64BitIOSDevice to is64BitMobileDevice 2022-06-17 22:54:52 +08:00
一线灵 e06eed5d3a
Fix ci 2022-06-17 22:50:29 +08:00
halx99 0bf8d9ddf3 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +08:00
halx99 990531ecdc Committing genbindings changes 2022-06-16 13:25:34 +00:00
一线灵 bd2cff3dfd
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
halx99 f79530837b Committing genbindings changes 2022-06-09 09:21:12 +00:00
halx99 c81b38c52d Committing genbindings changes [skip ci] 2022-06-09 08:51:15 +00:00
halx99 97f198e61e Committing genbindings changes [skip ci] 2022-05-25 02:36:38 +00:00
halx99 1d23e78c5d Fix parameter order 2022-05-20 17:03:26 +08:00
halx99 c8add4c398 Committing genbindings changes [skip ci] 2022-05-18 05:00:01 +00:00
halx99 c584ee1e78 Enable video & webview lua-tests on windows 2022-05-18 12:52:05 +08:00
一线灵 3e96abe899
Fix include 2022-05-16 08:06:51 +08:00
halx99 a0990c02fd Committing genbindings changes [skip ci] 2022-05-13 13:15:09 +00:00
halx99 30a164c31a 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 9b0e0d5f87 Committing genbindings changes [skip ci] 2022-04-28 04:20:11 +00:00
halx99 ef56d0d335 Update copyright notices 2022-04-25 19:15:46 +08:00
halx99 808707920e Committing genbindings changes [skip ci] 2022-04-25 01:43:44 +00:00
一线灵 4bb3c045cd
Update README.md 2022-03-30 15:40:06 +08:00
halx99 89a7e489fc Improve LuaObjcBridge 2022-03-25 10:35:18 +08:00
halx99 4611d5597c Committing genbindings changes [skip ci] 2022-03-18 14:27:43 +00:00
halx99 650a3b4967 Committing genbindings changes [skip ci] 2022-03-18 13:52:57 +00:00
halx99 36fa5ad84e Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
deal 4fa14cd06e
Update README.md [skip ci] 2022-02-25 19:09:06 +08:00
halx99 e70ea8760b Renaming extension ImGuiEXT to ImGui 
The singleton class ImGuiEXT also was renamed to ImGuiPresenter
 2022-02-25 19:03:09 +08:00
halx99 80989dc7cb Committing genbindings changes [skip ci] 2022-02-24 11:08:25 +00:00
halx99 f37ae2d8eb Update project urls 2022-02-24 18:51:36 +08:00
halx99 5b2eb79456 Update project urls 2022-02-24 18:45:25 +08:00
halx99 67c6bcec4f [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 67fad92cbf Update plainlua to 5.4.4, pugixml to 1.12.1 2022-02-17 18:06:19 +08:00
halx99 818e563e51 Finish #578 2022-02-17 17:11:17 +08:00
halx99 6ffd19149c Fix WidgetPropertiesReader::getWidgetReaderClassName incorrect 2022-02-16 11:54:48 +08:00
halx99 403d592018 Committing genbindings changes [skip ci] 2022-02-15 23:01:37 +00:00
deal e7d683958b
Fix #584 2022-02-12 19:56:00 +08:00
halx99 67ecbab347 Improve some code for #543 2022-02-08 21:54:21 +08:00
halx99 388e90459b Done #579, update ImGui to 1.87 2022-02-08 12:43:16 +08:00
halx99 64e678c84a Remove unnecessary parameter 2022-02-06 13:06:49 +08:00
deal e8f0bf9787
Fix #576 2022-02-03 15:45:58 +08:00
deal 0777da8863
Delete unused 2022-01-23 11:01:42 +08:00
halx99 bca3a82eea Fix lua_xml_http_request dataSize incorrect 2022-01-18 18:39:58 +08:00
deal b0e7c79428
hard to link fmt-header-only[skip ci] 
target_link_libraries(fairygui fmt-header-only)
 2022-01-08 15:25:50 +08:00
deal 01f97ca042
Update CMakeLists.txt 2022-01-08 14:01:43 +08:00
halx99 4b12f12a55 [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 aaef0c3048 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 3d7218a0eb Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 3282e1abaf 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 a651879ee6 Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 6b70fc5ff3 Fix ci 2021-12-31 16:29:11 +08:00
halx99 deddc5542e Fix ci [skip ci] 2021-12-31 15:49:45 +08:00
deal 3825fb1b02
Update CMakeLists.txt 2021-12-31 14:47:57 +08:00
halx99 e534dd66c0 Rename core folder name 2021-12-31 14:39:08 +08:00
halx99 f95ed06187 Improve string_view for some file 2021-12-30 09:48:39 +08:00
halx99 b5b4b1e5d8 Committing clang-format changes 2021-12-29 11:31:28 +00:00
halx99 6639f55c0f Fix linux build 2021-12-28 19:16:15 +08:00
halx99 a7e153c9b0 Fix ci 2021-12-28 19:10:50 +08:00
halx99 ce5adf35f7 Committing clang-format changes 2021-12-28 08:06:23 +00:00
halx99 8e8affab5e string_view for lua bindings 2021-12-28 15:46:32 +08:00
halx99 1c3ec2d68c string_view for apple 2021-12-28 11:48:48 +08:00
halx99 f785632497 Merge commit 2021-12-28 11:07:12 +08:00
halx99 d397854ead Commit chnages 2021-12-28 11:05:34 +08:00
halx99 9eeeb151a1 Committing clang-format changes 2021-12-28 03:00:34 +00:00
halx99 a0761b0a5d string_view for android 2021-12-27 19:24:35 +08:00
halx99 8e644ef0b4 Modify fairygui for string_view 2021-12-27 15:10:29 +08:00
halx99 01310bf1b1 Modify some extensions for string_view 2021-12-27 13:52:08 +08:00
halx99 0076283252 Huge changes for all string_view 2021-12-26 23:26:34 +08:00
halx99 2ba77a42fb Committing clang-format changes 2021-12-25 02:04:45 +00:00
halx99 ea1c0733ce Fix compile 2021-12-24 22:58:29 +08:00
halx99 e9f6e9e22c Fix encoding 2021-12-24 21:16:08 +08:00
halx99 c0f5912ebe Fix encodings 2021-12-24 21:11:44 +08:00
halx99 4ff0221a9e Fix encodings 2021-12-24 20:50:31 +08:00
halx99 b4bedd24d0 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 2e0cc940ee [HttpClient] Use `byte_buffer` instead `std::vector<char>` 2021-12-10 19:15:48 +08:00
halx99 b459acbcf7 Remove all unnecessary nothrow 2021-12-08 00:11:53 +08:00
aismann 6a41776f20 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 9930eef75a Fix compile 2021-11-26 18:13:33 +08:00
halx99 bc14e09079 Move ntcvt directory 2021-11-26 17:19:50 +08:00
halx99 778dc7e2b9
Improve skipBOM 2021-11-22 13:58:41 +08:00
halx99 9e35b0a1e2 Fix cocos2dx_lua_loader 2021-11-17 20:59:12 +08:00
halx99 8e1087a987 Refine cocos2dx_lua_loader logic 2021-11-16 14:12:32 +08:00
halx99 3c5224220f Fix lua state usage 2021-11-15 19:05:08 +08:00
halx99 bc4dccff9b Compatible lua getXXXSize API for get width,height from vec2 2021-11-12 19:12:29 +08:00
halx99 442d0f7c4c Sync fix 2021-11-11 18:33:46 +08:00
halx99 24ad9f7bec Fix fairygui compilation 2021-11-11 18:04:38 +08:00
halx99 95a1734cd7 Add `CCValue` int64_t/uint64_t support 2021-11-09 14:29:15 +08:00
halx99 5f4d535f76 Remove unnecessary function 2021-10-23 23:36:48 +08:00
halx99 cc2ba51ed6 Use struct `Vec2` instead `Size` 2021-10-23 23:27:14 +08:00
halx99 cc1d09d04d Remove unused 2021-10-12 13:12:44 +08:00
halx99 dfd93f6a10 lua load, better code style 2021-10-12 13:07:05 +08:00
halx99 9b88d72331 lua loader, more better pefromance 2021-10-12 12:35:03 +08:00
halx99 b98c496221 Remove unused 2021-10-12 12:18:38 +08:00
halx99 9fa030b5e9 More standard 2021-10-12 12:11:48 +08:00
halx99 bfd5577753 Don't try different file ext, load as-is for lua load 2021-10-11 23:23:30 +08:00
halx99 5b3979a8ef Reduce file exist check 2021-10-11 22:57:21 +08:00
halx99 0b7ff8d9ea Refine lua loader 2021-10-11 22:34:41 +08:00
halx99 b99a445519 Fix ci 2021-10-11 13:44:28 +08:00
halx99 c38681bdd0 Code style 2021-10-11 12:15:41 +08:00
halx99 bc4cbddd50 Fix some warnings 2021-10-09 13:48:56 +08:00
halx99 1ada732ffc Use lua-5.4.3 as default plainlua version 
see also: #332
 2021-10-08 16:15:33 +08:00
halx99 e90eda918d Fix #508 warnings 2021-09-26 21:52:36 +08:00
halx99 8762fa353a Fix warnings 2021-09-26 21:03:41 +08:00
halx99 d2ba7fb117 Refine ImGuiEXT 2021-09-26 19:56:34 +08:00
halx99 a17c843914 Fix #507 2021-09-26 12:05:42 +08:00
halx99 f9e766086c Fix #505 2021-09-23 14:53:57 +08:00
halx99 23b6c1d549 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 15be00be20 Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +08:00
榆柳松 ac1aa636ac Merge remote-tracking branch 'upstream/dev' into dev 2021-09-05 20:45:32 +08:00
榆柳松 f5663f279c [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00