Commit Graph

1229 Commits

Author SHA1 Message Date
pandamicro ca08067c76 unse engine-dev in editor 2018-03-13 16:48:24 +08:00
pandamicro b531040ac4 Update licenses 2018-03-13 15:52:14 +08:00
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro ba05646469 Refactor cc.isChildClassOf to cc.js.isChildClassOf 2018-03-12 17:50:26 +08:00
pandamicro 7d8887a18a Merge pull request #2416 from 2youyou2/next
optimize camera
2018-03-12 16:28:08 +08:00
pandamicro 666bf01611 Fix Node API usage issue 2018-03-12 16:16:02 +08:00
fusijie 7fb6b8af0c fixed richText 2018-03-12 15:31:51 +08:00
Jare Guo 1fcc13cda4 Merge pull request #2418 from fusijie/add_private_node
add private node
2018-03-12 14:23:43 +08:00
fusijie e08db3ca2c add private node 2018-03-12 12:59:38 +08:00
yinkaile de77c38b2b change 'MAIN_CAMERA' to 'Main Camera' 2018-03-12 10:33:14 +08:00
pandamicro 6d6e1206be Cleanup Node APIs 2018-03-09 18:27:56 +08:00
yinkaile af5930f343 Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
#	cocos2d/core/renderer/render-component-walker.js
2018-03-09 16:14:54 +08:00
yinkaile 22a1e2994a 1. support camera sort
2. support camera culling mask with node group
3. add MAIN_CAMERA to Canvas
2018-03-09 16:12:00 +08:00
Jare Guo fad39faede change ON_WINDOW_RESIZED to ON_WINDOW_RESIZE 2018-03-09 02:04:01 +08:00
Jare Guo 595c223e15 fix widget warning 2018-03-09 01:21:33 +08:00
Jare Guo 1a6053788d refine api doc 2018-03-08 18:40:37 +08:00
PP 9c269c972d delete _isUserDisable 2018-03-08 17:08:44 +08:00
PP f750a575f1 deal with the compatibility of alignMode 2018-03-08 15:46:44 +08:00
PP 32175eecc4 add align ONCE_WINDOW_RESIZED to widget
some changes in widget alignMode


defined AlignMode in CCWidgetManager.js


inspector 

edit
2018-03-08 15:46:25 +08:00
pandamicro 5f09233526 Improve engine modules
s
2018-03-07 18:50:51 +08:00
pandamicro b3912ddc52 Merge pull request #2398 from umbrellaPP/prNext
修改JS 为js
2018-03-07 11:38:43 +08:00
pandamicro 283f5c17d6 Improve render data management by RenderComponent 2018-03-07 10:49:58 +08:00
PP 67afe336d2 partly change JS into js 2018-03-06 11:47:09 +08:00
PP 1f448e821f change all JS into js 2018-03-06 11:44:11 +08:00
PP d9a7e80246 literalMap to flatMap 2018-03-02 09:48:10 +08:00
pandamicro 6b839d7363 Deprecate view.setViewPortInPoints & remove Director animation interval 2018-02-28 11:07:16 +08:00
pandamicro 6027eb5d6d Merge pull request #2366 from pandamicro/next
Fix small issues
2018-02-26 18:03:30 +08:00
pandamicro 0ae7c15cbd Fix Label default string issue 2018-02-26 17:29:41 +08:00
pandamicro c143577273 Merge pull request #2363 from fusijie/fixed_spriteFrame_texture_loaded
fixed error spriteFrame textureLoaded called
2018-02-26 16:47:07 +08:00
fusijie 36c77a3115 fixed scrollView bug. 2018-02-26 16:20:17 +08:00
fusijie 23fc401c80 fixed error spriteFrame textureLoaded called 2018-02-26 15:19:08 +08:00
pandamicro ba6e8f11a3 Remove cc._renderType, cc._canvas, cc.container 2018-02-24 11:31:51 +08:00
pandamicro dbb19e2362 Support WebView in new renderer 2018-02-22 23:23:42 +08:00
pandamicro e08be52e38 Support VideoPlayer 2018-02-22 17:03:25 +08:00
pandamicro 2baaddfb74 Remove SpriteDistortion component 2018-02-20 00:16:17 +08:00
pandamicro 4aa1cf5b53 Use TextUtils, CustomFontLoader, HtmlTextParser as module 2018-02-12 15:20:24 +08:00
pandamicro 1de3bd1d52 Improve Label assembler when string is empty 2018-02-10 12:49:55 +08:00
pandamicro 9d4c329bf2 Merge pull request #2330 from fusijie/fixed_mask_refree_renderdata
fixed mask refree renderdata.
2018-02-10 12:20:31 +08:00
fusijie 02985315ed fixed mask refree renderdata. 2018-02-09 15:48:15 +08:00
yinkaile 53eaf91931 Merge branch 'next' of github.com:fireball-x/engine into next 2018-02-09 09:37:16 +08:00
fusijie ee8963000f Support CCRichText. 2018-02-08 18:37:02 +08:00
yinkaile f1e2481a4b Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
#	cocos2d/core/renderer/index.js
2018-02-08 10:47:29 +08:00
yinkaile f5cc698007 fixed layout 2018-02-07 10:55:27 +08:00
pandamicro 365bc22388 Merge pull request #2306 from 2youyou2/next
fixed bugs
2018-02-02 17:13:28 +08:00
yinkaile 5080b4445c temp fixed editbox 2018-02-02 16:38:31 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
pandamicro dfb6b73e85 Fix stencil manager modify user effect issue 2018-01-31 18:45:44 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
yinkaile 554e1de326 fixed CCCanvas size issue 2018-01-29 11:46:26 +08:00
pandamicro 60f9b949f3 Merge pull request #2269 from 2youyou2/next
fixed editbox
2018-01-17 18:32:29 +08:00