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

1280 Commits

Author SHA1 Message Date
halx99 1e36900153 Merge: ce5ecfcdbe 219c253c84 
Merge pull request #471 from rh101/dynamic-lib-fix

Fix for dynamic library issue
 2021-08-20 14:22:52 +08:00
rh101 f488de7d6c Fix for dynamic library issue 2021-08-20 14:43:19 +10:00
halx99 961c2d1895 Update version id [skip ci] 2021-08-20 12:19:26 +08:00
halx99 99099dc08f Merge: 11434287cd 0266d332e5 
Merge pull request #469 from rh101/filestream-64bit

Update FileStream seek, tell and size to support files greater than 4GB files
 2021-08-20 01:20:17 +08:00
halx99 825a87685f Update thirdparty libs 2021-08-19 22:53:54 +08:00
rh101 cb696b06ac Update FileStream seek, tell and size to support files greater than 4GB, and max size is 2^63. 2021-08-20 00:53:02 +10:00
halx99 426aa0db93 Merge: b48133e9c6 c9ebafe501 
Merge pull request #466 from rh101/fix-sprite-test-crashes

Fixes for crashes in sprite and sprite cache tests
 2021-08-19 14:35:44 +08:00
rh101 ad3e3380e2 Fixes for crashes in sprite and sprite cache tests 2021-08-19 15:43:18 +10:00
aismann 4ec017f4bc class PhysicsDebugNodeBox2D cleanup 2021-08-19 06:03:58 +02:00
aismann 18184b1d31 fix 2021-08-18 06:00:43 +02:00
aismann 2ab8f26871 Update CCPhysicsDebugNodeBox2D.cpp 2021-08-18 05:31:33 +02:00
aismann 5f086208a0 Important API change for naming convention 
rename
class DebugDraw
to
PhysicsDebugNodeBox2D
 2021-08-18 05:23:03 +02:00
aismann 288941a63f cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 bd4d07b86e Update LUA bindings 2021-08-18 01:01:56 +10:00
rh101 14a1556c6c Revert check for reference count, since it was correct. [skip ci] 2021-08-17 18:49:14 +10:00
rh101 e558b3c976 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 4a0d48d93e Fix for incorrect method name 2021-08-17 14:51:17 +10:00
rh101 c60f66c9bb Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 7a6734408d Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
halx99 de54082c76 Update lua bindings 2021-08-14 13:22:03 +08:00
aismann 39dbbc4713 More improvements (#455) 2021-08-14 10:28:28 +08:00
halx99 fd9422d36d Update lua bindings 2021-08-13 20:36:10 +08:00
halx99 5af2f0d77e Update CHANGELOG 2021-08-13 14:54:13 +08:00
RH 2c0f04c99b 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
aismann 86f512b81c Update README.md 2021-08-13 08:13:25 +02:00
halx99 5b21fe8ce9 Explicit disable codesign for macOS 2021-08-13 10:19:24 +08:00
aismann e0023fb4f9 Update README.md 2021-08-12 11:24:22 +02:00
halx99 3905654659 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
halx99 152a038751 Merge: 397877134d cc9a32306b 
Merge pull request #448 from aismann/patch-2

Update README.md
 2021-08-12 15:34:56 +08:00
halx99 84a84a8931 Merge: 39eb09daad 861c356bb4 
Merge pull request #447 from aismann/Box2D_TestBed_improvement

Box2D_TestBed_improvement
 2021-08-12 15:34:24 +08:00
aismann d0a18036b5 Update README.md 2021-08-12 07:03:14 +02:00
aismann 24a99d6e27 update CMakeList.txt 2021-08-12 06:02:01 +02:00
aismann c94562d417 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 1452e698e3 Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 dc3b5292d7 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 48505bc10f Update cmake link 2021-08-10 10:46:11 +08:00
halx99 5254edc733 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 50c270e8f5 Merge: 0a682f0dc1 c2b44cc7e1 
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
aismann 97a6104516 Update README.md 2021-08-06 12:19:45 +02:00
aismann 7ec9850fa2 some beauties 2021-08-06 10:19:54 +02:00
aismann 4c6f9fcc3d Box2D - Basic ready for use 2021-08-06 09:35:29 +02:00
aismann b5d0326e6e 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 f02e0a7b87 Fix #443 
a. HttpClient: improve request header processing
 2021-08-05 14:56:40 +08:00
halx99 410d3b41af HttpClient: push front available channel to fix dns cache missing 2021-08-03 14:41:30 +08:00
halx99 981b3a9a79 Add HttpClient::handleNetworkStatusChanged to clear DNS cache 2021-07-31 14:39:42 +08:00
halx99 622c22c47b Avoid crash when http cookie enabled on android 2021-07-23 16:09:13 +08:00
halx99 21af858b20 Code style 2021-07-21 21:06:55 +08:00
halx99 f37be8f5c2 Improve logic 2021-07-20 15:08:31 +08:00
halx99 b793ff123e Remove test code 2021-07-20 15:06:17 +08:00
halx99 c74a12baf5 Fix cookie match 2021-07-20 15:03:19 +08:00