Commit Graph

4804 Commits

Author SHA1 Message Date
minggo 52f3d75321 fix some compiling error on macos (#1990) 2019-12-13 18:18:03 +08:00
coulsonwang c5f15ca63a fix uniform memory issue (#1983) 2019-12-13 10:10:04 +08:00
coulsonwang 3ead460677 fix memory leak (#1984) 2019-12-12 11:51:48 +08:00
minggo f50f08ed29 Refactor codes (#1982)
* refactor codes

* modify gles3 too
2019-12-11 16:01:34 +08:00
CocosRobot 5b02eb6b9e [ci skip][AUTO]: updating jsbinding automatically (#1981) 2019-12-11 10:15:48 +08:00
minggo bcc71049bf fix error that depth/stencil buffer is not cleared (#1980) 2019-12-10 18:02:22 +08:00
minggo dedc3b9c90 fix compling error on android (#1978) 2019-12-10 14:10:06 +08:00
coulsonwang 4a6419745c fix getting uniform location (#1974) 2019-12-06 18:08:57 +08:00
coulsonwang 8253e55f7e make GFXGLES3 works on iOS (#1972) 2019-12-06 15:20:46 +08:00
coulsonwang 87e8886d48 fix some gl related error (#1970)
1. set front face to default CCW
2. use program correctly
3. wrongly disable attribute location
2019-12-06 14:09:21 +08:00
minggo 406490232a make it work on iOS (#1968) 2019-12-06 10:26:37 +08:00
minggo bcbd8afdc6 fix compiling error (#1964) 2019-12-04 14:33:07 +08:00
coulsonwang 4eae48fe4e fix basic triangle test (#1962) 2019-12-03 13:56:25 +08:00
coulsonwang 4247f41b17 Use cmake (#1955)
* rebase and fix compile error

* fix link issue

* fix compile issue

* fix

* update review
2019-11-27 18:11:21 +08:00
CocosRobot 9a1c937a8c [AUTO][ci skip]: updating cocos2dx_files.json (#1950) 2019-11-27 14:53:43 +08:00
minggo 5dee5e5b35 add cmake support back (#1949) 2019-11-26 14:03:47 +08:00
CocosRobot 8674a00e54 [AUTO][ci skip]: updating cocos2dx_files.json (#1943)
* [ci skip][AUTO]: updating jsbinding automatically

* [AUTO][ci skip]: updating cocos2dx_files.json
2019-11-22 17:51:59 +08:00
pandamicro 2cf3d7d0f4 Fix jsc link issue 2019-11-21 13:49:55 +08:00
pandamicro d9ba1437fe Fix compilation issues 2019-11-01 18:29:27 +08:00
pandamicro bd37c54503 Change assertion.h to Assertion.h 2019-11-01 16:14:45 +08:00
pandamicro 560eb3cfb9 Before change assertion to Assertion 2019-11-01 16:13:48 +08:00
pandamicro a2701d1f3c Update to latest 2019-11-01 16:12:42 +08:00
pandamicro 6079321cad Fix reference 2019-10-30 10:37:00 +08:00
pandamicro 4d75340e30 Import 3d gfx and generate auto bindings 2019-10-29 14:10:11 +08:00
pandamicro bac263246f Readd assertion 2019-10-17 15:05:51 +08:00
pandamicro 26ea558266 Remove assertion 2019-10-17 15:05:30 +08:00
pandamicro 7aa8691ca3 Cleanup and add 3d renderer sources 2019-10-17 14:50:54 +08:00
PP e869bc1b63 fix editBox background color in iOS13 (#1886) 2019-10-16 17:43:08 +08:00
吴智明 6c0afc4527 change gen-simulator compile to vs2017 (#1884) 2019-10-15 17:43:01 +08:00
owen 17cbe88f39 Fix custom ia mask invalid (#1882) 2019-10-15 16:12:30 +08:00
吴智明 74f9db7ec0 update sub module cocos2d-console to latest version (#1883) 2019-10-15 16:12:14 +08:00
owen e2b563c694 fix zIndex incorrect (#1881) 2019-10-15 10:58:41 +08:00
owen 7715fd9c4b Fix middleware update crash (#1879) 2019-10-14 18:27:29 +08:00
minggo 522a62a395 fix crash if invoked from non c++ context (#1878)
* fix crash if invoked from non c++ context
For example, this function is invoked in handle block of UIAlert will cause crash.

* fix typo
2019-10-14 18:22:29 +08:00
cary 26dcb6340e Fix an error when SkinnedMeshRenderer is updated with Uniform. (#1876)
* Fix an error when SkinnedMeshRenderer is updated with Uniform.

* fix ci and modify custom properties

* change to all typed array
2019-10-12 19:53:32 +08:00
PP 0ab1197c27 refine pause playing audio when enter background (#1875)
* Revert "Pause music when app enter background (#1849)"

This reverts commit 7a24ee3377.

* refine pause playing audio when enter background
2019-10-12 17:02:50 +08:00
cary 70a2134fb4 Fix the display error of the 3D node in the native platform. (#1868)
* Fix the display error of the 3D node in the native platform.

* Modify the matrix calculation of 3D nodes.
2019-10-12 11:29:48 +08:00
minggo 1013439607 gl context creation error on iPad3 (#1874)
* gl context creation error on iPad3

* fix crash
2019-10-12 11:28:59 +08:00
吴智明 7d72c89f09 upgrade vs studio default version to vs2017(v141) (#1873) 2019-10-12 11:09:05 +08:00
owen 302de72b01 fix Spine or DragonBones alpha value incorrect (#1871) 2019-10-10 19:43:35 +08:00
yinkaile a947aeb698 V2.2.0 release android opengl version (#1870)
* fixed check opengl version onandroid

* refine code
2019-10-10 19:41:54 +08:00
PP ab086f619e correct max audio instance on Android (#1869) 2019-10-10 19:41:25 +08:00
owen 7c01a65b7e fix android instant platform throw error (#1867) 2019-10-09 20:46:13 +08:00
PP a7d01f9279 init default color for editBox (#1866) 2019-10-09 13:44:02 +08:00
minggo 55450f2fd8 fix crash when restart application (#1865) 2019-10-09 11:43:35 +08:00
minggo b315474f53 fix error that can not stop video if it is played by clicking playback controls (#1864) 2019-10-08 11:33:56 +08:00
owen 5a2814f791 Fix Spine or DragonBones color offset bug (#1863) 2019-09-30 20:16:20 +08:00
CocosRobot 181ee5b972 [ci skip][AUTO]: updating jsbinding automatically (#1862) 2019-09-30 10:07:59 +08:00
cary 887eec1f4d Modify the 3D sprite to use AssemblerSprite. (#1861) 2019-09-30 09:56:45 +08:00
CocosRobot 5e44806392 [ci skip][AUTO]: updating jsbinding automatically (#1860) 2019-09-29 23:51:50 +08:00