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

37428 Commits

Author SHA1 Message Date
CocosRobot 09428955c6 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20295) 2019-11-06 14:42:17 +08:00
minggo 01ff6ddd66
delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
minggo 5acc952a17
fix iOS build issue (#20292) 2019-11-05 15:23:54 +08:00
minggo f52df598e6
update cocos console (#20293) 2019-11-05 15:23:09 +08:00
minggo 29e03729de
fix issue that can not run release mode with lua projects (#20291) 
It is because luajit has 32bit version, and ubuntu does not support 32bit application by default.
 2019-11-05 10:19:27 +08:00
coulsonwang 8126cfafd5 add defualt ios deloyment target (#20282) 
* add defualt ios deloyment target
 2019-11-01 17:07:52 +08:00
minggo b852fc3355
Revert "don't compile codes for binding generator if it is a pull request (#20237)" (#20283) 
This reverts commit c2c6aa4268.
 2019-11-01 12:02:48 +08:00
minggo 29e50a8631
remove extern "C" from base/base64.h for avoiding base64 function symbols conflict at linking libraries. (#20276) (#20280) 2019-11-01 09:22:38 +08:00
coulsonwang 4914dfff10 fix AudioSwitchStateTest subtile (#20278) 2019-10-31 16:05:57 +08:00
minggo dddcdf3a87
Fixes so that in the web view we are able to navigate different links correctly <Deep> (#20266) (#20275) 2019-10-31 10:58:35 +08:00
coulsonwang 251eaa2033 fix crash due to iOS13 UIWindowScene (#20271) 2019-10-30 17:43:07 +08:00
coulsonwang d41457d447 comment spine codes in lua (#20272) 2019-10-30 16:25:08 +08:00
minggo ffb3955831
Merge pull request #20269 from Mee-gu/fixiOSCrash 
fix crash due to iOS13 UIWindowScene
 2019-10-30 15:07:07 +08:00
coulsonwang d35a1dee45 fix crash due to iOS13 UIWindowScene 2019-10-30 13:55:52 +08:00
minggo 8f571374a5
Merge pull request #20265 from Mee-gu/fix3DBoundary 
fix walking boundary of 3D test in lua
 2019-10-30 09:50:32 +08:00
coulsonwang 4f486528cc fix walking boundary of 3D test in lua 2019-10-29 19:24:35 +08:00
minggo 487634b5b7
Merge pull request #20264 from Mee-gu/fixLua 
fix experimental namespace
 2019-10-29 14:30:10 +08:00
coulsonwang d77cd8f3b1 fix experimental namespace 2019-10-29 14:19:16 +08:00
minggo 30407bc68a
Merge pull request #20263 from minggo/android-installation-issue 
fix installation error on some Android devices
 2019-10-29 13:35:00 +08:00
minggo 2f79eb10af fix installation error on some Android devices 
May meet "The application could not be installed: INSTALL_FAILED_TEST_ONLY" error on some devices.
 2019-10-29 11:35:22 +08:00
minggo c17c0cd357
Merge pull request #20259 from Mee-gu/fixCrash 
fix crash
 2019-10-29 10:47:39 +08:00
minggo 3b7a85c27d
needs update texture info (#20260) 
* needs update texture info

* rename to make function name more clear
 2019-10-29 10:46:45 +08:00
minggo 4af28a2f68
revert cpp-empty-test (#20262) 2019-10-29 10:46:24 +08:00
coulsonwang 35b246939a update review 2019-10-28 18:11:17 +08:00
coulsonwang a0d7751510 rename to make function name more clear 2019-10-28 16:47:27 +08:00
coulsonwang eb23e1ffde needs update texture info 2019-10-28 16:05:05 +08:00
minggo 84feb1f87c
update default ABI 2019-10-28 15:43:42 +08:00
coulsonwang d9f8296498 update reivew 2019-10-28 15:05:17 +08:00
coulsonwang 2d42aa1d21 fix memory leak (#20258) 2019-10-28 15:04:03 +08:00
coulsonwang c85cfcb223 fix crash 2019-10-28 14:26:09 +08:00
minggo 7f796936ee
Revert "fix RotateTo animation when angle is bigger than 360 (#20009) (#20211)" (#20257) 
This reverts commit 8a64e6f983.
 2019-10-28 09:53:07 +08:00
coulsonwang 2501f53b9b add CameraTest (#20253) 
* nodeTest

* fix
 2019-10-25 18:22:35 +08:00
CocosRobot 8878303e22 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20252) 2019-10-25 17:20:01 +08:00
coulsonwang a09806f580 Fix todo (#20248) 2019-10-25 16:41:03 +08:00
minggo c9af873e2e
fix some warnings (#20247) 2019-10-25 16:40:30 +08:00
coulsonwang 6dbbb4cc0a remove the comment of enableRetina for mac (#20249) 2019-10-25 15:39:59 +08:00
coulsonwang b849fce842 remove box2d tests (#20246) 2019-10-25 13:37:08 +08:00
minggo be038d9ffc
fix some warnings (#20236) 2019-10-25 09:27:54 +08:00
coulsonwang 4c3d7b49a3 remove deprecated setBlendFunc (#20244) 2019-10-25 09:27:32 +08:00
coulsonwang d7f2ae3a9f fix TODO (#20245) 2019-10-25 09:26:57 +08:00
CocosRobot 4b1cecdb12 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20241) 2019-10-24 18:09:40 +08:00
coulsonwang a2eeb25b75 update bullet (#20239) 2019-10-24 17:52:38 +08:00
minggo c2c6aa4268
don't compile codes for binding generator if it is a pull request (#20237) 2019-10-24 17:25:35 +08:00
coulsonwang b5f1b0ecd9 support iphone simulator (#20235) 2019-10-24 17:24:13 +08:00
minggo 8bf83dcf3a
Sync 20209 (#20233) 
* fix issue: TextField can not receive characters(non number or english… (#20209)
 2019-10-24 17:19:18 +08:00
minggo 1898d477ce
[ci skip]Release note (#20234) 
* update changelog

* update release note

* update version
 2019-10-24 14:34:48 +08:00
CocosRobot 8a191d5f6f [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20230) 2019-10-23 15:06:43 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
coulsonwang ee4432661c fix label text word wrong warp issue (#20226) 2019-10-23 14:13:38 +08:00
CocosRobot f210576c3a [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20227) 2019-10-22 14:08:55 +08:00