Commit Graph

5339 Commits

Author SHA1 Message Date
Jare Guo ff97584159 Merge pull request #2249 from VisualSJ/master
Add  node locked flag
2018-01-12 17:15:33 +08:00
VisualSJ 2d4a67b64a Add node locked flag 2018-01-12 17:13:13 +08:00
Jare Guo 0b0a4ccb3d Merge pull request #2253 from knoxHuang/master
add path api and refine code format
2018-01-12 16:36:22 +08:00
knoxHuang 9a092f8882 add path api and refine code format 2018-01-12 16:26:21 +08:00
pandamicro 6b807a2707 Merge pull request #2245 from knoxHuang/fix_bug
fix slider bug for fireball/issues/6830
2018-01-11 10:15:38 +08:00
pandamicro 282ae5f756 Merge pull request #2241 from knoxHuang/master
add Volume and Mute to CCVideoPlayer for fireball/issues/6811
2018-01-11 09:50:11 +08:00
knoxHuang 8362245151 fix slider bug for fireball/issues/6830 2018-01-10 17:13:28 +08:00
Jare Guo b31566d75f Merge 1.8 2018-01-09 18:40:43 +08:00
Jare Guo df36e5dc9c Merge branch 'v1.8-release' into v1.8 2018-01-09 18:25:55 +08:00
Jare Guo 57934a1310 Merge pull request #2244 from knoxHuang/v1.8
fix  __ctor__ api for fireball/issues/6806
2018-01-09 10:07:32 +08:00
knoxHuang d05ffd3b53 fix __ctor__ api for fireball/issues/6806 2018-01-09 09:50:33 +08:00
knoxHuang 767b363854 refine videoplayer code 2018-01-08 15:46:20 +08:00
knoxHuang 3a6a7b6020 Merge remote-tracking branch 'origin/master' 2018-01-08 10:52:11 +08:00
Jare Guo 1204fa7db7 Merge pull request #2218 from cyy641278529/master
Delete  the calls for object.retain() and object.release()
2018-01-06 21:38:45 +08:00
knoxHuang a39257030e add Volume and Mute to CCVideoPlayer for fireball/issues/6811 2018-01-05 13:14:20 +08:00
pandamicro aec55a59cf Merge pull request #2233 from jareguo/master
fix bug of asset type on JSB
2018-01-05 09:59:51 +08:00
shay_chen 482cb4b18b Delete unnecessary code 2018-01-04 15:19:01 +08:00
shay_chen b96631a482 Merge remote-tracking branch 'cocos-creator/master' 2018-01-04 15:08:57 +08:00
pandamicro 3a33c9b3d8 Merge pull request #2238 from jareguo/v1.8-release
support build engine with any macro flag
2018-01-04 11:09:07 +08:00
Jare Guo fdba2619ad support build engine with any macro flag 2018-01-04 10:51:27 +08:00
pandamicro b807e336a5 Merge pull request #2236 from jareguo/v1.8-release
fix page hide event on wechat mini game
2018-01-04 10:49:41 +08:00
Jare Guo 63525c29b4 fix page hide event on wechat mini game 2018-01-04 10:06:39 +08:00
Jare Guo f8012aa11b Merge pull request #2235 from jareguo/v1.8-release
fix jssdk support on WebMobile
2018-01-03 23:03:08 +08:00
Jare Guo 2e2fd59193 add CC_SUPPORT_JIT macro 2018-01-03 22:58:37 +08:00
Jare Guo 1143c84522 support compile with CC_WECHATGAME macro 2018-01-03 17:15:03 +08:00
Jare Guo 5a6984633e Merge pull request #2234 from simon129/patch-1
CCWebView.destroy() should have a return value
2018-01-03 15:31:16 +08:00
simon129 8dab61d7d6 CCWebView.destroy() should have a return value
CCWebView.destroy() inherent from CCObject, it's destroy() should return true or false.
Add return value to improve creator.d.ts
2018-01-03 14:53:03 +08:00
Jare Guo d6f4918e38 reviewed 2018-01-03 14:31:47 +08:00
Jare Guo c6935fad3b Merge pull request #2229 from jareguo/master
refactor dragonbones asset managment
2018-01-03 11:24:44 +08:00
Jare Guo 298ab19d19 fix bug of asset type on JSB 2018-01-03 11:07:45 +08:00
Jare Guo 5bb43d20a7 Merge pull request #2231 from jareguo/v1.8
remove unused modules from jsb_polyfill
2018-01-03 11:03:44 +08:00
Jare Guo 6b97d4d6cf remove unused modules from jsb_polyfill 2018-01-03 00:30:30 +08:00
Jare Guo 7a49509dc2 refactor dragonbones asset managment 2017-12-31 02:26:31 +08:00
Jare Guo 957aa2a6e5 Merge pull request #2211 from jareguo/temp
support migration for texture array
2017-12-30 15:16:33 +08:00
Jare Guo 11ea3efa04 Merge pull request #2228 from jareguo/temp2
update uglify-es to fix regex problem (mishoo/UglifyJS2#2242) and inline problem
2017-12-30 15:16:08 +08:00
Jare Guo cc5dcab175 update uglify-es to fix regex problem (mishoo/UglifyJS2#2242) and inline problem 2017-12-30 15:14:55 +08:00
Jare Guo 309a4bd254 Merge pull request #2227 from jareguo/temp2
encapsulate uglify pipe for editor
2017-12-29 18:51:52 +08:00
Jare Guo bad036fbf8 encapsulate uglify pipe for editor 2017-12-29 18:49:54 +08:00
Jare Guo 6120c17c7d Merge pull request #2225 from jareguo/temp2
add issue template
2017-12-28 20:40:59 +08:00
Jare Guo a96ac0d0bb add issue template 2017-12-28 20:39:01 +08:00
Jare Guo 51a60e7525 Merge pull request #2224 from jareguo/temp2
lock uglifyjs to new version
2017-12-28 19:50:31 +08:00
Jare Guo c068b98881 lock uglifyjs to new version 2017-12-28 19:49:39 +08:00
Jare Guo bd22095ea5 Merge pull request #2221 from cocos-creator/v1.7
sync branch
2017-12-28 10:24:50 +08:00
Jare Guo 894d08cd95 Merge pull request #2220 from cocos-creator/v1.7-release
sync branch
2017-12-28 10:24:15 +08:00
Jare Guo c2b98bee10 Merge pull request #2219 from jareguo/v1.7-release
fix incompatibility when upgrading uglify-es from 3.2 to 3.3
2017-12-28 10:23:26 +08:00
Jare Guo 55319542d9 fix incompatibility when upgrading uglify-es from 3.2 to 3.3 2017-12-28 10:21:39 +08:00
shay_chen b5c4f2fae6 Delete the calls for object.retain() and object.release() 2017-12-27 18:34:35 +08:00
pandamicro 7c8aa7e500 Merge pull request #2216 from knoxHuang/master
fix VideoPlayer Can not trigger EVENT_HIDE event and refine code
2017-12-27 14:07:33 +08:00
pandamicro f130b4de43 Merge pull request #2215 from jareguo/master
fix CCDebugger
2017-12-27 12:20:38 +08:00
knoxHuang f17ff242f8 refine code 2017-12-27 10:58:27 +08:00