Nan Wang
|
c7e45ce19c
|
move actions back to cc module.
|
2016-01-13 12:25:23 +08:00 |
|
pandamicro
|
7ca32506cb
|
Merge pull request #234 from pandamicro/v0.7
Update actions documention
|
2016-01-12 16:34:07 +08:00 |
|
pandamicro
|
c394416f30
|
Update actions documention
|
2016-01-12 16:31:57 +08:00 |
|
pandamicro
|
58014cc8ee
|
Merge pull request #233 from pandamicro/v0.7
Reverse pause/resume usage because cc.Node doesn't support
|
2016-01-12 16:14:53 +08:00 |
|
pandamicro
|
be89183f18
|
Reverse pause/resume usage because cc.Node doesn't support
|
2016-01-12 16:12:56 +08:00 |
|
Jare Guo
|
24144f35ab
|
Merge pull request #232 from pandamicro/v0.7
Fix event / action may be resume by hierarchy change (onEnter)
|
2016-01-12 16:09:14 +08:00 |
|
pandamicro
|
e28e793ac6
|
Consistent event/action control by pause/resume
|
2016-01-12 16:07:59 +08:00 |
|
pandamicro
|
303a460669
|
Fix event / action may be resume by hierarchy change (onEnter)
|
2016-01-12 15:59:05 +08:00 |
|
pandamicro
|
bc571727f4
|
Merge pull request #229 from pandamicro/v0.7
Fix crash issue in JSB v3.9 caused by event listener release
|
2016-01-12 10:34:05 +08:00 |
|
pandamicro
|
d0605ad75d
|
Fix crash issue in JSB v3.9 caused by event listener release
|
2016-01-12 10:33:23 +08:00 |
|
pandamicro
|
63b2e52d18
|
Merge pull request #228 from jareguo/v0.7
image event should registered before specifying its url
|
2016-01-12 09:56:38 +08:00 |
|
Jare Guo
|
5b21ba2adf
|
image event should registered before specifying its url
|
2016-01-12 02:10:34 +08:00 |
|
Wang Nan
|
28d0e11cd9
|
Merge pull request #226 from nantas/v0.7
move mask and canvas to ui group in component menu.
|
2016-01-11 21:41:55 +08:00 |
|
Nan Wang
|
020a8c6174
|
Merge branch 'v0.7' of github.com:nantas/engine into v0.7
|
2016-01-11 21:40:43 +08:00 |
|
Nan Wang
|
89c76e7f97
|
move mask and canvas to ui group in component menu.
|
2016-01-11 21:40:19 +08:00 |
|
pandamicro
|
cccfda91be
|
Merge pull request #224 from pandamicro/v0.7
Fix jsb replacer for repeat/easing
|
2016-01-11 17:55:06 +08:00 |
|
pandamicro
|
e1cc3bebb7
|
Fix jsb replacer for repeat/easing
|
2016-01-11 17:52:49 +08:00 |
|
pandamicro
|
c019d6d81d
|
Merge pull request #222 from pandamicro/v0.7
Fix retain/release usage on WEB
|
2016-01-11 16:39:26 +08:00 |
|
pandamicro
|
777a0380b6
|
Fix retain/release usage on WEB
|
2016-01-11 16:38:23 +08:00 |
|
pandamicro
|
23f4a6cf9e
|
Merge pull request #221 from pandamicro/v0.7
Fix Mask retain/release issue in JSB
|
2016-01-11 16:33:44 +08:00 |
|
pandamicro
|
e54456b22c
|
Fix Mask retain/release issue in JSB
|
2016-01-11 16:32:26 +08:00 |
|
pandamicro
|
fced4e0952
|
Merge pull request #220 from dabingnn/v0.7_refactor_mask
using drawnode for stecil in mask component
|
2016-01-11 16:10:11 +08:00 |
|
Huabing.Xu
|
8f78a76dd0
|
using DrawPoly instead of drawRect
|
2016-01-11 15:58:29 +08:00 |
|
Huabing.Xu
|
5a8af44cd2
|
clean up code
|
2016-01-11 15:16:19 +08:00 |
|
Huabing.Xu
|
c989a83146
|
using drawnode for stecil in mask component
|
2016-01-11 15:06:30 +08:00 |
|
pandamicro
|
605e8c2dd8
|
Merge pull request #219 from VisualSJ/0.7_bugs
Fixed a bug about canvas clipping node
|
2016-01-11 14:50:08 +08:00 |
|
Jare Guo
|
97769710e0
|
Merge pull request #218 from pandamicro/v0.7
Support webgl on Android 5 and qq browser 6.2 +
|
2016-01-11 13:39:37 +08:00 |
|
VisualSj
|
52b3dab2b1
|
Fixed a bug about canvas clipping node
|
2016-01-11 12:41:47 +08:00 |
|
pandamicro
|
2437bb46ba
|
Support webgl on Android 5 and qq browser 6.2 +
|
2016-01-11 12:22:29 +08:00 |
|
pandamicro
|
23bfa42efd
|
Merge pull request #216 from pandamicro/v0.7
Roll back some mistaken changes to Button/ScrollView, my bad
|
2016-01-11 10:44:45 +08:00 |
|
pandamicro
|
93fc5681e9
|
Fix CCButton _hitTest usage
|
2016-01-11 10:40:29 +08:00 |
|
pandamicro
|
09fc0d7b0b
|
Fix adaptation issue on Android caused by user-scalable
|
2016-01-11 10:17:32 +08:00 |
|
pandamicro
|
8a8d139e1c
|
Roll back some mistaken changes to Button/ScrollView, my bad
|
2016-01-11 10:17:13 +08:00 |
|
pandamicro
|
3b72b9e968
|
Merge pull request #210 from dabingnn/fix_loadImgeBug
fix load image bug
|
2016-01-11 09:56:50 +08:00 |
|
pandamicro
|
681e60b1e2
|
Merge pull request #215 from pandamicro/v0.7
解决事件排序错误的问题
|
2016-01-10 03:34:46 +08:00 |
|
pandamicro
|
dacc94561b
|
Fix wrong order of listener priority caused by double sort
|
2016-01-10 03:29:33 +08:00 |
|
pandamicro
|
e0e741884d
|
Fix event handling issues in Button/ScrollView
|
2016-01-10 03:29:06 +08:00 |
|
pandamicro
|
5183000163
|
Merge pull request #213 from pandamicro/v0.7
Support repeatly used actions in Node
|
2016-01-09 16:32:42 +08:00 |
|
pandamicro
|
aa1f404ccc
|
Support repeatly used actions in Node
|
2016-01-09 16:28:50 +08:00 |
|
Huabing.Xu
|
4211db5f8d
|
a more safer for loaded image
|
2016-01-09 11:08:10 +08:00 |
|
pandamicro
|
0d50c1a01a
|
Merge pull request #211 from pandamicro/v0.7
Fix issue in Action retain / release solution
|
2016-01-09 00:15:55 +08:00 |
|
pandamicro
|
4f2b7147be
|
Fix issue in Action retain / release solution
|
2016-01-09 00:15:01 +08:00 |
|
Huabing.Xu
|
20da1225f2
|
fix load image bug
|
2016-01-08 22:58:04 +08:00 |
|
pandamicro
|
ee95edb494
|
Merge pull request #207 from pandamicro/v0.7
Fix audio source issue in jsb
|
2016-01-08 18:06:51 +08:00 |
|
pandamicro
|
e64e2623a2
|
Fix audio source issue in jsb
|
2016-01-08 18:06:21 +08:00 |
|
Jare Guo
|
d8f935f18e
|
Merge pull request #206 from jareguo/v0.7
tweak api syntax
|
2016-01-08 17:43:35 +08:00 |
|
Jare Guo
|
7ed4ea56fb
|
tweak api syntax
|
2016-01-08 17:41:58 +08:00 |
|
pandamicro
|
3bceab21d2
|
Merge pull request #205 from pandamicro/v0.7
Fix rotation Y setter issue
|
2016-01-08 17:33:40 +08:00 |
|
pandamicro
|
9a104424a2
|
Fix rotation Y setter issue
|
2016-01-08 17:33:23 +08:00 |
|
pandamicro
|
071932eff6
|
Merge pull request #203 from pandamicro/v0.7
Made Action independent from retain release
|
2016-01-07 22:51:28 +08:00 |
|