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

1485 Commits

Author SHA1 Message Date
halx99 1f15fbe192 Remove deprecated stubs 2021-09-02 11:16:36 +08:00
halx99 2178ac49b1 Make override function default parameter same with parent 2021-09-01 11:13:17 +08:00
halx99 3e4d8dd3ac Revert unexpected layer changes 2021-09-01 11:11:32 +08:00
halx99 87d13bd73a Add win64 angle dlls 2021-09-01 10:28:37 +08: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 583bb5ece4 HttpClient: clear channel ud when it been recycle 2021-08-31 15:53:46 +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
halx99 5cc2b14697 Merge: 858d46ae65 8e1d7bd85d 
Merge commit 'refs/pull/483/head' of https://github.com/adxeproject/adxe into dev
 2021-08-30 19:32:05 +08:00
halx99 97fbec0b36 Merge: 95b9969365 80e0e3b941 
Merge pull request #485 from adxeproject/fix-spine-uniform-location-mismatch

Fix spine command pipeline state uniform location mismatch
 2021-08-30 18:57:36 +08:00
halx99 32b86c53c9 Update changelog 2021-08-30 17:55:00 +08:00
halx99 1a7d23eff5 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
halx99 324c5ffde6 Update bug_report.md 2021-08-30 10:47:45 +08:00
halx99 48a1164168 Update bug_report.md 2021-08-30 10:47:07 +08:00
halx99 eef61007bf Reimplement LayerColor and LayerGradient for auto batch draw 2021-08-29 18:59:09 +08:00
halx99 d72c948937 Revert last commit 2021-08-29 08:06:38 +08:00
halx99 65cd67e64c Set Sprite rect properly when create with empty texture. 2021-08-28 22:11:25 +08:00
halx99 b8d27c0715 Fix comment typo and do clang-format [skip ci] 2021-08-28 20:22:01 +08:00
halx99 481daa0e73 Fix crash problem when load a non-truetype .ttf file. 2021-08-28 18:24:17 +08:00
aismann 2a88e5de49 Update README.md 2021-08-27 10:43:35 +02:00
halx99 f6033421d0 Add Contributing guide 2021-08-27 15:47:40 +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 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