minggo
b8eae4cc39
fix some comments
2016-01-29 18:32:54 +08:00
Jare Guo
ade6bb5362
check component conflict
2016-01-13 15:26:58 +08:00
pandamicro
be89183f18
Reverse pause/resume usage because cc.Node doesn't support
2016-01-12 16:12:56 +08:00
pandamicro
303a460669
Fix event / action may be resume by hierarchy change (onEnter)
2016-01-12 15:59:05 +08:00
pandamicro
777a0380b6
Fix retain/release usage on WEB
2016-01-11 16:38:23 +08:00
pandamicro
e54456b22c
Fix Mask retain/release issue in JSB
2016-01-11 16:32:26 +08:00
pandamicro
9a104424a2
Fix rotation Y setter issue
2016-01-08 17:33:23 +08:00
Jare Guo
0a15764846
node should emit a size parameter if size changed
2016-01-06 23:21:26 +08:00
pandamicro
8ce8ea66b3
Set uuid to empty in runtime
2015-12-31 17:49:43 +08:00
pandamicro
6ea977ed0e
Fix more JSB issues
2015-12-31 17:47:00 +08:00
pandamicro
b015c488d5
Fix a bunch of JSB bug
2015-12-31 17:47:00 +08:00
pandamicro
b527f36222
Fix more bugs in entity components
2015-12-30 22:18:13 +08:00
pandamicro
9db531f461
Fix JSB issues
2015-12-30 22:18:13 +08:00
Jare Guo
8e4a704074
force reset property in assetlibrary even if query failed, to make array fully initialized
2015-12-30 21:57:40 +08:00
zilongshanren
c4b48a4c89
fix layout child anchor change issue.
...
1. fix base-node getBoundingBox issue
2015-12-29 21:21:21 +08:00
zilongshanren
56f6c329fd
finish none layout
2015-12-29 20:42:04 +08:00
Jare Guo
742015dc1e
throw warning if property overrided without specifing override keyword
2015-12-28 18:30:23 +08:00
pandamicro
9f20262276
Let Entity correctly sorted by event manager
2015-12-25 19:46:14 +08:00
zilongshanren
3ba13cfe38
Finish layout
...
add children change event
add child-added and child-remove event to basenode
add layout dirty skeleton
finish layout in one direction
add layout doc string.
2015-12-24 14:21:17 +08:00
Nan Wang
47f4933de2
add tooltip for node and component title.
2015-12-21 16:51:12 +08:00
zilongshanren
ee024d428e
Add ScrollView and ScrollBar
...
Squashed commit of the following:
commit 34fea7fd4ea962f041ebadf4a5b17b3710a1fa02
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 18 14:47:00 2015 +0800
finish scrollview feature
commit 373eff672e4f81b79951cd583fc63865c76a0093
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 18 14:34:49 2015 +0800
fix float point compare issue
commit 4701cea8b488ae169407fca5be203d9a5e5fcccc
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 18 10:56:09 2015 +0800
fix component naming
commit 20f86a505aa09630b0bdf2ad6bdf4287777951aa
Merge: 279d2fc 3c6522e
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 18 10:55:23 2015 +0800
Merge branch 'master' into addScrollView
commit 279d2fc1143f6ec473e2ccfcaecc86a50087e033
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 18 10:40:32 2015 +0800
make elastic work
commit ed5c3cdb600bdc3d998280ab7e50d2703b50ed71
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 18 10:11:00 2015 +0800
fix bouncing issue
commit 8a1d3be8aff624597592954a58ce3b48c289c9f9
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 15:26:57 2015 +0800
make brake factor working
commit 7e3099de4aad72fbf60d3930e9e4337b1c5af828
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 14:56:21 2015 +0800
make scrollview inertia scroll working
commit 3c3b29935e1dcdcd9eb2f96637ce168ec35a4ac1
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 14:31:51 2015 +0800
fix convertToWorldSpace
commit 9d58b715f56f010a84e6903962169eea6d450d00
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 11:18:51 2015 +0800
add inertia scroll skeleton
commit 1523775943394139e723f9f7fdca4ad89a49cc70
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 10:48:14 2015 +0800
add a few scrollview variables
commit c5231fa52e580d80bd47de60133242cd5c9f0901
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 10:08:23 2015 +0800
finish scrollbar auto hide
commit 8c79eb33c0a2e25c108c3e03c90c1343469659ea
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 09:44:03 2015 +0800
fix toggle scrollbar
commit b6a24f82ee1ec4e391adf0e5ecc8c3d0477682d6
Author: zilongshanren <guanghui8827@126.com >
Date: Thu Dec 17 09:34:46 2015 +0800
finish scroll bar position
commit ba1dab366e94020bddcb0f3b4243c574ff60afa7
Author: zilongshanren <guanghui8827@126.com >
Date: Wed Dec 16 20:22:23 2015 +0800
fix convert to node space issue
commit e596d37aedb963bfd0f21f383d12f7c828c6c2bf
Author: zilongshanren <guanghui8827@126.com >
Date: Wed Dec 16 17:54:26 2015 +0800
fuck
commit 3b238be9d0e72a6414e3c578190ed6722dee9899
Author: zilongshanren <guanghui8827@126.com >
Date: Wed Dec 16 16:42:05 2015 +0800
make handle's position correct
commit e7c21508d1a08c0df761cf945e8d9714391e6f6b
Merge: a882517 3f58254
Author: zilongshanren <guanghui8827@126.com >
Date: Wed Dec 16 10:52:02 2015 +0800
Merge remote-tracking branch 'origin/master' into addScrollView
commit a882517765f5fae042cfde472202c22e0cc09416
Author: zilongshanren <guanghui8827@126.com >
Date: Wed Dec 16 10:51:33 2015 +0800
update scrollview
commit 90af1f848509325d317f0df0edb203697a9c04e5
Author: zilongshanren <guanghui8827@126.com >
Date: Tue Dec 15 21:17:27 2015 +0800
make horizontal and vertical move work
commit b5274cb9248e6eebf29e0ba8ceb3e96cb2d7f483
Author: zilongshanren <guanghui8827@126.com >
Date: Tue Dec 15 20:57:00 2015 +0800
update scrollbar
commit 43ae08aed730588303fe41857def7d51aea890e6
Author: zilongshanren <guanghui8827@126.com >
Date: Tue Dec 15 16:26:50 2015 +0800
add scrollbar skeleton
commit 6a4c1a39eeabad06f871a32f77d442f4fcd9b487
Merge: 1184415 306f66a
Author: zilongshanren <guanghui8827@126.com >
Date: Mon Dec 14 20:42:05 2015 +0800
Merge branch 'master' into addScrollView
commit 1184415480d1b08c589365c6ba919b438a760aa5
Author: zilongshanren <guanghui8827@126.com >
Date: Mon Dec 14 20:01:18 2015 +0800
add touch event handler
commit 510eba29001073b8c1215d50ae12f3e6d2bc37d6
Merge: d0e44ad e89a6f7
Author: zilongshanren <guanghui8827@126.com >
Date: Mon Dec 14 17:55:27 2015 +0800
Merge branch 'master' into addScrollView
commit d0e44ad90740706fa34480a3c8228fd1250c0c74
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 11 18:22:23 2015 +0800
add scrollbar components
commit 8a812def219517d6daab857e997084f7e0bea878
Author: zilongshanren <guanghui8827@126.com >
Date: Fri Dec 11 17:48:42 2015 +0800
add scrollview skeleton
2015-12-18 14:49:12 +08:00
Nan Wang
941d33a3d4
update some api comments, use sourcemap again since.
2015-12-16 16:21:31 +08:00
Jare Guo
03b4b412d0
fix render order for _replaceSgNode
2015-12-15 17:00:48 +08:00
Huabing.Xu
df60ba0036
rename function
2015-12-15 11:58:26 +08:00
Huabing.Xu
97d6e18a4e
refactor ccMask will call entity.replaceSgNode instead of _rebuldScenegraph
2015-12-15 10:51:36 +08:00
Jare Guo
0a6724e161
emit events if node's all the editable properties changed
2015-12-14 21:57:52 +08:00
2youyouo2
db118bd306
remove CC_EDITOR
2015-12-14 12:04:25 +08:00
2youyouo2
8eb81eb015
add position-changed event for cc.Node
2015-12-14 11:23:57 +08:00
pandamicro
b7581b6b58
Fix _setLocalZOrder usage
2015-12-13 09:22:33 +08:00
pandamicro
a4a051404e
reverse function invocation to property usage
2015-12-12 23:29:17 +08:00
pandamicro
7a1fac062d
Fix issues for jsb runtime
2015-12-12 23:29:17 +08:00
pandamicro
45657da750
Fix issues for jsb build
2015-12-12 23:27:55 +08:00
Nan Wang
8d945dd986
fix node.opacity property name.
2015-12-12 18:04:48 +08:00
Nan Wang
3981104a1f
correct example path.
2015-12-10 19:26:35 +08:00
Nan Wang
4b059294d2
fixed code-editor parsing error for engine apis.
2015-12-10 16:38:26 +08:00
Jare Guo
627fb37874
add size-changed event for node
2015-12-10 00:28:47 +08:00
knoxHuang
113755fd4a
Merge remote-tracking branch 'origin/master'
...
Conflicts:
cocos2d/core/CCNode.js
cocos2d/core/utils/base-node.js
2015-12-09 18:30:15 +08:00
knoxHuang
9e057e3c6d
update fireball-x/fireball#433 : Shielding original cc.ENode and cc.EScene
2015-12-09 18:25:08 +08:00
Jare Guo
9679b6b698
Merge pull request #18 from knoxHuang/master
...
fix fireball-x/fireball#433 : Shielding original cc.Node and cc.Scene
2015-12-09 15:33:53 +08:00
knoxHuang
ebeb018a97
fix fireball-x/fireball#433 : Shielding original cc.Node and cc.Scene
2015-12-09 14:52:41 +08:00
Jare Guo
5b48456197
disallow multiple ComponentInSG
2015-12-09 14:46:42 +08:00
Jare Guo
89508d7bf0
loader should return error if load failed
2015-12-08 13:41:12 +08:00
Jare Guo
b15e2af7e3
update component menu
2015-12-07 15:54:42 +08:00
Nan Wang
c0f59c1598
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
2015-12-05 12:22:41 +08:00