Commit Graph

317 Commits

Author SHA1 Message Date
pandamicro 49fd994035 Move CCTexture2D & CCSpriteFrame to assets 2018-03-13 17:48:38 +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 6d6e1206be Cleanup Node APIs 2018-03-09 18:27:56 +08:00
PP 1f448e821f change all JS into js 2018-03-06 11:44:11 +08:00
Jare Guo 5ebcef848c improve test of changing hierarchy during onDisable 2018-03-03 01:46:10 +08:00
Cocos Ass 86cfa26baf forbid Hierarchy change test example
add a  new test in test-component-scheduler.js
forbid Hierarchy change part and example

update data make my local file get reset
forbid Hierarchy change part test example

update a  new test content about setSiblingIndex
change the report of error test
2018-03-02 11:29:39 +08:00
pandamicro afc58eb2a0 Fix global variable leak 2018-02-28 18:21:14 +08:00
Jare Guo 6c809263e6 Merge 1.8 2018-02-24 14:58:57 +08:00
pandamicro ba6e8f11a3 Remove cc._renderType, cc._canvas, cc.container 2018-02-24 11:31:51 +08:00
pandamicro 4aa1cf5b53 Use TextUtils, CustomFontLoader, HtmlTextParser as module 2018-02-12 15:20:24 +08:00
Jare Guo 992b74f0ac merge bricks (#2328)
* support bk game

* update code

* update code

* update code

* update code

* refine code

* update code

* update code

* update code
2018-02-09 10:12:44 +08:00
pandamicro e1d173da1c Review Director APIs 2018-02-09 10:07:01 +08:00
pandamicro ab72058841 Fix Node rotation issue 2018-02-08 15:19:38 +08:00
pandamicro b4c59387ed Use 3d camera instead of old camera 2018-02-07 18:11:21 +08:00
pandamicro cc06d40ab6 Use vec3 rot instead of rotationX & Y, apply 3d transform 2018-02-07 15:27:03 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
Jare Guo ded7092432 Merge branch 'v1.8'
# Conflicts:
#	cocos2d/core/platform/deserialize.js
#	extensions/dragonbones/CCFactory.js
#	gulp/util/utils.js
2018-01-25 13:47:35 +08:00
knoxHuang 4e6d645f97 fix cc.path.dirname bug 2018-01-18 17:21:13 +08:00
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +08:00
knoxHuang 9a092f8882 add path api and refine code format 2018-01-12 16:26:21 +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 2e2fd59193 add CC_SUPPORT_JIT macro 2018-01-03 22:58:37 +08:00
Jare Guo 7834448133 Merge branch 'v1.7'
# Conflicts:
#	cocos2d/core/load-pipeline/loader.js
2017-12-13 14:44:33 +08:00
pandamicro 79804497ec Move _walk into walk function (reduce call stack) 2017-12-07 11:52:20 +08:00
knoxHuang 96e51fbee2 gradually remove eventManager and inputManager for fireball/issues/6240 2017-11-30 11:19:32 +08:00
pandamicro a6a294f538 Major refactor to use render component walker for batching models 2017-11-29 13:55:36 +08:00
pandamicro 3fe7948213 Add node.walk function and unit test 2017-11-27 16:28:08 +08:00
pandamicro 52d25b193b Remove misc.imagePool 2017-11-27 15:38:28 +08:00
pandamicro c8188b5211 Merge remote-tracking branch 'origin/v1.7' into next 2017-11-22 13:58:23 +08:00
Jare Guo 000f4c1fc9 prefab should not resync if is instantiated by its parent (which is not a prefab) 2017-11-16 21:56:27 +08:00
Jare Guo b96b228b0d Merge pull request #2092 from jareguo/v1.7-release
prefab should be synced if jit can not be used
2017-11-03 19:49:58 +08:00
Jare Guo bd585d4a5c prefab should be synced if jit can not be used 2017-11-03 01:20:51 +08:00
Jare Guo c0c80948c9 typo 2017-10-25 21:15:02 +08:00
Jare Guo f2ddfee768 fix potential memory leak when node detached from parent without cleanup 2017-10-25 21:04:00 +08:00
pandamicro 165f011061 Fix basic type issues (temporary) 2017-10-14 08:51:54 +02:00
pandamicro c230061dcc Refactor trs properties in Node with vmath 2017-10-12 16:23:04 +08:00
pandamicro 48faf3ca49 Removed SGComponent, ComponentInSG, ComponentUnderSG 2017-10-06 17:54:34 +08:00
Jare Guo 785d43baf1 add misc.pushToMap 2017-08-31 18:33:48 +08:00
Jare Guo 78b7a0d149 optimize deserialize 2017-08-24 13:00:53 +08:00
Jare Guo 3cef7fdfab add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
2017-08-22 13:53:52 +08:00
Jare Guo d313f2828f should load position of node when synced with prefab 2017-08-18 18:36:05 +08:00
Jare Guo 03b02f861b fix typo 2017-08-09 11:45:36 +08:00
pandamicro a18a34203d Add render mode information to profiler 2017-07-14 16:30:12 +08:00
pandamicro 95107a329f Do not use image pool on linux firefox 2017-07-10 11:25:05 +08:00
pandamicro 1f8dc59fa8 Fix mistake 2017-07-07 16:31:13 +08:00
pandamicro 9986863ec9 Disable Image pool on most windows browsers 2017-07-07 11:55:19 +08:00