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

40016 Commits

Author SHA1 Message Date
rh101 7ef0ec96bf Update LUA bindings 2021-08-18 01:01:56 +10:00
halx99 abfc5b7af8
Merge pull request #459 from rh101/spritesheet-api-fix 
Update sprite sheet API to allow custom sprite sheet texture filename to be used
 2021-08-17 17:05:30 +08:00
rh101 b420a33b68 Revert check for reference count, since it was correct. [skip ci] 2021-08-17 18:49:14 +10:00
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 d5d3201bef Fix for incorrect method name 2021-08-17 14:51:17 +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
halx99 16e3d66a66 Update lua bindings 2021-08-14 13:22:03 +08:00
aismann 9f2ab0ef28
More improvements (#455) 2021-08-14 10:28:28 +08:00
halx99 c5aeed4c06 Update lua bindings 2021-08-13 20:36:10 +08:00
halx99 85a0afe4e5
Merge pull request #453 from aismann/patch-4 
Update README.md
 2021-08-13 15:31:49 +08:00
halx99 f98fa0df39
Update CHANGELOG 2021-08-13 14:54:13 +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 c2220bf154
Merge pull request #454 from aismann/patch-5 
Update README.md
 2021-08-13 14:21:41 +08:00
aismann 0c03796e4c
Update README.md 2021-08-13 08:13:25 +02:00
aismann 920f24160e
Update README.md 2021-08-13 08:11:45 +02:00
halx99 de925136c9 Add thirdparty box2d-optimized cmake option: OPT_BOX2D_OPTIMIZED 2021-08-13 13:54:18 +08:00
halx99 55f1947429 Explicit disable codesign for macOS 2021-08-13 10:19:24 +08:00
halx99 4e0c597a38
Merge pull request #452 from aismann/patch-3 
Update README.md
 2021-08-12 17:53:52 +08:00
aismann ad28d4bb03
Update README.md 2021-08-12 11:24:22 +02:00
halx99 56edf5c339 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
halx99 3700bfc76f
Merge pull request #448 from aismann/patch-2 
Update README.md
 2021-08-12 15:34:56 +08:00
halx99 397877134d
Merge pull request #447 from aismann/Box2D_TestBed_improvement 
Box2D_TestBed_improvement
 2021-08-12 15:34:24 +08:00
aismann cc9a32306b
Update README.md 2021-08-12 07:03:14 +02: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 39eb09daad Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 57fcc0b7e1 By default, enable ALSOFT_OSX_FRAMEWORK 2021-08-11 19:27:58 +08: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
halx99 2f66c3f290 Update angle to chromium/4515 2021-08-08 15:30:25 +08:00
halx99 5c070abfa6 Fix android shared loader for openal-soft 2021-08-08 14:35:30 +08:00
halx99 39ca61f623 Update spine-3.8 runtime to latest 
Maybe no further update until upgrade to spine-4.x
 2021-08-07 00:59:58 +08:00
halx99 082589dcf0
Merge pull request #445 from aismann/Box2D-Basic-Clean-code-and-speed-optimized 
Box2D - Basic ready for use (clean code and speed optimized)
 2021-08-06 19:40:32 +08:00
halx99 0a682f0dc1
Merge pull request #446 from aismann/patch-1 
Update README.md
 2021-08-06 19:24:25 +08:00
aismann 34552a779e
Update README.md 2021-08-06 12:19:45 +02: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
halx99 5e88382a93 Fix #443 
a. HttpClient: improve request header processing
 2021-08-05 14:56:40 +08:00
halx99 cfffd35aec HttpClient: push front available channel to fix dns cache missing 2021-08-03 14:41:30 +08:00
halx99 71c17cfc9b Add HttpClient::handleNetworkStatusChanged to clear DNS cache 2021-07-31 14:39:42 +08:00
halx99 ab6b36d5f9 Update yasio 2021-07-26 23:08:35 +08:00
halx99 e08c9b136a
Avoid crash when http cookie enabled on android 2021-07-23 16:09:13 +08:00
halx99 cc03fc970a
Code style 2021-07-21 21:06:55 +08:00
halx99 85a1954adc Improve logic 2021-07-20 15:08:31 +08:00
halx99 ee3b08c182
Remove test code 2021-07-20 15:06:17 +08:00
halx99 8bb93fcaa0 Fix cookie match 2021-07-20 15:03:19 +08:00
halx99 d3ec308126 Update yasio/cxx17/string_view.hpp [skip ci] 2021-07-20 14:52:29 +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