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

501 Commits

Author SHA1 Message Date
halx99 8c18f962d5 馃敤Fix #887 2022-10-12 19:44:31 +08:00
halx99 ec72ebb697 Fix #873 2022-10-12 12:39:27 +08:00
aismann eb5058e6d0 /* axmol thread id */ (#924) 2022-10-12 07:04:36 +08:00
CHP bdbe9b4f6f Update UIImageViewTest.cpp (#923) 
Fix UIImageViewIssue12249Test
 2022-10-12 07:04:21 +08:00
CHP 4d54f44f62 Update CMakeLists.txt (#922) 
* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-12 07:04:01 +08:00
aismann 3ef8ac63f2 rename cocos2d to axmol (#920) 
* rename cocos2d to axmol

* rename cocos2d.h to axmol.h

* Update Physics3DTest.cpp

replace Sprite3D -> MeshRenderer
 2022-10-12 00:15:09 +08:00
halx99 fb227f352f Fix #908 2022-10-11 13:23:47 +08:00
CHP b3fa9381b5 Fix noisy message "Unable to resolve full path of PCH-header" (#918) 
* Update CMakeLists.txt

fix noisy message "Unable to resolve full path of PCH-header"

* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-11 08:54:02 +08:00
RH 34094038d5 Enable ImGui for Android (#909) 
* Add support for ImGui usage on Android
 2022-10-10 03:53:24 +08:00
CHP 9c7a876970 precompile_headers all platforms (#901) 2022-10-10 03:52:04 +08:00
aismann 49f7406f94 Improve MeshRenderer #879 thanks @solan-solan (#904) 
* Update Physics3DTest.cpp

Improve #879  thanks @solan-solan

* Update CCMeshRenderer.cpp

#hope this is fixing #879
 2022-10-08 06:15:03 +08:00
涓€绾跨伒|Deal 79925e07d6 Merge: 6cd36ab02e c26ab44880 
Merge pull request #801 from theunwisewolf/dev-richtext-scale-support

RichElementImage - Add support for scaling
 2022-10-04 11:08:49 +08:00
涓€绾跨伒|Deal 0844893fb8 Merge: b249282234 3af8ad9580 
Merge pull request #882 from aismann/dev

Adapt Physics3DTest.cpp to #879
 2022-10-02 19:43:32 +08:00
aismann a5acb0d180 Update HelloWorldScene.h 2022-10-02 13:09:56 +02:00
aismann 3650bd73a1 Test adapt to #879 2022-10-02 11:56:38 +02:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
aismann 359c4ccc83 Add test case for issue #861 
Add 'obj' on:
Physics3DTerrainDemo
Physics3DCollisionCallbackDemo

Co-authored-by: 涓€绾跨伒|Deal <halx99@live.com>
 2022-09-24 14:00:00 +08:00
halx99 5c735619f9 Improve code style 2022-09-24 11:01:45 +08:00
halx99 82acade5b9 Improve code style 2022-09-24 10:42:11 +08:00
halx99 3a9a26c743 Fix #861 2022-09-23 22:41:30 +08:00
aismann e571e8242d Clipper2 v1 04 (#856) 
* Clipper2 v1.04 (and small fixes)

* Update README.md
 2022-09-19 14:17:13 +08:00
Paulo Coutinho f5aeb5a8c2 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
aismann 6038cfb531 Update Issue829Test (DrawPrimitiveTest) (#844) 
* Update Issue829Test (DrawPrimitiveTest)

* Update DrawPrimitivesTest.cpp

* Update DrawPrimitivesTest.cpp
 2022-09-05 13:48:28 +08:00
涓€绾跨伒|Deal e0e083aa3b Merge: 6df48e9f8b baceccbb2f 
Merge pull request #837 from aismann/ISSUE_#825

#825
 2022-09-02 11:59:46 +08:00
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +08:00
aismann 68f8a2b0c7 #825 2022-09-01 13:51:19 +02:00
aismann 448dd9ee44 Issue_829 2022-08-30 14:05:44 +02:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
aismann 9a8ed19d0d Update SpritePolygonTest.cpp 2022-08-28 07:17:10 +02:00
aismann 21402c7e9c Improve SpritePolygonTest 2022-08-28 06:34:20 +02:00
aismann 3afc22ea7c Update SpritePolygonTest.cpp 
Fix for issue #231
 2022-08-24 19:44:53 +02:00
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
涓€绾跨伒 31289482d3 Revert "Support for Apple Silicon / M1" 2022-08-12 16:39:06 +08:00
unknown d71ad17f52 RichElementImage - Add support for scaling 2022-08-12 03:58:36 +05:30
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 eabd784590 Fix macOS/iOS build warning 
invalid character in Bundle Identifier. This string must be a uniform type identifier (UTI) that contains only alphanumeric (A-Z,a-z,0-9), hyphen (-), and period (.) characters. (in target 'cpp_tests' from project 'axys')
 2022-08-09 15:32:00 +08:00
aismann 5d64474cfb rename push_back vs emplace_back (fine tuning and remove on Live2D (too much)) 2022-08-09 05:51:07 +02:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
aismann 376c80dd2d 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 93550405bc Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +08:00
halx99 484aa38856 Update android gradle plugin to 7.2.2 2022-08-06 20:05:12 +08:00
halx99 448c76c108 Update android target and compile sdk to android 12 2022-08-06 19:26:44 +08: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 b0eef2ef8d Fix live2d-tests 2022-08-02 22:03:54 +08:00
halx99 2f90855c0a Fix live2d_tests android build 2022-08-02 17:55:42 +08:00
aismann 2a2e8a1e95 Improve c++11 for-loop performance with Universal References (#760) 2022-07-21 19:19:08 +08:00
aismann 455aff97ea Fix: #712 (mistake by me) 2022-07-19 20:05:19 +02:00
halx99 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +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
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
halx99 5f04e88dc7 Improve android gradle script axistools.gradle 2022-07-12 13:07:27 +08:00
halx99 b1e43e9642 Fix #742 2022-07-11 19:08:14 +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 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
涓€绾跨伒 3c5d1f468f Merge: f4897fe14c 043207e9c1 
Merge pull request #717 from aismann/ImprovePhysicsTest

Improve look of DebugDraw and feel of LogoSmash, Raycast., etc
 2022-07-06 23:15:07 +08:00
aismann 415c03362f Update README.md 2022-07-06 16:52:23 +02:00
aismann 4fd3d16dc7 Improve look of DebugDraw and feel of LogoSmash, Raycast., etc 
Its look professional now ;)
 2022-07-06 16:02:41 +02:00
涓€绾跨伒 2dc07ffd6e Merge: 7a97ca6ef8 b6c3c43ee0 
Merge pull request #716 from aismann/ImprovePhysicsTest

Replacing 'ball' with 'blocks' to see better what happens
 2022-07-06 17:44:17 +08:00
halx99 ab0066dc5c Update yasio::byte_buffer 2022-07-06 16:56:57 +08:00
aismann 0fcaced279 Replacing 'ball' with 'blocks' to see better what happens 2022-07-06 10:42:42 +02: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
aismann 201c0c7405 Fix: #712 2022-07-06 00:21:07 +02:00
halx99 a5e957de9f Fix ci 2022-07-05 23:47:25 +08: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
涓€绾跨伒 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 0d9f8d8d5d Fix compilation. 2022-07-04 17:55:41 +03:00
Turky Mohammed e10bdc03ad Delete hrtf_default.h 2022-07-04 17:48:13 +03: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 3585f37d85 Update NewEventDispatcherTest.cpp 2022-07-03 21:47:12 +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
aismann 264465b0a4 Update NewEventDispatcherTest.cpp 2022-07-03 07:52:11 +02:00
aismann 6209d8db4c use engine global namespace 2022-07-03 07:26:37 +02:00
halx99 addfea9ec1 Move enum FPSPosition to engine global namespace 2022-07-03 11:24:00 +08:00
halx99 508836ed44 Enable switch fps position on mobile device 2022-07-03 11:17:22 +08:00
DelinWorks 2043e4734f Remove buffers stat and add quad mesh shaders. 
Remove drawn buffers label and Add a simple position_texture_color shader for simple primitives like quads to implement static sprite batching in the future.
 2022-07-02 18:22:31 +03:00
aismann 2c96541bef Remove unused variable and cleanup on windowtest.cpp 2022-07-02 11:29:26 +02:00
aismann 5b43f6883e Cleanup, last fixes, rename enum FPSPosition 2022-07-02 08:17:24 +02:00
aismann 375449cd72 fix typo 2022-07-02 06:19:47 +02:00
aismann 684fb3dcee FPS display set position should be set by API #695 2022-07-01 17:15:20 +02: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