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

3012 Commits

Author SHA1 Message Date
DelinWorks 3c548943d3 Change shorts to ints 2022-07-01 14:11:00 +03:00
Turky Mohammed 8b22650ac9 Merge: 24c2550a09 8806d7bdf7 
Merge branch 'adxeproject:dev' into improve-3d-renderer
 2022-07-01 13:46:04 +03:00
涓€绾跨伒 9f0ad3bff1 Merge: 1a0848c95f d4780b87e3 
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 2ed8c71eb5 Setup vsync for all PC platforms 2022-07-01 17:55:54 +08:00
aismann 981dbcdf37 Some improvements on the ['Upstream-Version-License'] chapter 2022-07-01 11:52:46 +02:00
halx99 7f9511358f Fix warnings 2022-07-01 13:47:47 +08:00
涓€绾跨伒 5f2225662d Merge: 9b1edadb2f 6d8aa5e6c1 
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 5d86a92813 Fix #689 2022-07-01 12:14:44 +08:00
halx99 f0758b7993 Improve mac fps limit 2022-07-01 11:02:31 +08:00
DelinWorks 89e4fb4b59 Update CCCamera.cpp [skip ci] 2022-07-01 05:59:45 +03:00
DelinWorks ec3fa15af7 Fix overriding position when applying custom properties. [skip ci] 2022-07-01 05:58:42 +03:00
DelinWorks 7b829e6cff Use CCASSERT instead. 2022-07-01 05:54:20 +03:00
DelinWorks 8cfbbd75f1 Update CCRenderer.cpp 2022-07-01 04:06:26 +03:00
DelinWorks 5d4b78f9b4 [skip ci] 2022-07-01 03:39:27 +03:00
DelinWorks b6a80ab5b6 Fix get default camera nullptr on scene initialization. 2022-07-01 03:34:37 +03:00
DelinWorks 28125465d0 Fix typos. [skip ci] 2022-06-30 23:21:21 +03:00
DelinWorks 8485ece883 Update BufferGL.h 2022-06-30 22:43:56 +03:00
DelinWorks f506e43c67 Update BufferGL.h 2022-06-30 22:26:02 +03:00
DelinWorks 35bd10e707 Add UINT mesh index format support. 2022-06-30 21:44:37 +03:00
halx99 0707b47256 Try fix fps 2022-07-01 01:00:18 +08:00
halx99 7ef1ab7eb0 Committing genbindings changes 2022-06-30 13:51:59 +00:00
涓€绾跨伒 b0504b4dd3 Update CCDirector.cpp 2022-06-30 21:06:39 +08:00
涓€绾跨伒 6d2bc9bbf2 Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
halx99 18f7def462 Committing genbindings changes 2022-06-30 12:22:46 +00:00
涓€绾跨伒 5ef42d4e39 Merge: 42fc96bdac 3d1690cc25 
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
涓€绾跨伒 d0ac92acbf Merge: b3a55bc05f 438dfbe2c6 
Merge pull request #683 from aismann/dev

Update README.md  (change the license part)
 2022-06-30 20:03:30 +08:00
aismann f3a1ab1942 Update README.md 2022-06-30 13:46:29 +02:00
aismann f90a56df97 Update README.md 2022-06-30 13:24:54 +02:00
aismann 9420129082 Update README.md 2022-06-30 13:19:37 +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
halx99 adb0a67ba8 Add missing autorelease call 2022-06-30 18:18:24 +08:00
halx99 32f3777128 Fix ci 2022-06-30 18:15:43 +08:00
aismann 9f060fbd99 Version: git 81612cb (until May 20, 2022) 2022-06-30 12:13:55 +02:00
halx99 502d80ede1 Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +08:00
halx99 8314777449 Improve code style 2022-06-30 12:05:28 +08:00
halx99 af215538fb Setup IOS_PLATFORM in ios.min.cmake 2022-06-29 17:37:23 +08:00
halx99 644f09d5a3 Improve frame rate control 2022-06-29 17:26:22 +08:00
halx99 f48be5bf4a Committing genbindings changes 2022-06-28 09:42:02 +00:00
涓€绾跨伒 6d1a2e70e7 Merge: 040a64b920 884a4c3b1d 
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
涓€绾跨伒 8b42852d1f Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
halx99 0acbfdb35a Committing genbindings changes 2022-06-28 08:51:45 +00:00
涓€绾跨伒 614397d0f4 Merge: 7f795d7a6c c6c07428bf 
Merge pull request #677 from rh101/rendertarget-fix

Make the render target selectable for RenderTexture
 2022-06-28 16:39:59 +08:00
halx99 f8c036e621 Improve frame rate control precision 2022-06-28 16:33:50 +08:00
rh101 75d1bf196a Ensure the render target is released if it is already set, since the initWithWidthAndHeight method may be called multiple times. 2022-06-28 17:56:17 +10:00
rh101 62af2299a6 Allow the selection of a shared or new render target for each instance of RenderTexture 
Add a method to check if the RenderTexture is using a shared render target
 2022-06-28 17:42:33 +10:00
halx99 7417447fc7 Fix ci 2022-06-28 15:03:35 +08:00
halx99 6d9c4ea327 Fix ci 2022-06-28 14:53:39 +08:00
halx99 5db31e4125 Unify fps control logical to director mainLoop 2022-06-28 12:39:05 +08:00
halx99 37a2849226 Update .gitignore [skip ci] 2022-06-28 12:38:01 +08:00
涓€绾跨伒 6f1d7221d6 Update readme files (#674) 
* Update README_CN.md

* Update README.md
 2022-06-27 22:21:19 +08:00