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

39891 Commits

Author SHA1 Message Date
halx99 54465540ff Tidy thirdparty, openssl to 1.1.1l, remove unused iconv on win32 2021-08-26 22:59:44 +08:00
halx99 7b5f23e3eb Add missing linux luajit 2021-08-26 20:44:11 +08:00
halx99 74a1ac7cfe Delete unused sources 2021-08-25 16:14:15 +08:00
halx99 9e61c49e7a Add missing libs 2021-08-23 20:41:30 +08:00
halx99 b66993f908 Update curl to 7.78.0 and use prebuilt lib for speedup cmake generation time 2021-08-23 20:38:52 +08:00
halx99 d0d77730a9 Update imgui 2021-08-23 17:49:38 +08:00
halx99 4053b2f197 Sync yasio version number [skip ci] 2021-08-20 15:19:04 +08:00
halx99 141c5991f1
Merge pull request #471 from rh101/dynamic-lib-fix 
Fix for dynamic library issue
 2021-08-20 14:22:52 +08:00
rh101 219c253c84 Fix for dynamic library issue 2021-08-20 14:43:19 +10:00
halx99 ce5ecfcdbe Update version id [skip ci] 2021-08-20 12:19:26 +08:00
halx99 de0b1a9082
Update README.md [skip ci] 2021-08-20 01:24:32 +08:00
halx99 42075d063c
Merge pull request #470 from adxeproject/update-thirdparties 
Update thirdparty libs
 2021-08-20 01:20:51 +08:00
halx99 4474394d82
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 5bcc77f0ef Update thirdparty libs 2021-08-19 22:53:54 +08:00
rh101 0266d332e5 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 11434287cd
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 c9ebafe501 Fixes for crashes in sprite and sprite cache tests 2021-08-19 15:43:18 +10:00
halx99 b48133e9c6
Merge pull request #465 from aismann/dev 
class PhysicsDebugNodeBox2D clean up
 2021-08-19 13:12:18 +08:00
aismann e2ef8d5ba7 class PhysicsDebugNodeBox2D cleanup 2021-08-19 06:03:58 +02:00
halx99 40e51b8a98
Merge pull request #462 from aismann/Box2D_cleanup_improvement 
cleanup and improvement
 2021-08-18 14:47:01 +08:00
aismann a9569ca061 fix 2021-08-18 06:00:43 +02:00
aismann 42439e5b50 Update CCPhysicsDebugNodeBox2D.cpp 2021-08-18 05:31:33 +02:00
aismann 5b3748cdd6 Important API change for naming convention 
rename
class DebugDraw
to
PhysicsDebugNodeBox2D
 2021-08-18 05:23:03 +02:00
aismann 780d4e6294 cleanup and improvement 2021-08-18 04:16:21 +02:00
halx99 f75f243928
Merge pull request #461 from rh101/lua-bundings-update 
Update LUA bindings
 2021-08-18 07:20:50 +08:00
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