Jare Guo
dcf8ca4199
Merge remote-tracking branch 'fireball/v2.1.3' into v2.2.0-release
...
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
2019-09-04 13:44:23 +08:00
yinkaile
a7fb56d989
fixed logic of checking native GL extension ( #1826 )
2019-09-04 11:14:39 +08:00
owen
2c31d09fa5
Fix 213 spine auto file generate error ( #1828 )
2019-09-04 11:11:27 +08:00
Jare Guo
87922985ad
gulp: always clean vs project
2019-08-30 22:26:26 +08:00
Jare Guo
2fe69db75c
Merge v2.1.3 into v2.2.0-release
2019-08-30 20:05:02 +08:00
CocosRobot
a0aea3e81b
[ci skip][AUTO]: updating jsbinding automatically ( #1822 )
2019-08-30 19:43:04 +08:00
Arnold
1914ef6d17
update binding generator ( #1819 )
2019-08-30 18:42:51 +08:00
minggo
89fc67594a
update template file ( #1821 )
2019-08-30 18:37:41 +08:00
minggo
fe51980417
update template file ( #1820 )
2019-08-30 18:26:10 +08:00
Arnold
e29a43baff
fix travis ( #1818 )
2019-08-30 18:07:24 +08:00
minggo
95315c1a73
V2.1.3 update v8 android ( #1817 )
...
* use ndk's stl
* update external version: update v8
2019-08-30 17:37:58 +08:00
minggo
39f4b68302
V8 fix ( #1816 )
...
* use ndk's stl
* update external version: update v8
2019-08-30 17:24:54 +08:00
CocosRobot
5ea8953d66
[ci skip][AUTO]: updating jsbinding automatically ( #1815 )
2019-08-30 11:24:27 +08:00
minggo
f21dbcba3c
Video player android ( #1811 )
...
* fix some video issues on Android
* revert some error commit
2019-08-29 11:34:48 +08:00
Arnold
079a0587d6
fix travis ( #1810 )
...
* add liclang libraries & update script
* update submodule bindings-generator
2019-08-29 10:52:37 +08:00
Cocos Robot
6f4399d859
Sync branch v2.1.3 to v2.2.0-release
2019-08-28 15:58:35 +08:00
yinkaile
88d02075a7
fixed build android release ( #1802 )
2019-08-23 15:14:30 +08:00
minggo
e6f5c146dc
fix video player issue that missing controlling items in fullscreen mode on iOS ( #1800 )
2019-08-23 11:24:02 +08:00
minggo
e3dd5e8458
fix instant template compiling error on android ( #1799 )
2019-08-23 09:43:40 +08:00
Cocos Robot
9e3e1ce231
Sync branch v2.1.3 to v2.2.0
2019-08-21 15:27:04 +08:00
PP
2ff511ac8c
fix composed character on EditBox ( #1798 )
2019-08-21 11:41:53 +08:00
Jare Guo
f3762dda2c
Merge commit '3ec0e1986f5580bbe83f2d1a1dd8a022475b8ac0' into v2.2.0-release
...
* commit '3ec0e1986f5580bbe83f2d1a1dd8a022475b8ac0':
Refine native particle logic (#1796 )
2019-08-19 14:54:09 +08:00
owen
7ca500bba1
Fix model batcher crash issue ( #1797 )
2019-08-19 14:49:09 +08:00
owen
3ec0e1986f
Refine native particle logic ( #1796 )
2019-08-19 14:43:41 +08:00
minggo
eb67111bbb
fix potential overflow ( #1795 )
2019-08-13 17:59:45 +08:00
minggo
ced9217248
update template json file ( #1793 )
2019-08-08 17:41:52 +08:00
owen
fa08bab7ae
Fix native tiled layer user node not render bug ( #1792 )
2019-08-08 16:25:47 +08:00
owen
41c215da54
Fix frame buffer crash bug ( #1791 )
...
* Fix frame buffer crash bug
* Fix potential color buffer crash
2019-08-08 10:17:49 +08:00
Jare Guo
7f993557c2
Merge develp into v2.2.0
...
* commit '99bec00fd5a12f9779ee17237bea2435a285b187':
prevent downloader callbacks when app exits (#1751 )
fix memory leak in loading font on iOS/mac (#1752 )
Copy-paste mistake fix in handling GL_COMMAND_UNIFORM_4FV (#1760 )
add okio-1.15.0.jar (#1750 )
fix bad suggestion (#1747 )
Replace Android HttpClient with OkHttp (#1731 )
WebView add background transparent (#1727 )
ios build fail bug fix + https://github.com/cocos-creator/cocos2d-x-lite/issues/1735
2019-08-06 21:09:47 +08:00
owen
6b4e452608
fix windows spine compile error ( #1790 )
2019-08-05 09:38:27 +08:00
Cocos Robot
99bec00fd5
Sync branch v2.2.0 to develop
2019-08-02 18:17:55 +08:00
minggo
1e37ff1ec4
synchronize v2.1.3 to 2.2
2019-08-02 18:07:50 +08:00
cary
7576a53822
Fixed memory leak caused by HtmlCanvasElement not being released. ( #1786 )
...
* Fixed memory leak caused by HtmlCanvasElement not being released.
* modify unroot
* add comment
2019-08-02 10:21:48 +08:00
unace
ca5c7fd25b
[Android] fix an audio bug ( #1788 )
...
* fix external player muting. add audio focus flag
Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640 .
* [Android] fix an audio bug
fix an audio bug that audios are not paused when locking screen while notification drawer is showing.
2019-08-02 09:25:11 +08:00
cary
9218ca722b
Fix the error of camera pos in program. ( #1787 )
...
* Fix a few details.
* fix camera pos error
2019-08-01 01:09:22 +08:00
unace
919d036a95
fix external player muting. add audio focus flag ( #1785 )
...
Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640 .
2019-07-31 15:06:11 +08:00
cary
e2be1c5f51
Fix memory leak of Label on win32 platform. ( #1783 )
...
* Fix memory leak of Label on win32 platform.
* add free dataBuf.
* format
2019-07-31 15:05:47 +08:00
PP
575c15bbed
set default text color for editText ( #1778 )
2019-07-31 15:05:37 +08:00
2youyouo2
acda7cbfc6
change cc_mat3WorldIT to cc_matWorldIT
2019-07-30 15:38:46 +08:00
knox
48250287ee
refine code
2019-07-29 09:20:11 +08:00
knox
7f68a97cda
improve getCurrentLanguage to android
2019-07-26 16:45:31 +08:00
2youyouo2
1bfcda6c19
update jsbinding
2019-07-26 16:40:46 +08:00
2youyouo2
4f0c6c344d
refine code
2019-07-26 16:04:37 +08:00
Jare Guo
602804cd61
Merge pull request #1782 from minggo/v2.1.3
...
升级 v8
2019-07-26 13:39:16 +08:00
minggo
ebc27bb630
Merge branch 'v2.1.3' of github.com:minggo/cocos2d-x-lite into v2.1.3
2019-07-26 12:00:05 +08:00
minggo
7fbe83c3ee
use jsc on iOS
2019-07-26 11:49:43 +08:00
minggo
b76f9b27a2
correct coping files for default template
2019-07-26 11:44:36 +08:00
minggo
57fd102dd5
fix compling error on android x86
2019-07-26 11:34:57 +08:00
2youyouo2
08a678cc1f
refine model, avoid joint string
2019-07-26 10:55:04 +08:00
2youyouo2
178ab5efc1
Merge remote-tracking branch 'origin/v2.2.0' into v2.3.0
2019-07-26 10:54:20 +08:00