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

39892 Commits

Author SHA1 Message Date
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
DelinWorks c116171c1f Fix compilation. 2022-07-04 17:55:41 +03:00
Turky Mohammed 31ea94a677
Delete hrtf_default.h 2022-07-04 17:48:13 +03:00
DelinWorks da39a66e99 Improve function naming. 2022-07-04 17:45:23 +03:00
一线灵 555f847c1f
Merge pull request #704 from adxeproject/refactor-builtin-sampler-name 
Refator builtin sampler name in shader
 2022-07-04 22:37:08 +08:00
halx99 768a8bd5e1 Refator sampler name in shader 2022-07-04 21:26:48 +08:00
DelinWorks af4c3b0948 Revert "Update CCDirector.h" 
This reverts commit 11200dfac0.
 2022-07-04 05:12:54 +03:00
DelinWorks 11200dfac0 Update CCDirector.h 2022-07-04 04:58:13 +03:00
一线灵 df9eba2d3c
Merge pull request #703 from DelinWorks/engine-bug-fixes 
[Android] Fix arm64 incorrect random number generation.
 2022-07-04 09:11:05 +08:00
DelinWorks 210816a8bc Fix android arm64 incorrect random number generation. 2022-07-04 03:28:55 +03:00
DelinWorks 1e63687310 Update NewEventDispatcherTest.cpp 2022-07-03 21:47:12 +03:00
DelinWorks 88bf095310 Update lua_cocos2dx_auto.cpp 2022-07-03 21:40:51 +03:00
DelinWorks bdffd39784 Fix platforms compilation. 2022-07-03 21:01:21 +03:00
DelinWorks f7b50fe836 Use enum class instead. 2022-07-03 20:55:40 +03:00
DelinWorks 9009228ef4 [skip ci] 2022-07-03 20:50:02 +03:00
DelinWorks 166ebd2ce6 Move global enums to their own file. 2022-07-03 20:43:55 +03:00
halx99 5288b7a513 Committing genbindings changes 2022-07-03 07:36:16 +00:00
一线灵 c140cf4303
Merge pull request #696 from aismann/New_feature_setFPSPos 
FPS display position should be set by API
 2022-07-03 15:29:26 +08:00
aismann e49b1c7d93 Update NewEventDispatcherTest.cpp 2022-07-03 07:52:11 +02:00
aismann b3726421b2 use engine global namespace 2022-07-03 07:26:37 +02:00
halx99 62e2be281b Move enum FPSPosition to engine global namespace 2022-07-03 11:24:00 +08:00
halx99 31a6e66935 Enable switch fps position on mobile device 2022-07-03 11:17:22 +08:00
aismann c62cf2451d Update SimpleSnakeScene.cpp 2022-07-02 11:55:10 +02:00
aismann d0cc7be836 Update AppDelegate.cpp 2022-07-02 11:42:13 +02:00
aismann d94137be54 Remove unused variable and cleanup on windowtest.cpp 2022-07-02 11:29:26 +02:00
aismann 6c702daa3b Cleanup, last fixes, rename enum FPSPosition 2022-07-02 08:17:24 +02:00
aismann 8f5cc3ff2c fix typo 2022-07-02 06:19:47 +02:00
aismann 88fe2d7666 add 'no change' check. 2022-07-02 06:02:22 +02:00
aismann 97d7b793f7 FPS display set position should be set by API #695 2022-07-01 17:15:20 +02:00
一线灵 8806d7bdf7
Merge pull request #692 from aismann/patch-3 
Some improvements on the ['Upstream-Version-License'] chapter
 2022-07-01 18:01:25 +08:00
halx99 1a0848c95f Setup vsync for all PC platforms 2022-07-01 17:55:54 +08:00
aismann d4780b87e3
Some improvements on the ['Upstream-Version-License'] chapter 2022-07-01 11:52:46 +02:00
halx99 047206e529 Fix warnings 2022-07-01 13:47:47 +08:00
一线灵 03b01cd414
Merge pull request #690 from DelinWorks/engine-bug-fixes 
[BUG] Fix `getDefaultCamera()` returning nullptr on scene initialization.
 2022-07-01 12:17:08 +08:00
halx99 9b1edadb2f Fix #689 2022-07-01 12:14:44 +08:00
一线灵 7f53bb5235
Merge pull request #691 from adxeproject/try-fix-fps 
Try fix fps
 2022-07-01 12:04:20 +08:00
halx99 6017f90907 Improve mac fps limit 2022-07-01 11:02:31 +08:00
DelinWorks 6d8aa5e6c1 Update CCCamera.cpp [skip ci] 2022-07-01 05:59:45 +03:00
DelinWorks 4997f613de Fix overriding position when applying custom properties. [skip ci] 2022-07-01 05:58:42 +03:00
DelinWorks 8d3c2b0cdb Use CCASSERT instead. 2022-07-01 05:54:20 +03:00
DelinWorks 79d228d007 Update CCRenderer.cpp 2022-07-01 04:06:26 +03:00
DelinWorks b24f4fb520 [skip ci] 2022-07-01 03:39:27 +03:00
DelinWorks b4bac6d651 Fix get default camera nullptr on scene initialization. 2022-07-01 03:34:37 +03:00
halx99 5f02d2a656 Try fix fps 2022-07-01 01:00:18 +08:00
halx99 1d74df858b Committing genbindings changes 2022-06-30 13:51:59 +00:00