Commit Graph

3690 Commits

Author SHA1 Message Date
pandamicro d30b5cb430 Merge pull request #2428 from fusijie/fixed_rename_handler
rename private handler.
2018-03-13 23:15:30 +08:00
pandamicro 49fd994035 Move CCTexture2D & CCSpriteFrame to assets 2018-03-13 17:48:38 +08:00
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 8f21947979 Fix conflict 2018-03-13 15:27:44 +08:00
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
Jare Guo e551128150 Merge pull request #2431 from pandamicro/master
Merge v1.9 to master
2018-03-13 12:57:18 +08:00
pandamicro 4e47017aa4 Merge branch 'v1.9' 2018-03-13 11:54:54 +08:00
VisualSJ 37ecfc334c The loading process should determine whether or not ‘cc.engine’ exists. 2018-03-13 11:44:50 +08:00
pandamicro d16559200f Remove old deprecations 2018-03-13 10:30:15 +08:00
fusijie 79e6d4a033 rename private handler. 2018-03-12 18:14:22 +08:00
pandamicro ba05646469 Refactor cc.isChildClassOf to cc.js.isChildClassOf 2018-03-12 17:50:26 +08:00
pandamicro 813f960d79 Merge pull request #2426 from pandamicro/next
Update render engine 1.0.1 (Sort camera based on depth)
2018-03-12 17:16:02 +08:00
pandamicro 6e7719e46e Update render engine 1.0.1 2018-03-12 17:09:11 +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
yinkaile 8705d6f4d5 fixed node cullingMask initialize 2018-03-12 15:59:49 +08:00
pandamicro c34e402390 Merge pull request #2422 from fusijie/fixed_rich_text
fixed richText
2018-03-12 15:41:47 +08:00
pandamicro 400d181e89 Fix getLocalZOrder usage in EventManager 2018-03-12 15:37:27 +08:00
pandamicro 8aa424b7d7 Readd getRotation / setRotation, provide more deprecation error 2018-03-12 15:36:57 +08:00
fusijie 7fb6b8af0c fixed richText 2018-03-12 15:31:51 +08:00
pandamicro d1ea69fc16 Add binary loader 2018-03-12 14:32:20 +08:00
pandamicro 0d68bec9ca Improve text downloader 2018-03-12 14:32:20 +08:00
yinkaile 1d8ec5affa refine code 2018-03-12 14:27:36 +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
Wasin Thonkaew 844f171f7a Fix typos 2018-03-10 07:19:12 +07:00
pandamicro b33aebe10b Add Node.setWorldPos 2018-03-09 18:28:12 +08:00
pandamicro 6d6e1206be Cleanup Node APIs 2018-03-09 18:27:56 +08:00
yinkaile efb8e24f23 revert code 2018-03-09 18:19:38 +08:00
yinkaile f441dba722 remove attachDebugDrawToCamera & detachDebugDrawFromCamera 2018-03-09 16:36:11 +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 144bd9ec6b fix internal deserialize issue on wechat game 2018-03-09 09:37:16 +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
Jare Guo 5637cccca7 Merge pull request #2405 from umbrellaPP/master
widget组件,align属性增加ONCE_WINDOW_RESIZED选项
2018-03-08 17:29:58 +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 8b3c089a42 Add back high bits zIndex in localZOrder design and add warning 2018-03-08 14:27:52 +08:00
pandamicro 5a78cf0052 Revert zIndex to simple value 2018-03-08 12:06:27 +08:00
pandamicro b778dde9c9 Fix wechat game HTMLVideoElement issue and deserialize issue 2018-03-08 11:42:36 +08:00
pandamicro 5f09233526 Improve engine modules
s
2018-03-07 18:50:51 +08:00
Jare Guo b65545d8f4 minor tweak 2018-03-07 15:28:19 +08:00
Jare Guo eb7f7ad66e Merge pull request #2408 from cocos-creator/v1.8-release
sync branch
2018-03-07 12:48:23 +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