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

258 Commits

Author SHA1 Message Date
halx99 3a855ac97f Fix unit test 2021-11-11 18:41:59 +08:00
halx99 c6945c44e5 Add `CCValue` int64_t/uint64_t support 2021-11-09 14:29:15 +08:00
halx99 6e1f8f5953 Optimize cmake scripts 2021-10-12 15:39:37 +08:00
halx99 a49bba32ef Merge: 846231e2f1 cc1d09d04d 
Merge pull request #521 from adxeproject/refine-lua-loader

Refactor lua loader, reload lua with file name as-is
 2021-10-12 14:18:02 +08:00
halx99 8d2dd47cc6 Fix #522 2021-10-12 13:16:27 +08:00
halx99 8dbd1ea335 Remvoe lua 64bit bytecode spec 
a. since we know how to compile compatible bytecode for both plainlua and LuaJIT
 2021-10-11 23:26:25 +08:00
halx99 8d83891f30 Improve lua workflow on windows 
a. Use working directory as default resource root on windows
b. Don't copy res and scripts to build binary dir on windows
c. Always build plainlua as dll on windows for fast debug
d. Remove 64bit spec search path for lua script
 2021-10-07 18:44:34 +08:00
halx99 1deeb87a70 Update copyright notice [skip ci] 2021-10-06 18:47:07 +08:00
halx99 782dc062d3 Fix #516 2021-10-06 11:24:39 +08:00
rh101 c9c003a03f [setup.py] Add download support. Add NuGet CLI download to tools folder. 
Download NuGet Microsoft.Web.WebView2 package version 1.0.992.28
Add support for WebView for Windows builds.
 2021-10-04 18:55:01 +11:00
aismann 85edbe2d28 Update PhysicsTest.cpp 2021-09-08 10:16:14 +02:00
姒嗘煶鏉? 35b658c90e Merge: f5663f279c d73d937894 
Merge remote-tracking branch 'upstream/dev' into dev
 2021-09-05 20:45:32 +08:00
姒嗘煶鏉? 0aff165959 [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 4a1bdeda0d Fix #493, sync uri parse unit test 2021-09-04 00:22:47 +08:00
halx99 a3d51468f7 Fix #492 for win64 require larger stack for cpp-tests: 41 2021-09-03 20:37:34 +08:00
rh101 73ad51b4e0 Windows callback requires `long` return type 2021-09-02 21:21:28 +10:00
rh101 4e7db23d38 Remove getLong() method 
Change %du to %u, and %lx to %x
Use "stdint.h" instead of <cstdint> for TGAlib.h
 2021-09-02 20:30:20 +10:00
姒嗘煶鏉? 64e2cdd8d9 [fix]The problem of inaccurate maximum width limit when using system fonts. 2021-09-02 17:15:03 +08:00
rh101 615fbd5088 More %ld to %d changes 2021-09-02 17:54:13 +10:00
rh101 eba8696d65 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
rh101 1f668eb783 Fix typo 2021-09-02 17:05:33 +10:00
rh101 60c0a58cfd Use explicit cast to uintptr_t prior to casting to int type. 2021-09-02 16:52:40 +10:00
rh101 546d7d6c61 Fix for compilation issue due to pointer to int32 conversion. 
Fix warning.
 2021-09-02 16:38:23 +10:00
rh101 89ba502d20 Test code updated with long to int32_t changes 2021-09-02 15:48:05 +10:00
halx99 0a4d3ee73d Merge: cb81a61530 a762c94904 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2021-09-01 10:10:46 +08:00
halx99 b7bcdd7164 Fix #486, re-enable custom shader batch draw 2021-08-31 16:25:45 +08:00
halx99 756ff065c8 Enum compatible [skip ci] 2021-08-31 15:50:18 +08:00
halx99 be5eff1d5a Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
aismann 74dfe14b16 Merge: 1c05947474 7dd7422abd 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 08:33:22 +02:00
halx99 fc1c901209 Macro compatible 2021-08-27 13:54:05 +08:00
aismann 6632c5c3f6 Debug 64bit build error 
Severity        Code    Description     Project File    Line    Suppression State
Error (active)  E0075   operand of '*' must be a pointer but has type "bool"    cpp-tests       D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp   153
 2021-08-27 07:47:22 +02: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 18184b1d31 fix 2021-08-18 06:00:43 +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 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 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
aismann 39dbbc4713 More improvements (#455) 2021-08-14 10:28:28 +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
halx99 3905654659 Fix xcode build warnings 2021-08-12 15:54:16 +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 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 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