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

1685 Commits

Author SHA1 Message Date
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
halx99 7cc2d34398 LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
rh101 69d6039306 Update lua bindings 2021-09-02 21:24:45 +10:00
rh101 de182c8360 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
halx99 d197e8b245 Fix part of #487 2021-09-02 11:43:27 +08:00
halx99 cb81a61530 Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 80e0e3b941 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
aismann 1c05947474
Merge branch 'adxeproject:dev' into dev 2021-08-27 07:49:17 +02:00
aismann cbeeb8d8ab 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 81fd4df36e
Delete x-studio.cmake 2021-08-27 13:23:51 +08:00
halx99 bd436ae078 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 f9ac34c20f Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 d7e590b513 Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 395a5afdd7 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 d0d77730a9 Update imgui 2021-08-23 17:49:38 +08:00
aismann e2ef8d5ba7 class PhysicsDebugNodeBox2D cleanup 2021-08-19 06:03:58 +02:00
aismann a9569ca061 fix 2021-08-18 06:00:43 +02:00
aismann 42439e5b50 Update CCPhysicsDebugNodeBox2D.cpp 2021-08-18 05:31:33 +02:00
aismann 5b3748cdd6 Important API change for naming convention 
rename
class DebugDraw
to
PhysicsDebugNodeBox2D
 2021-08-18 05:23:03 +02:00
aismann 780d4e6294 cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 7ef0ec96bf Update LUA bindings 2021-08-18 01:01:56 +10:00
halx99 16e3d66a66 Update lua bindings 2021-08-14 13:22:03 +08:00
aismann 9f2ab0ef28
More improvements (#455) 2021-08-14 10:28:28 +08:00
halx99 c5aeed4c06 Update lua bindings 2021-08-13 20:36:10 +08:00
aismann 7b7a3a8ae7 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 39ca61f623 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
aismann 56b99eff6a Box2D - Basic ready for use 2021-08-06 09:35:29 +02:00
aismann f5077bfb0f
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 484549b801 Fix ci 2021-07-19 08:10:37 +08:00
halx99 d90dfd89e0
Update lua_xml_http_request.cpp 2021-07-19 01:29:08 +08:00
halx99 ad035e2729 Improve code quality 2021-07-17 23:32:31 +08:00
halx99 26c3de632a Update fairygui 2021-07-17 19:51:27 +08:00
halx99 0e215e77bb Tidy thirdparty lua-cjson 2021-07-16 11:17:34 +08:00
halx99 092b24e591 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 bc6ebd920a Improve code quality 2021-07-15 23:03:43 +08:00
halx99 ec9a50136f Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 f70ad053c0 Rename everything to adxe 2021-07-09 10:42:36 +08:00
aismann a934652f82
Update README.md 2021-07-08 07:42:15 +02:00
halx99 5a78eeda36 Sync lua bindings [ci build] 2021-06-27 21:47:15 +08:00
halx99 a84067eb74 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 39be77144c
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 c9eb1a7de4
Merge branch 'dev' into Chipmunk2D 2021-06-24 17:04:04 +08:00