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

37311 Commits

Author SHA1 Message Date
halx99 78ed4e230b TextureFormatEXT 2019-11-22 03:36:01 +08:00
halx99 22d5008d28 PremultipliedAlpha 2019-11-22 01:39:03 +08:00
halx99 8b62addcec Rename parameters. 2019-11-20 19:22:22 +08:00
halx99 5d5e6fcfec Remove comment. 2019-11-20 18:44:45 +08:00
halx99 0caf671edd Fix merge error. 2019-11-20 18:35:48 +08:00
halx99 e647820c9c Merge from official-v4. 2019-11-20 18:27:56 +08:00
halx99 e7906acfa4 v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
HALX99 c0332b7a7f
Merge pull request #10 from cocos2d/v4 
V4
 2019-11-19 09:45:15 -06:00
minggo 977510f41d
fix issue that videoplayer may crash on iOS (#20345) 2019-11-18 16:53:36 +08:00
coulsonwang b2940949dd implement setProgramState for SpriteBatchNode (#20344) 2019-11-18 15:04:47 +08:00
minggo 83b521991f
fix issue that can not close keyboard if using EditBox on iOS (#20336) (#20340) 2019-11-15 13:45:39 +08:00
Arnold 587bcabf44 fix asan reported errors (#20332) 2019-11-15 13:39:23 +08:00
CocosRobot 49bca674cc [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20338) 2019-11-15 13:38:43 +08:00
minggo 9049ddbe7c
manually maintain reference count (#20329) 2019-11-15 11:39:49 +08:00
Arnold e3c636c23c Sync resource automatically on Windows and Linux (#20319) 2019-11-15 10:24:38 +08:00
HALX99 72d605dc15
Merge pull request #9 from cocos2d/v4 
Sync V4
 2019-11-14 04:19:30 -06:00
coulsonwang dde4780e14 decrease the font size or it will be conflict (#20333) 2019-11-14 18:11:15 +08:00
coulsonwang a6f73e2f5a adjust testItem relative position (#20331) 2019-11-14 15:13:20 +08:00
minggo bb5cf546f5
fix videoplayer crash in release mode (#20327) 2019-11-14 14:49:47 +08:00
minggo 3a36e2d5c2
Fixing a crash in iOS 9.3.5 when we have a layer with WebView getting deallocated (#20285) (#20328) 
* In case of iOS 9.3.5 when we show a web view and deallocate the layer it is trying to release memory associated with WKWebView instance, but it hadn’t retained it in the first place. This results in a crash. This commit fixes that crash.

* Removing the autorelease and retain parts from the WKWebView instantiation.

* Changes so that we can remove the retain from the property declaration and depend only on manual retain and release of memory <Deep>
 2019-11-14 14:49:11 +08:00
coulsonwang 56888524b7 set default minimum deployment target (#20323) 2019-11-14 09:43:37 +08:00
coulsonwang d03411d6eb update submodule (#20324) 2019-11-14 09:43:14 +08:00
coulsonwang facf78a22b add opengl header since Texture2D and Image will use opengl define (#20322) 
* add opengl header since Texture2D and Image will use opengl define

* update review
 2019-11-13 17:46:40 +08:00
Arnold 6a53b31d08 [bugfix] add pagezero_size link flags (#20321) 2019-11-13 11:07:52 +08:00
minggo e03192b48c
update 3rd bin (#20316) 2019-11-12 11:29:53 +08:00
CHP ac305862f4 Support multiple build configurations (#20314) 
* MINSIZEREL_RELWITHDEBINFO_Support

* Remove DEBUG_MODE
 2019-11-11 10:09:50 +08:00
CocosRobot 4d16f313db [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20311) 2019-11-08 16:47:35 +08:00
Arnold 48239ee160 update external (#20310) 2019-11-08 16:29:04 +08:00
minggo 3aa7a73df2
Sync 20303 (#20308) 
* fix infinite loop

* fix issue that touch event does not match
If click area ouside keyboard, then engine only receive touch begin event witouth touch end or touch cancled event.
 2019-11-08 11:03:12 +08:00
minggo 98ab6d23b6
set iOS default deployment version in correct place (#20307) 2019-11-08 10:30:51 +08:00
coulsonwang 292e4c3b4d fix effect test (#20286) 2019-11-06 16:25:30 +08:00
minggo afbf817ec0
fix testfiled issue on iOS13 (#20296) 2019-11-06 16:11:37 +08:00
minggo 0cbaec9f29
don't set glview transparent, it many cause afterimage (#20298) (#20299) 2019-11-06 16:10:16 +08:00
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