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

453 Commits

Author SHA1 Message Date
halx99 d1efe584be Improve code style 2022-09-24 10:42:11 +08:00
一线灵|Deal c63b8f2134
Fix ci 2022-09-23 23:25:01 +08:00
halx99 72e6061557 Fix #861 2022-09-23 22:41:30 +08:00
一线灵|Deal c5e4438efc
Update CCAutoPolygon.cpp 2022-09-19 18:22:34 +08:00
aismann 3dddef1bc3
Clipper2 v1 04 (#856) 
* Clipper2 v1.04 (and small fixes)

* Update README.md
 2022-09-19 14:17:13 +08:00
halx99 fad9afbc9a Update thirdparty libs 
fmt: 9.0.0 --> 9.1.0
    llhttp: 6.0.7 --> 6.0.9
    astc-encoder: 4.0.0 --> 4.1.0
    webp: 1.2.2 --> 1.2.4
    flatbuffers: 2.0.0 --> 2.0.8
 2022-09-15 20:15:28 +08:00
Paulo Coutinho 8c359917f7
Add apple tvos support (#846) 
* support tvos

* support tvos and fix run command

* support tvos, fix run script and fix windows files

* support tvos on ci

* support tvos on ci and fix windows zlib

* support tvos on ci

* support tvos

* support tvos and tvos tests
 2022-09-05 14:13:52 +08:00
一线灵|Deal 514dad9af8
Merge pull request #837 from aismann/ISSUE_#825 
#825
 2022-09-02 11:59:46 +08:00
aismann baceccbb2f #825 2022-09-01 13:51:19 +02:00
halx99 a9ec35f7f9 Fix #817 2022-08-31 13:45:06 +08:00
一线灵|Deal 33b67fa0df
Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
aismann 8b6767e9f6 Update CCAutoPolygon.cpp 2022-08-27 18:30:22 +02:00
aismann 898b9cd9af cleanup2 2022-08-27 17:41:12 +02:00
aismann bb05337bfe cleanup 2022-08-27 17:40:03 +02:00
aismann 9d1f2f3487 Replace Clipper1 (all stuff) 2022-08-27 17:00:10 +02:00
一线灵 bf4c7fefa8
[CMake] Mark engine pch as private 2022-08-19 12:15:49 +08:00
unknown c26ab44880 Add empty check 2022-08-16 15:12:45 +05:30
halx99 264d6f28d1 Improve code style 2022-08-16 17:15:56 +08:00
halx99 d8c9a8826a Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 8a462d89c9 Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
DESKTOP-16GC0B8\813658 31c06c658a Fixed get writable path for android 2022-08-13 23:53:40 +03:00
unknown f5c7940418 RichElementImage - Add support for scaling 2022-08-12 03:58:36 +05:30
halx99 46bee8284f Fix ci 2022-08-11 22:05:23 +08:00
halx99 9150b9db83 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 3cf19787ce Fix #791 really 2022-08-11 10:52:38 +08:00
DelinWorks 4ed7c32cf3 Remove assign dups and simplify function naming. 2022-08-11 01:52:04 +03:00
Turky Mohammed 84003b66b2
Update CCCamera.h [skip ci] 2022-08-10 21:10:34 +03:00
DelinWorks dcd0fd6001 Add initialize member function. 2022-08-10 21:09:10 +03:00
DelinWorks 0dfa828926 Update CCCamera.cpp [skip ci] 2022-08-10 20:38:59 +03:00
DelinWorks 63e72775f5 Fix camera view calculation and tidy up system 2022-08-10 20:14:18 +03:00
halx99 0df0947d05 Improve code style 
Refer to: https://github.com/cocos2d/cocos2d-x/pull/20743
 2022-08-10 21:08:51 +08:00
aismann 8b408b2cde rename push_back vs emplace_back (fine tuning and remove on Live2D (too much)) 2022-08-09 05:51:07 +02:00
一线灵 13fc72c02c
Migrate axys (#782) 2022-08-08 18:02:17 +08:00
aismann 10530b1a19
Replace push_back() vs emplace_back() on axis/tests/cpp-tests and axis/core (#781) 
* Replace push_back() vs emplace_back() on axis\tests\cpp-tests\

D:\______\GitHub\aismann\axis\tests\cpp-tests\Classes
Replace Vector push_back() vs emplace_back() #762

* Replace push_back() vs emplace_back() on axis\core\ #781

* Update CCConsole.cpp

* Update UIWebViewImpl-android.cpp

* Update UIWebViewImpl-android.cpp
 2022-08-08 13:18:33 +08:00
halx99 9b7910daea Improve android gradle utils 2022-08-07 09:26:56 +08:00
halx99 f03bce1380 Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +08:00
halx99 f40c44755f 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
Turky Mohammed 399dac7478
[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
一线灵 5f099c56ac
Fix #771 2022-08-02 21:48:16 +08:00
unknown 797a41b469 Missed edge case when resizing the memorymapped file in UserDefault that could cause a crash 2022-08-02 16:13:12 +05:30
halx99 84a540ea66 Improve gradle script 2022-08-02 17:55:00 +08:00
unknown 5685db91a3 closeKeyboard() method for EditBox 2022-08-02 03:02:35 +05:30
halx99 0800903a0a Add more compatible macros to cocos2d.h [skip ci] 2022-07-26 22:50:51 +08:00
aismann 73153ad614
Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
DelinWorks 1791579fda Add primitive type support for mesh materials. 2022-07-20 02:33:45 +03:00
DelinWorks a0e6d4a045 Fix quad vertex shader compilation. 2022-07-19 08:20:13 +03:00
halx99 c0a4371879 Migrate more macors 2022-07-16 10:43:05 +08:00
halx99 f3ac6ea871 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
一线灵 c7a26bebbf
Fix warning format 2022-07-12 22:57:45 +08:00
一线灵 5a1b8074f1
[Gradle] Fix findNDK 2022-07-12 21:51:44 +08:00
一线灵 406f962cad
Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
halx99 cf6baeed52 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
halx99 4ad4bf93b0 Avoid unexpected frame refs increase 2022-07-11 19:34:31 +08:00
一线灵 279337f17f
Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
halx99 986540dbef Update byte_buffer to fix #741 2022-07-11 09:12:40 +08:00
一线灵 8bbcf80330
Fix logic 2022-07-10 21:22:08 +08:00
一线灵 3594b161bf
Fix ci 2022-07-10 20:47:50 +08:00
halx99 16a30c8fb8 Fix #741 2022-07-10 20:23:48 +08:00
DelinWorks 9db438a375 Update FastRNG.h 2022-07-10 10:00:02 +03:00
一线灵 3329e1b0ea
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
一线灵 04ca16125b
Merge pull request #738 from solan-solan/index_array_to_stl 
IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 9ee4181976 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
DESKTOP-16GC0B8\813658 2f8d5dd2f6 operator[] changed for better usage 2022-07-09 02:07:01 +03:00
一线灵 18076d09f0
Merge pull request #734 from solan-solan/index_array_to_stl 
IndexArray to stl
 2022-07-09 01:23:36 +08:00
Turky Mohammed 8517d0ee7f
Replace everything under `core` (#735) 
Co-authored-by: deal <halx99@live.com>
 2022-07-09 01:23:11 +08:00
DESKTOP-16GC0B8\813658 21f928c4a0 Added operator[] for IndexArray to align it to stl container to protect existing code which could use IndexArray with the corresponding api; 
Added uint16_t as default template parameter for IndexArray::push_back(...)
 2022-07-08 17:08:39 +03:00
一线灵 86e56f304f
Update version [skip ci] 2022-07-08 16:02:51 +08:00
一线灵 590fbba6bd
Merge pull request #730 from DelinWorks/migrate-engine-name 
Fix engine setup files.
 2022-07-08 15:34:23 +08:00
halx99 fff2bd59ed Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks a27486a7f7 [skip ci] 2022-07-08 07:36:32 +03:00
DelinWorks 49b6dda016 Fix CMAKE 2022-07-08 02:10:35 +03:00
一线灵 1062a2251f
Merge pull request #720 from axis-project/improve-index-array 
Improve IndexArray
 2022-07-07 16:53:18 +08:00
halx99 698b84d7b2 Delete unused comments 2022-07-07 15:41:32 +08:00
halx99 39d40728cb The `operator[]` not good for template use, always use at instead. 2022-07-07 15:40:16 +08:00
halx99 a9be51ff72 Improve IndexArray implementation 2022-07-07 14:49:26 +08:00
DelinWorks d1d8873964 Fix shader matrix multiplication. 2022-07-07 05:38:28 +03:00
halx99 062e0d38f9 Merge branch 'dev' of https://github.com/adxeproject/adxe into improve-index-array 2022-07-07 10:06:21 +08:00
一线灵 8ff01d47c4
Fix ci 2022-07-07 09:59:21 +08:00
一线灵 fca740889d
Update CCBundle3DData.h 2022-07-07 09:52:11 +08:00
halx99 43e1a41440 Improve IndexArray 2022-07-07 09:31:34 +08:00
halx99 62b356a107 Improve code style 2022-07-07 09:30:48 +08:00
aismann 043207e9c1 Improve look of DebugDraw and feel of LogoSmash, Raycast., etc 
Its look professional now ;)
 2022-07-06 16:02:41 +02:00
一线灵 83a3011f65
Merge pull request #715 from aismann/dev 
Rename internal variable '_displayStats' to '_statsDisplay'
 2022-07-06 13:44:55 +08:00
aismann b28e6d5aa6 Rename internal variable '_displayStats' to '_statsDisplay' 
fix #709
 2022-07-06 06:58:24 +02:00
Turky Mohammed 9951bbe820
Merge branch 'adxeproject:dev' into improve-engine-types 2022-07-06 07:21:13 +03:00
DelinWorks b4d04f4df9 Update FastRNG.h 2022-07-06 07:20:40 +03:00
一线灵 83ebbfcf60
Merge pull request #710 from DelinWorks/improve-engine-types 
[IMPROVMENT] Rename `RngSeed` to `FastRNG`.
 2022-07-05 23:07:19 +08:00
halx99 71539ffd89 Compatible cocos2d.h 2022-07-05 23:03:22 +08:00
DelinWorks d1379cd5c2 Improve RngSeed. 2022-07-05 17:21:21 +03:00
halx99 701c1aa6ff Merge branch 'improve-3d-renderer' of https://github.com/DelinWorks/adxe into dev 2022-07-05 15:42:38 +08: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
DelinWorks 4f1212e655 Update CCMeshVertexIndexData.cpp [skip ci] 2022-07-04 21:15:11 +03:00
DelinWorks ad451adb4b Update CCMeshVertexIndexData.cpp [skip ci] 2022-07-04 21:14:33 +03:00
DelinWorks 15f43941e8 Update quad.frag [skip ci] 2022-07-04 21:13:29 +03:00
Turky Mohammed 995a6469d1
Update quad.frag [skip ci] 
Co-authored-by: 一线灵 <halx99@live.com>
 2022-07-04 21:12:17 +03:00
DelinWorks 35f7bd2f76 Update CCBundle3DData.h [skip ci] 2022-07-04 21:09:54 +03:00
DelinWorks b2583b2614 Update CCBundle3DData.h [skip ci] 2022-07-04 21:07:06 +03:00
DelinWorks 74a2ed5ab1 Update CCBundle3DData.h 2022-07-04 21:05:27 +03:00
DelinWorks 293c28f6b6 Expose stride conversion functions. 2022-07-04 20:54:56 +03:00
DelinWorks 21cb99695a Update CCBundle3DData.h [skip ci] 2022-07-04 20:42:44 +03:00