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

3082 Commits

Author SHA1 Message Date
rh101 188345e42a Fix incorrect reference count check in SpriteFrameCache::removeUnusedSpriteFrames 
[BaseTest] Ensure unused frames are released before attempting to free unused textures
 2021-08-17 15:26:44 +10:00
rh101 b3e045b387 Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 5199bb087a Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
aismann 9f2ab0ef28
More improvements (#455) 2021-08-14 10:28:28 +08:00
RH 4716456e33
Support custom texture atlas formats (#284) 
* Allow support for custom texture atlas formats other than PLIST.

* Revert usage of emplace_back to push_back to ensure support for older compilers.

* Update test to support SpriteFrameCache::addSpriteFramesWithFile

* Re-add SpriteFrameCache::addSpriteFramesWithFileContent

* Change order of SpriteFramesFromFileContent test back to what it previously was

* Remove sprite sheet and all frames associated with it correctly

* Move sprite loader classes into their own files to clean up CCSpriteFrameCache

* Remove redundant line and update comment

* Fix formatting to match adxe code style

* Fix typo

* Add custom sprite sheet loader test using JSON-array sprite atlas format.
Simplify sprite sheet loader interface by adding identifier to the custom sprite sheet loader implementation.

* Add newline at the end of the file
 2021-08-13 14:52:58 +08:00
halx99 56edf5c339 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
aismann 861c356bb4 update CMakeList.txt 2021-08-12 06:02:01 +02:00
aismann 7b7a3a8ae7 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 6ee687302b Xcode Embed Frameworks support 
refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/22412#note_997156
 2021-08-10 11:43:16 +08:00
halx99 97e5896325 Update cmake link 2021-08-10 10:46:11 +08:00
aismann c2b44cc7e1 some beauties 2021-08-06 10:19:54 +02: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
aismann 36a6ba2a33
Merge pull request from improve Box2D-TestBed (#437) 
* Update AppDelegate.cpp

Add '*Debug*' on the title

* Update CCPhysicsDebugNodeBox2D.h

* Improve Box2D-TestBed

* improvements

* Update CCPhysicsDebugNodeBox2D.cpp
 2021-07-19 18:33:03 +08:00
halx99 abd98f50aa HttpClient cookie support 2021-07-19 12:26:25 +08:00
halx99 ffcd4770cb Move GL macros to backend MacrosGL.h 
a. Fix box2d-testbed crash on macos and ios
b. User should avoid use them at application
 2021-07-07 13:52:56 +08:00
halx99 5161d4135f
Fix spell case (#424) 
* Fix file name case [skip ci]

* Rename Test.cpp to test.cpp
 2021-07-07 04:01:08 +08:00
aismann 5735a85862
Merge pull request #423 from aismann/dev 
Enable box2d testbed on linux/macos
 2021-07-07 02:29:38 +08:00
aismann 5ab1fdbf57
Merge pull request #419 from aismann/Box2D-TestBed 
* Starting "Box2D - TextBed" adaption (most demos working)

* fix CMakeList.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update Box2dTest.cpp

* Update tests.h

* Update CCPhysicsDebugNodeBox2D.cpp

* Update controller.cpp
 2021-07-06 21:02:47 +08:00
halx99 3c25f74ef1 Fix case for linux 2021-07-06 18:46:07 +08:00
halx99 3d7251e7e3 ChipmunkTestBed non-win platform adapte 2021-07-06 18:40:24 +08:00
halx99 8efca2ea3a HttpClientTest tag [skip ci] 2021-07-06 11:43:57 +08:00
halx99 45ad0d86fe Implement HttpClient::sendSync with std::promise 2021-07-06 11:39:53 +08:00
halx99 7405c5781b HttpClient handle content type from custom headers 2021-07-05 14:24:04 +08:00
halx99 ec904ed2b2 Downloader background task [ci build] 2021-07-04 19:26:18 +08:00
halx99 79b13d2372 Fix #413 2021-07-04 16:40:34 +08:00
halx99 f260546821 Remove yasio test since we implement HttpClient based on it [ci build] 2021-07-02 19:02:38 +08:00
aismann 8498203a47
Chipmunk2D TestBed finished (#410) 
* Improve Chipmunk2D - TestBed

* Code cleanup, keyboard fix, should be finished now (behavior like the original Chipmunk2D - demos with Sokol as renderer)

* Update ChipmunkTestBed.h

* Fix wrong merge
 2021-06-30 18:57:41 +08:00
aismann e7d2df5ae2
Update ChipmunkTestBed.h (#412) 2021-06-30 17:13:55 +08:00
aismann 158bd118e4
Improve Chipmunk2D - TestBed (#404) 2021-06-30 09:52:54 +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
aismann 67a505ef4f
Improve Chipmunk2D - TestBed. Starting code cleanup. (#399) 
* Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.

* Improve Chipmunk2D- TestBed and starting the code cleanup ...
 2021-06-25 21:31:13 +08:00
aismann c5d82faa9e Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too. 2021-06-25 17:01:23 +08:00
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 07ffbedc3c Update CMakeLists.txt 2021-06-24 00:21:36 +08:00
aismann 528ced1c9d Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange 2021-06-24 00:21:36 +08:00
aismann df1a6e5feb Update CMakeLists.txt 2021-06-23 17:32:34 +02: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 29015e1cd7 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 f0dc1582fb [Gradle] Find ndk with env ANDROID_NDK [ci build] 2021-06-02 05:37:18 +08:00