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

40519 Commits

Author SHA1 Message Date
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
DelinWorks 1ac8788815 Fix mesh index formatting. 2022-07-01 14:40:09 +03:00
DelinWorks b32f4d1196 Change shorts to ints 2022-07-01 14:11:00 +03:00
Turky Mohammed 66598df93f
Merge branch 'adxeproject:dev' into improve-3d-renderer 2022-07-01 13:46:04 +03: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
DelinWorks 24c2550a09 Fix typos. [skip ci] 2022-06-30 23:21:21 +03:00
DelinWorks 4a0622cb3f Update BufferGL.h 2022-06-30 22:43:56 +03:00
DelinWorks 0c3f7400b0 Update BufferGL.h 2022-06-30 22:26:02 +03:00
DelinWorks 5dd0ce5d8e Add UINT mesh index format support. 2022-06-30 21:44: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
一线灵 6156a3bf3f
Merge pull request #686 from adxeproject/revert-675-unify-fps-limit 
Revert "Unify frame rate control logical to director mainLoop"
 2022-06-30 21:45:43 +08:00
一线灵 9bdc6232ac
Update CCDirector.cpp 2022-06-30 21:06:39 +08: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
一线灵 8433e39a81
Merge pull request #681 from adxeproject/refactor-layer-new 
Use sprite to implement layer color for auto batch draw
 2022-06-30 20:13:30 +08:00
一线灵 42fc96bdac
Merge pull request #685 from aismann/patch-2 
Update README.md (Live2D info)
 2022-06-30 20:03:44 +08:00
一线灵 feba50e513
Merge pull request #683 from aismann/dev 
Update README.md  (change the license part)
 2022-06-30 20:03:30 +08:00
aismann a840329531
Update README.md 2022-06-30 13:46:29 +02:00
aismann 438dfbe2c6
Update README.md 2022-06-30 13:24:54 +02:00
aismann a358733aed
Update README.md 2022-06-30 13:19:37 +02:00
一线灵 b3a55bc05f
Merge pull request #682 from aismann/poly2tri 
poly2tri:  Version: git 81612cb  (until May 20, 2022)
 2022-06-30 19:07:49 +08:00
halx99 3d1690cc25 Add missing autorelease call 2022-06-30 18:18:24 +08:00
halx99 7837395ea5 Fix ci 2022-06-30 18:15:43 +08:00
aismann f52bc9472d Version: git 81612cb (until May 20, 2022) 2022-06-30 12:13:55 +02:00
halx99 38f2b5ca9d Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +08:00
halx99 752d3150eb Improve code style 2022-06-30 12:05:28 +08:00
halx99 be6f1bc911 Setup IOS_PLATFORM in ios.min.cmake 2022-06-29 17:37:23 +08:00
halx99 3f00332d3d Improve frame rate control 2022-06-29 17:26:22 +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
一线灵 884a4c3b1d
Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
halx99 040a64b920 Committing genbindings changes 2022-06-28 08:51:45 +00:00
一线灵 824e06d14f
Merge pull request #677 from rh101/rendertarget-fix 
Make the render target selectable for RenderTexture
 2022-06-28 16:39:59 +08:00