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
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
pandamicro
7712da14f5
Merge remote-tracking branch 'fireball/master' into next
2018-01-15 17:51:33 +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
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
03b02f861b
fix typo
2017-08-09 11:45:36 +08:00
Jare Guo
a1951fc759
Merge commit '57587b9175c4b020c7818515401c6436796619e3' in 1.5 into master
...
# Conflicts:
# gulp/tasks/test.js
# gulp/util/utils.js
2017-06-20 10:50:25 +08:00
Jare Guo
247199d1d4
improve api doc
2017-06-16 16:46:46 +08:00
Jare Guo
685defed7a
add Node.insertChild
2017-06-14 14:49:19 +08:00
Jare Guo
eddf3c076f
fix creator.d.ts - support abstract component
2017-06-03 00:18:03 +08:00
Jare Guo
e615432115
fix creator.d.ts
2017-06-03 00:08:52 +08:00
Jare Guo
20155c6541
fix api about event type
2017-05-19 11:22:50 +08:00
Jare Guo
4393080acf
refine creator.d.ts
2017-05-17 10:55:03 +08:00
Jare Guo
b89c614d19
stash
2017-05-10 16:54:14 +08:00
Jare Guo
0073db5bd7
add Node debug info
2017-04-28 17:59:34 +08:00
Jare Guo
f054f504b6
fix typescript api
2017-04-26 17:17:59 +08:00
Jare Guo
91aa7d6899
extract BaseNode.setParent
2017-03-09 12:59:41 +08:00
Jare Guo
bdbc04b462
extract NodeActivator
2017-03-09 01:52:23 +08:00
Jare Guo
86f3a09f98
reviewed
2017-03-08 20:33:34 +08:00
Jare Guo
b74880fa10
fix activate child node directly in parent's onDisable
2017-03-08 17:33:20 +08:00
Jare Guo
c949c486f6
fix deactivate child node directly in parent's onDisable
2017-03-08 17:33:20 +08:00
Jare Guo
b272941cf6
working on execution order of lifecycle methods
2017-03-08 17:33:20 +08:00
Jare Guo
449cde5794
refine internal api of BaseNode
2017-03-08 17:33:20 +08:00
Jare Guo
fff91611cb
use shorthand function in properties
...
stash 2
2017-02-18 22:48:05 +08:00
Jare Guo
787aa87759
merge _onPreDestroy
2017-02-18 22:48:05 +08:00
Jare Guo
5d38426653
working on component scheduler
2017-02-17 00:24:36 +08:00
Jare Guo
e572ce5f84
Merge commit 'cc26ee35ee3e97474faf93b07242fb5531d1518c' into temp2
2017-01-19 11:08:59 +08:00
Jare Guo
f794b11143
Merge commit 'e7c57d27cd067f0fb3325b22d53d34378a10f198' into refactor-for-3d
...
# Conflicts:
# cocos2d/core/CCNode.js
2017-01-17 10:14:06 +08:00
Jare Guo
321bf8c8a0
Merge commit 'a822f07fcb4fa5be2de898117dff95a1fe98d5a2' into v1.4
2017-01-12 15:16:07 +08:00
Huabing.Xu
8416ed27f7
small adjust of code
2016-12-29 14:36:07 +08:00
Huabing.Xu
30c2f8947b
refactor setSiblingIndex
2016-12-29 11:26:16 +08:00
Huabing.Xu
d087040b89
update comments/docs, remove used codes
2016-12-29 10:47:40 +08:00
Huabing.Xu
b2645dabac
refactor onRestore function
2016-12-29 10:47:18 +08:00
Huabing.Xu
96239d933b
reformat code
2016-12-29 10:15:47 +08:00
Jare Guo
c4a1ec752f
prompt dialog if user wants to nest prefabs
2016-12-28 17:28:48 +08:00
Huabing.Xu
b7e441fcef
migrate commit 1b841bb31f
2016-12-28 10:45:19 +08:00
Huabing.Xu
1dee140209
clean up code
2016-12-28 10:15:11 +08:00
Huabing.Xu
0add0fc83a
refactor and move base functions to base node
2016-12-27 18:27:57 +08:00
Huabing.Xu
b75f8ffcf3
move active properties and some related functions to base node
2016-12-27 14:54:04 +08:00