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

39815 Commits

Author SHA1 Message Date
halx99 96e83c9cf6
Merge pull request #490 from wzhengsen/dev 
[fix]The problem of inaccurate maximum width limit when using system fonts.
 2021-09-02 17:48:42 +08:00
榆柳松 1548c75a3d [fix]The problem of inaccurate maximum width limit when using system fonts. 2021-09-02 17:15:03 +08:00
rh101 78236079e8 More %ld to %d changes 2021-09-02 17:54:13 +10:00
rh101 de182c8360 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
rh101 d8ef523abb Fix typo 2021-09-02 17:05:33 +10:00
rh101 386f7deb9d Use explicit cast to uintptr_t prior to casting to int type. 2021-09-02 16:52:40 +10:00
rh101 3c5fa51a01 Fix for compilation issue due to pointer to int32 conversion. 
Fix warning.
 2021-09-02 16:38:23 +10:00
rh101 101eb89f4c Revert to `long` for library usage 2021-09-02 16:20:16 +10:00
rh101 0b27d0980c Add required include for uint32_t 
Fix code warning
 2021-09-02 16:18:32 +10:00
rh101 737f0c39d7 Revert to usage of `long` type for external library methods that require it. 2021-09-02 16:08:57 +10:00
rh101 64695cfb48 Revert changes where `long` type is required. 2021-09-02 15:59:29 +10:00
rh101 aecfb8be47 FT_StreamRec expects specific method signature with `unsigned long` 2021-09-02 15:55:57 +10:00
rh101 e5bbea3cca Test code updated with long to int32_t changes 2021-09-02 15:48:05 +10:00
rh101 4d1ff40736 Usage of long and unsigned long changed to platform independent fixed-sized types where appropriate. 2021-09-02 15:39:28 +10:00
halx99 d197e8b245 Fix part of #487 2021-09-02 11:43:27 +08:00
halx99 a4ac70ee5f Remove deprecated stubs 2021-09-02 11:16:36 +08:00
halx99 857243ac21 Make override function default parameter same with parent 2021-09-01 11:13:17 +08:00
halx99 9abe2c38cf Revert unexpected layer changes 2021-09-01 11:11:32 +08:00
halx99 e070ec111e Add win64 angle dlls 2021-09-01 10:28:37 +08:00
halx99 a2346d5e1f Merge branch 'dev' of https://github.com/adxeproject/adxe into dev 2021-09-01 10:10:46 +08:00
halx99 a762c94904 Update yasio 2021-08-31 21:13:10 +08:00
halx99 21f27285a0 Fix #486, re-enable custom shader batch draw 2021-08-31 16:25:45 +08:00
halx99 b7f391cbff HttpClient: clear channel ud when it been recycle 2021-08-31 15:53:46 +08:00
halx99 c354461982 Enum compatible [skip ci] 2021-08-31 15:50:18 +08:00
halx99 cb81a61530 Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 42d77402aa Merge commit 'refs/pull/483/head' of https://github.com/adxeproject/adxe into dev 2021-08-30 19:32:05 +08:00
halx99 858d46ae65
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 95b9969365 Update changelog 2021-08-30 17:55:00 +08:00
halx99 80e0e3b941 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
halx99 ab85d86751
Update bug_report.md 2021-08-30 10:47:45 +08:00
halx99 0efa307d56
Update bug_report.md 2021-08-30 10:47:07 +08:00
halx99 8e1d7bd85d Reimplement LayerColor and LayerGradient for auto batch draw 2021-08-29 18:59:09 +08:00
halx99 89f0e21508
Revert last commit 2021-08-29 08:06:38 +08:00
halx99 f16748f735 Set Sprite rect properly when create with empty texture. 2021-08-28 22:11:25 +08:00
halx99 beb593a22a Fix comment typo and do clang-format [skip ci] 2021-08-28 20:22:01 +08:00
halx99 0e2ade1350
Merge pull request #481 from adxeproject/fix-480 
Fix crash problem when load a non-truetype .ttf file
 2021-08-28 19:22:57 +08:00
halx99 56067f5acc Fix crash problem when load a non-truetype .ttf file. 2021-08-28 18:24:17 +08:00
halx99 c0f7b7ba12
Merge pull request #479 from aismann/patch-8 
Update README.md
 2021-08-27 16:46:08 +08:00
aismann 7ee77475fe
Update README.md 2021-08-27 10:43:35 +02:00
halx99 7fe18587f8
Add Contributing guide 2021-08-27 15:47:40 +08:00
halx99 0a334fb406
Merge pull request #478 from aismann/dev 
64bit debug error fix: CCASSERT(_skeletonData, (json->getError().isEmpty() ? json->getError().buffer() : "Error reading skeleton data file."));
 2021-08-27 15:11:30 +08:00
aismann 9e37e44c0f
Merge branch 'adxeproject:dev' into dev 2021-08-27 08:33:22 +02:00
halx99 7dd7422abd Macro compatible 2021-08-27 13:54:05 +08:00
aismann 1c05947474
Merge branch 'adxeproject:dev' into dev 2021-08-27 07:49:17 +02:00
aismann cbeeb8d8ab 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 3990cc765d Update Windows build status badge 2021-08-27 13:27:04 +08:00
halx99 81fd4df36e
Delete x-studio.cmake 2021-08-27 13:23:51 +08:00
halx99 8790730518
Update README.md 2021-08-27 12:45:20 +08:00
halx99 d34a5f0940
Update README_CN.md 2021-08-27 12:45:03 +08:00
halx99 09d39e2fa0
Update windows-ci.yml 2021-08-27 12:39:49 +08:00