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

1313 Commits

Author SHA1 Message Date
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 0baf946df7 Merge: cbeeb8d8ab 3990cc765d 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 07:49:17 +02: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 d6a54f02a0 Update Windows build status badge 2021-08-27 13:27:04 +08:00
halx99 44ea2208a6 Delete x-studio.cmake 2021-08-27 13:23:51 +08:00
halx99 aca4d274c8 Update README.md 2021-08-27 12:45:20 +08:00
halx99 7b5fc4e2a4 Update README_CN.md 2021-08-27 12:45:03 +08:00
halx99 3b424f75e5 Update windows-ci.yml 2021-08-27 12:39:49 +08:00
halx99 b04fd70cc7 Merge: bdd69746ae 26f2caad68 
Merge pull request #477 from aismann/patch-7

Update README.md
 2021-08-27 12:34:49 +08:00
halx99 62e42ffad5 Merge: 87871ed557 9c2889be38 
Merge pull request #476 from aismann/patch-6

Update README.md
 2021-08-27 12:34:38 +08:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 8e10b0bf51 Update README.md 2021-08-27 06:27:45 +02:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 6ce88cb130 Update CHANGELOG 2021-08-27 12:03:05 +08:00
halx99 824130acc4 Enable lua-tests build for ci 2021-08-27 11:42:43 +08:00
halx99 fa1f2f2d33 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 5d0565b900 Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 860400cb8c Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 63cfa97024 Update build.ps1 2021-08-27 08:02:03 +08:00
halx99 08526c36c3 Update windows-ci.yml 2021-08-27 01:52:34 +08:00
halx99 5f0d24e545 Update pr-ci.yml 2021-08-27 01:52:03 +08:00
halx99 86e7b1da1b Update pr-ci.yml 2021-08-27 01:51:02 +08:00
halx99 008c2b9be4 Rename tools/windows-ci/windows-ci/windows-ci/build.ps1 to tools/windows-ci/build.ps1 2021-08-27 01:43:07 +08:00
halx99 34083069f3 Create build.ps1 2021-08-27 01:42:32 +08:00
halx99 b944332f03 Update windows-ci.yml [skip ci] 2021-08-27 01:31:35 +08:00
halx99 2ade93bc1e Rename windows ci [skip ci] 2021-08-27 01:20:07 +08:00
halx99 3fd20e30cf Update CocosConfigDefine.cmake 2021-08-27 01:08:14 +08:00
halx99 d59bcadf23 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
halx99 6dd878a90f Delete unused sources 2021-08-25 16:14:15 +08:00
halx99 b67ff5b81e Add missing libs 2021-08-23 20:41:30 +08:00
halx99 64f64f02c9 Update curl to 7.78.0 and use prebuilt lib for speedup cmake generation time 2021-08-23 20:38:52 +08:00
halx99 45b5a9f689 Update imgui 2021-08-23 17:49:38 +08:00
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