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

39079 Commits

Author SHA1 Message Date
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
halx99 d06e8af7d6
Merge pull request #477 from aismann/patch-7 
Update README.md
 2021-08-27 12:34:49 +08:00
halx99 bdd69746ae
Merge pull request #476 from aismann/patch-6 
Update README.md
 2021-08-27 12:34:38 +08:00
halx99 87871ed557
Merge pull request #475 from adxeproject/win64 
Win64 build support [DONE] 🚀🎉
 2021-08-27 12:34:24 +08:00
aismann 26f2caad68
Update README.md 2021-08-27 06:27:45 +02:00
aismann 9c2889be38
Update README.md 2021-08-27 06:25:18 +02:00
halx99 f5af50debd
Update CHANGELOG 2021-08-27 12:03:05 +08:00
halx99 622c733287 Enable lua-tests build for ci 2021-08-27 11:42:43 +08:00
halx99 bd436ae078 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 f9ac34c20f Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 d7e590b513 Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 c0f3a0a4dd
Update build.ps1 2021-08-27 08:02:03 +08:00
halx99 642daf8f1a
Update windows-ci.yml 2021-08-27 01:52:34 +08:00
halx99 27fc9f90e5
Update pr-ci.yml 2021-08-27 01:52:03 +08:00
halx99 d47a6712b3
Update pr-ci.yml 2021-08-27 01:51:02 +08:00
halx99 75644ae251
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 0a79d9002f
Create build.ps1 2021-08-27 01:42:32 +08:00
halx99 8edba91897
Update windows-ci.yml [skip ci] 2021-08-27 01:31:35 +08:00
halx99 17c4fe4ef1
Rename windows ci [skip ci] 2021-08-27 01:20:07 +08:00
halx99 99e2e4ba4d
Update CMakeLists.txt 2021-08-27 01:14:47 +08:00
halx99 6070d416ac
Update CocosExternalConfig.cmake 2021-08-27 01:09:39 +08:00
halx99 6b25a52445
Update CocosConfigDefine.cmake 2021-08-27 01:08:14 +08:00
halx99 30625f2330 Fix win64 check 2021-08-27 00:05:46 +08:00
halx99 547835b3de Add win64 libs 2021-08-26 23:57:36 +08:00
halx99 395a5afdd7 [Draft] Tidy windows prebuilt folder for win64 support 2021-08-26 23:25:17 +08:00
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