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

2454 Commits

Author SHA1 Message Date
halx99 c9eb1a7de4
Merge branch 'dev' into Chipmunk2D 2021-06-24 17:04:04 +08:00
aismann df58dd753c Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 2397d54daf
Fix ci [ci build] 2021-06-24 12:48:25 +08:00
halx99 a379f936d8
Reimplement HttpClient based on yasio (#390) 
* [WIP] Reimplement HttpClient based on yasio
This change will make HttpClient support concurrency request

* [WIP] Reimplement HttpClient based on yasio
a. timeoutForRead support
b. Improve code

* [WIP] Reimplement HttpClient based on yasio [ci build]

* [WIP] Fix ci [ci build]

* [WIP] Reimplement HttpClient based on yasio [ci build]
PUT,DELETE support

* [WIP] Reimplement HttpClient based on yasio [ci build]
HttpClientTest works

* Update HttpClient.cpp

* HttpClientTest: enable sslVerifaction test

* Update HttpResponse.h

* Sync luabindings [ci build]

* Add chrome UA test

* Fix ci [ci build]

* The timer for read timeout should be associated with per channel

* Remove unused function

* Update url
 2021-06-24 12:33:07 +08:00
halx99 581a792155 Delay scene default camera init, see also #392 
This change will make sure user can change window or design size before scene init
 2021-06-24 02:23:02 +08:00
halx99 c9358397b7 Fix #392 2021-06-24 01:23:29 +08:00
aismann 528ced1c9d Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange 2021-06-24 00:21:36 +08:00
aismann 48bc8144a5 Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange 2021-06-23 17:09:48 +02:00
aismann 2ce88d571b
some more Chipmunk2D TestBed examples, mouse interaction, ... (#389) 
* Chipmunk2D - TestBed  Add more examples and improve using the original source

* Improve using original chipmunk2d demo code, add more example, add interactions with mouse
 2021-06-23 14:25:44 +08:00
aismann 85347cd438 Chipmunk2D - TestBed Add more examples and improve using the original source 2021-06-18 16:52:56 +08:00
aismann 69e54bb74d
Improved Chipmunk2D - TestBed (#381) 
* Improved Chipmunk2D - TestBed

* for windows only (at this moment)

* Update CmakeLists.txt

* fix CmakeLists.txt

* some more fixes

* more fixes

* more fixes

* Create ChipmunkDemo.h

* Fix CMakeList.txt; improve Chipmunk TestBed
 2021-06-17 14:22:52 +08:00
aismann a491997731
Improve the "Physics part" (#379) 
* 1. Add "initial" Chipmunk - TestBed

More demos comes later.

* 2. Removed unused source

* Update CMakeLists.txt

* Some fixes #1

* workaround #1

* workaround #1
 2021-06-16 19:34:09 +08:00
halx99 bde4726807 Update yasio [ci build] 2021-06-14 22:54:50 +08:00
halx99 d13746a035
Fix ci [ci build] 2021-05-24 17:20:28 +08:00
HALX99 a42f9ac25c
Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 c1063ea03d Fix cpp-tests exit crash when tableView in scrolling [ci build] 2021-04-26 17:55:55 +08:00
HALX99 138781151a
Fix depth stencil state/desc (#321) 
* Fix ds state

* fix 3d object not render

* Update DepthStencilStateGL.cpp

* fix ds, not complete

* fix image ref incorrect

* Fix metal captureScreen

* Share ds desc
needs restore properly after non-default render target destroy.

* fix gl compile

* Sync ds desc

* Only set vertex & index buffer once for batch draw

* Add set/get ds desc for renderer

* Refine code style

* Fix RenderTextureTest
a. should restore stencil desc properly

* Sync gl captureNode

* Sync GL
 2021-01-31 22:22:52 +08:00
aismann 057642921b Update controller.cpp 
"Node: Physics" using Chipmunk2D (hardcoded on e.g.: CCPhysicsBody.cpp)

Maybe a Wiki entry is also usefull?
 2020-12-20 07:11:13 +01:00
aismann 4ef25e25cf same/correct wording style 2020-12-03 21:33:52 +01:00
aismann dbf81d7511 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 72be372699 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
 2020-12-01 16:39:28 +01:00
aismann 5e249bf6f8 Chipmunk2D and Box2D works together now (add two new classes) 
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
 2020-12-01 10:15:30 +01:00
Eismann eee60b9d99 Same as on 3.17 (with small changes) 2020-11-23 07:46:09 +01:00
Eismann c364c9adb5 Update Box2dTest.h 2020-11-20 07:05:21 +01:00
Eismann 7c06461594 add Box2D to CMakeList 2020-11-20 06:19:30 +01:00
Eismann 178ce9f5cf Add BOX2D test 
Add BOX2D test
 2020-11-20 04:51:47 +01:00
halx99 5da2894e1b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 c563bc295f Sync folder for binding generator config 2020-11-01 20:18:50 +08:00
halx99 f13bc32512 Build android arch arm64-v8a only for ci, fix test case compiling warning 2020-10-26 11:12:55 +08:00
halx99 2b125c75bd Refine ProgramState mat id 2020-10-23 11:37:52 +08:00
halx99 86f3c58c39 Reserve extensions 'cocostudio' for esay to migrate exist projects 2020-10-21 10:12:00 +08:00
halx99 28677ba0b3 cpp-tests for mobile, set resourceSize to 960x640 2020-10-20 16:38:50 +08:00
halx99 adf09cf173 Reserve extension GUI for cpp-tests only 2020-10-18 12:31:45 +08:00
HALX99 90ecc475f0
Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 2f934aeedc Simplfy hsv color 2020-10-16 17:23:29 +08:00
HALX99 b342ebd7ae
Refactor programState management (#236) 
1. Add custom program registery
2. Re-enable batch draw for custom program
 2020-10-16 16:23:14 +08:00
HALX99 235f09f635
Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 e8ce296dd3 Add Label crashing test case for https://github.com/cocos2d/cocos2d-x/issues/20523 2020-09-17 11:49:47 +08:00
halx99 8c7ce70ef6 fix warn [skip appveyor] 2020-09-11 18:46:15 +08:00
halx99 7249325ff4 Use glMapBuffer if available 2020-09-11 17:32:08 +08:00
halx99 992d6139d9 More clearly programState management 2020-09-09 13:03:31 +08:00
HALX99 03c2fa52e0
fix ident [skip appveyor] [skip travis] 2020-09-08 17:23:15 +08:00
halx99 090cd1002b Add ImGuiEXT test case for PC platforms 2020-09-08 13:38:16 +08:00
HALX99 7a2f91e514
ASTC6x6 support and more comment about bpp usage in engine (#191) 
* ASTC6x6 support and more comment abount bpp usage in engine

* fix log output

* Comment astc compression tool download url

* Add command line comment for astcenc tool [skip travis][skip appveyor]

* Add astc_6x6 test image[skip appveyor][skip travis]

* astc_6x6 mtl

* Refine log info[skip appveyor][skip travis]

* Empty line[skip appveyor][skip travis]
 2020-09-03 18:01:40 +08:00
halx99 f3c17427aa More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 e7811e707a 1. Finish ETC2 support on GL renderer backend 
2. Improve ASTC compressed format check
 2020-08-30 17:58:39 +08:00
halx99 8b7505e171 Sync missing feature from v3, and API compatible 2020-08-28 16:33:52 +08:00
halx99 ae99a5965b Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 9d9067dec4 Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 0b728e076a Remove unnecessary code 2020-08-10 00:21:56 +08:00
halx99 adc97af519 Optimize YAsioTest, see #150 2020-08-10 00:20:29 +08:00
aismann c5f1e242e3
Polygon looks correct now 
Tested with Clipper 6.x and new poly2tri
 2020-08-08 09:57:17 +02:00
halx99 b142167560 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00
aismann 1c811d857a
The switch to the third monitor was not working 2020-08-03 08:34:19 +02:00
halx99 6f274a8003 Set full screen before layout renderer elements to ensure VisibleRect is correct with full screen window size 2020-08-02 16:55:21 +08:00
halx99 aa59cf6876 Add wav testcase 2020-08-01 19:25:39 +08:00
Eismann 253f82a894 Add tests for Fullscreen Monitor 3 
Add tests for Fullscreen Monitor 3 (if present)
 2020-08-01 07:12:29 +02:00
Eismann 8c71708323 Revert "Revert "Update NewAudioEngineTest.cpp"" 
This reverts commit 379c099b2d.
 2020-08-01 06:55:33 +02:00
Eismann 379c099b2d Revert "Update NewAudioEngineTest.cpp" 
This reverts commit 87232d61b1.
 2020-08-01 06:54:56 +02:00
Eismann 87232d61b1 Update NewAudioEngineTest.cpp 
"wav-samples/8kadpcm.wav" not existing.
 2020-08-01 06:49:44 +02:00
halx99 a70b43af1e Remove a submodules. 2020-07-20 18:41:45 +08:00
halx99 87635cfa81 fix compile issue 2020-07-10 16:00:21 +08:00
halx99 40cb068201 finish issue: #85 2020-05-06 15:42:25 +08:00
halx99 313d4dc2a1 Update deps to v33 2020-03-03 23:17:38 +08:00
halx99 e379fc513d Refactor CCValue. 2020-03-03 19:24:07 +08:00
weiwest 89105d0db2 Merge remote-tracking branch 'upstream/master' 2020-02-12 16:58:47 +08:00
weiwest 9496d34470 add astc soft decode support 2020-02-11 23:54:17 +08:00
weiwest dbc089d51d add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
weiwest a6edda385b add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
halx99 b6cf5871cd Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
halx99 1b33d88416 fix compile issue 2020-02-03 22:01:18 +08:00
RH 93352ff06f V4 bmfont improved api (#20406) 
* Merged improved BM font API from Cocos2d-x V3.  Code based on #20309 and #20300

* Added missing test resources.
 2020-01-18 20:40:17 +08:00
RH 3b3086b8d8 V4 uilayout scissorclipping fix (#20415) 
* Fix for issue #19890

* Updated with better fix from the V3 PR #18651

* Formatting fix

* Fixed issue with incorrect type (double instead of float) when compiling on certain platforms.

* Another attempt to fix compilation issue
 2020-01-18 20:40:13 +08:00
Arnold 2fdb65e2c6 set attribute (#20417) 2020-01-18 20:40:09 +08:00
halx99 d3aabf3f89 Add test case for yasio 2020-01-05 04:24:13 +08:00
halx99 a2eb8507bb [v4] spine v3.8 2020-01-05 03:09:32 +08:00
RH deffc2cbef Fix for issue #19890 (#20407) 2019-12-12 23:55:23 +08:00
halx99 3a877c50f2 fix SpritePolygonTest 2019-12-03 00:50:11 +08:00
coulsonwang abc25ae04a adjust ralative position of tested item in TouchTest (#20369) 2019-11-26 23:40:54 +08:00
halx99 d193246f09 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 ab7ccf0a58 Update etc1 alpha test case 2019-11-25 02:46:52 +08:00
halx99 30ffbe1514 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 d3e97a75a3 Remove websockets, sync tests. 2019-11-24 21:02:16 +08:00
coulsonwang 912ba30e49 remove duplicated PrgramState instance in the derived class of Node (#20350) 2019-11-20 11:04:42 +08:00
coulsonwang 4914dfff10 fix AudioSwitchStateTest subtile (#20278) 2019-10-31 16:05:57 +08:00
coulsonwang 2d42aa1d21 fix memory leak (#20258) 2019-10-28 15:04:03 +08:00
coulsonwang 2501f53b9b add CameraTest (#20253) 
* nodeTest

* fix
 2019-10-25 18:22:35 +08:00
minggo c9af873e2e
fix some warnings (#20247) 2019-10-25 16:40:30 +08:00
coulsonwang b849fce842 remove box2d tests (#20246) 2019-10-25 13:37:08 +08:00
minggo be038d9ffc
fix some warnings (#20236) 2019-10-25 09:27:54 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
Arnold 11a1f820e2 [v4] add unzip test code (#20219) 2019-10-22 13:47:07 +08:00
minggo 24b04e561b
sync #20007 to v4 (#20210) 
* sync #20007 to v4

* Fixing a bug in Node::enumerateChildren (#20045)

This patch fixes an issue that if both // (recursive enumeration)
and .. (starting from parent node) are specified,
Node::enumerateChildren does not honor the latter and starts searching
from current node rather than parent node.
 2019-10-17 11:12:25 +08:00
coulsonwang 67ae2e756e fix ProgramState and Program performance (#20189) 
* fix ProgramState and Program performance

* fix review

* fix

* add autorelease
 2019-10-15 09:40:59 +08:00
coulsonwang ab04e037b7 fix PhysicsContactTest (#20171) 
modify the item relative position to avoid inappropriate operation.
 2019-10-08 15:07:46 +08:00
minggo 42c43a53a1
fix crash when back with playing video (#20169) 2019-09-25 14:33:18 +08:00
coulsonwang 6de088ab98 fix C4244 warning (#20162) 
* fix C4244 warning

* fix warning C4244

* fix compile error
 2019-09-25 14:32:26 +08:00
coulsonwang 03a4ddf764 fix warning (#20146) 
* fix warning
fix warning

* remove integer type constructor for Vec2
 2019-09-24 11:31:35 +08:00
coulsonwang 0dbe3419d2 fix warning 
fix warning
 2019-09-20 11:20:07 +08:00
Arnold 92b48359ea add cert file (#20081) 2019-09-04 10:09:12 +08:00