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 |
|
pandamicro
|
1a4b7b8a25
|
Fix touch listener may be released in native issue
|
2016-01-07 22:50:39 +08:00 |
|
pandamicro
|
6aeda11e6e
|
Made Action independent from retain release
|
2016-01-07 22:50:19 +08:00 |
|
pandamicro
|
f03a6f0f81
|
Merge pull request #202 from dabingnn/v0.7_fixJSBSprite
V0.7 fix jsb sprite
|
2016-01-07 21:17:09 +08:00 |
|
Huabing.Xu
|
3c2115d632
|
Merge branch 'v0.7' into v0.7_fixJSBSprite
# Conflicts:
# jsb/versions/jsb-polyfill-v3.5.js
|
2016-01-07 21:10:27 +08:00 |
|
Huabing.Xu
|
4aa928cee5
|
fix jitter in 3.3
|
2016-01-07 21:08:31 +08:00 |
|
pandamicro
|
d04b9f638d
|
Merge pull request #201 from pandamicro/v0.7
Fix two issues
|
2016-01-07 20:58:47 +08:00 |
|
pandamicro
|
f3e6bf3994
|
Fix FontFace undefined issue
|
2016-01-07 20:57:02 +08:00 |
|
pandamicro
|
55b182ae70
|
Remove all listeners for Component
|
2016-01-07 20:56:49 +08:00 |
|
pandamicro
|
fb23b3bcef
|
Merge pull request #200 from pandamicro/v0.7
Fixed a bug about canvas clipping node
|
2016-01-07 20:15:35 +08:00 |
|
pandamicro
|
49bb84d93f
|
Fixed a bug about canvas clipping node
|
2016-01-07 20:03:12 +08:00 |
|
pandamicro
|
2cab57ba39
|
Merge pull request #199 from pandamicro/v0.7
Fix issues in JSB v3.3
|
2016-01-07 20:00:18 +08:00 |
|
pandamicro
|
0778975676
|
Put scale9sprite polyfill into jsb-scale9sprite.js
|
2016-01-07 19:59:45 +08:00 |
|
pandamicro
|
d04a91659e
|
Fix _unschedule is undefined issue
|
2016-01-07 19:59:21 +08:00 |
|
pandamicro
|
ae75142625
|
Fix createWithTTF is undefined issue
|
2016-01-07 19:59:01 +08:00 |
|
pandamicro
|
15364869e0
|
Merge pull request #198 from dabingnn/v0.7_fixJSBSprite
V0.7 fix jsb sprite
|
2016-01-07 19:44:07 +08:00 |
|
Huabing.Xu
|
be2faaed6b
|
fix offset bug
|
2016-01-07 19:16:06 +08:00 |
|
Huabing.Xu
|
b100ae705c
|
sprite works on JSB on v3.3 and v3.10
|
2016-01-07 19:14:04 +08:00 |
|
pandamicro
|
c482bb2fe4
|
Merge pull request #196 from pandamicro/v0.7
Fix undefined cc.initEngine issue and fix break issue for v3.3
|
2016-01-07 10:46:00 +08:00 |
|
pandamicro
|
f1e1ffee9e
|
Fix undefined cc.initEngine issue and fix break issue for v3.3
|
2016-01-07 10:45:25 +08:00 |
|
Jare Guo
|
c08830acdd
|
Merge pull request #194 from jareguo/v0.7
node should emit a size parameter if size changed
|
2016-01-06 23:22:36 +08:00 |
|
Jare Guo
|
0a15764846
|
node should emit a size parameter if size changed
|
2016-01-06 23:21:26 +08:00 |
|
pandamicro
|
5d4f35e937
|
Merge pull request #193 from pandamicro/v0.7
Support older version (<= v3.9) of JSB
|
2016-01-06 19:43:29 +08:00 |
|
pandamicro
|
38f270aaba
|
Support older version (<= v3.9) of JSB
|
2016-01-06 19:33:34 +08:00 |
|
Jare Guo
|
6ecccc1dc1
|
Merge pull request #192 from knoxHuang/master
supplement cocos2d platform directory note
|
2016-01-06 14:56:51 +08:00 |
|
knoxHuang
|
e23bb13989
|
supplement cocos2d platform directory note
|
2016-01-06 14:55:13 +08:00 |
|
pandamicro
|
669d5f3801
|
Merge pull request #189 from dabingnn/v0.7LabelTreatNoneasClamp
V0.7 label treat noneas clamp
|
2016-01-05 19:28:24 +08:00 |
|
Huabing.Xu
|
a07ab99b24
|
treat None as Clamp in label
hack in ccLabel component when overflow is NONE
|
2016-01-05 19:26:05 +08:00 |
|
Jare Guo
|
56af78bf3f
|
Merge pull request #191 from pandamicro/v0.7
从 modular-cocos2d 中去除不必要的模块以减少脚本体积
|
2016-01-05 18:59:30 +08:00 |
|
pandamicro
|
22d87db5c9
|
Update engine version
|
2016-01-05 18:24:41 +08:00 |
|