Jare Guo
|
b1e5d3b8e9
|
Merge pull request #1322 from knoxHuang/v1.3
should check validation of _stencil
|
2016-11-28 16:03:07 +08:00 |
|
knoxHuang
|
1648279035
|
should check validation of _stencil
|
2016-11-28 15:59:20 +08:00 |
|
Wang Nan
|
1da82703a7
|
Merge pull request #1320 from jareguo/v1.3
add language codes
|
2016-11-28 14:50:43 +08:00 |
|
Jare Guo
|
b689568f35
|
add language codes
|
2016-11-28 14:27:45 +08:00 |
|
Wang Nan
|
645306abfa
|
Merge pull request #1311 from knoxHuang/Mask
add IMAGE_STENCIL for CCMask for fireball/issues/3961
|
2016-11-25 11:01:54 +08:00 |
|
Jare Guo
|
d41e7d0500
|
Merge pull request #1314 from knoxHuang/v1.3
fix cc.Node:getActionByTag returns undefined for engine/issues/1300
|
2016-11-25 10:58:49 +08:00 |
|
knoxHuang
|
5a9dba25d1
|
fix cc.Node:getActionByTag returns undefined for engine/issues/1300
|
2016-11-25 10:56:07 +08:00 |
|
Jare Guo
|
0968548643
|
Merge pull request #1313 from jareguo/v1.3
fix callback for loading sprite frame
|
2016-11-25 10:25:41 +08:00 |
|
Jare Guo
|
ae26a61ead
|
fix callback for loading sprite frame
|
2016-11-25 10:17:33 +08:00 |
|
knoxHuang
|
e743e06761
|
update mask api
|
2016-11-25 09:43:58 +08:00 |
|
knoxHuang
|
c1ec157945
|
add IMAGE_STENCIL for CCMask for fireball/issues/3961
|
2016-11-24 17:21:18 +08:00 |
|
Jare Guo
|
17b836705b
|
Merge pull request #1310 from knoxHuang/v1.3
add tooltip for CCParticleSystem
|
2016-11-23 17:59:10 +08:00 |
|
knoxHuang
|
a2e39dc959
|
add tooltip for CCParticleSystem
|
2016-11-23 17:47:27 +08:00 |
|
Wang Nan
|
0fb24064fb
|
Merge pull request #1309 from zilongshanren/fix-jsb-label-resize-height
fix label jsb resize height dimensions issue
|
2016-11-23 15:20:49 +08:00 |
|
zilongshanren
|
f82062160a
|
fix label jsb resize height dimensions issue
|
2016-11-23 14:46:32 +08:00 |
|
Jare Guo
|
f84b1daab0
|
Merge pull request #1308 from knoxHuang/fix_API
fix code and API err for fireball/issues/4722
|
2016-11-23 11:56:56 +08:00 |
|
knoxHuang
|
d916e0d7f4
|
fix code and API err for fireball/issues/4722
|
2016-11-23 11:44:08 +08:00 |
|
Jare Guo
|
9f7f0133dc
|
Merge pull request #1307 from zilongshanren/fix-safari-richtext
don't trigger loadTTF when ttf is not exists
|
2016-11-23 11:28:01 +08:00 |
|
zilongshanren
|
baf4fbb3f3
|
simplify code
|
2016-11-23 11:22:33 +08:00 |
|
zilongshanren
|
7dde8471d9
|
don't trigger loadTTF when ttf is not exists
|
2016-11-23 11:20:12 +08:00 |
|
Jare Guo
|
3c28053384
|
Merge pull request #1306 from knoxHuang/v1.3
fix pageview buf for for #fireball/issues/4758
|
2016-11-23 11:18:02 +08:00 |
|
knoxHuang
|
05aa536a4c
|
fix pageview buf for for #fireball/issues/4758
|
2016-11-23 10:19:43 +08:00 |
|
Wang Nan
|
665306bffb
|
Merge pull request #1297 from zilongshanren/optimize-ttf-load
optimize custom ttf font load notification
|
2016-11-22 14:05:45 +08:00 |
|
Wang Nan
|
3b36c9791b
|
Merge pull request #1305 from natural-law/issue4750
Solve the error when use a same DragonBonesAsset twice.
|
2016-11-22 14:03:47 +08:00 |
|
zhangbin
|
20493605ee
|
Solve the error when use a same DragonBonesAsset twice.
|
2016-11-22 10:26:27 +08:00 |
|
Jare Guo
|
643e76d441
|
Merge pull request #1302 from 2youyou2/collision-debug-draw
fixed CCCollisionManager debug draw
|
2016-11-21 17:50:44 +08:00 |
|
Jare Guo
|
f66badc2de
|
Merge pull request #1301 from 2youyou2/graphics-canvas
fixed graphics render in canvas moder
|
2016-11-21 17:30:56 +08:00 |
|
2youyouo2
|
138f4620ad
|
fixed graphics render in canvas moder
|
2016-11-21 11:23:35 +08:00 |
|
2youyouo2
|
97771320eb
|
fixed CCCollisionManager debug draw
|
2016-11-21 11:22:39 +08:00 |
|
Wang Nan
|
a683569580
|
Merge pull request #1299 from knoxHuang/v1.3
fix load bug for #fireball/issues/4739
|
2016-11-21 10:17:50 +08:00 |
|
knoxHuang
|
06764622db
|
fix load bug for #fireball/issues/4739
|
2016-11-18 18:20:56 +08:00 |
|
Jare Guo
|
3bff3e8ac7
|
Merge pull request #1254 from knoxHuang/v1.3
add unifiedSize for CCPageView
|
2016-11-18 18:00:52 +08:00 |
|
knoxHuang
|
6faadf7445
|
update size-changed for CCPageView
|
2016-11-18 17:46:17 +08:00 |
|
knoxHuang
|
58449afe32
|
update CCPageView
|
2016-11-18 17:34:13 +08:00 |
|
Jare Guo
|
1e3bed566d
|
Merge pull request #1296 from zilongshanren/fix-layout-padding-migrate
fix migrate padding data
|
2016-11-18 09:37:22 +08:00 |
|
zilongshanren
|
ce9c752f0c
|
optimize custom ttf font load notification
|
2016-11-17 18:09:00 +08:00 |
|
zilongshanren
|
99d386bfef
|
fix migrate padding data
|
2016-11-17 17:46:40 +08:00 |
|
knoxHuang
|
87fb1fe4ea
|
add UnifiedSize for PageView fireball/issues/4714
|
2016-11-17 14:36:55 +08:00 |
|
Wang Nan
|
ee42781f51
|
Merge pull request #1289 from VisualSJ/v1.3_audio
Can't stop audio
|
2016-11-17 10:23:51 +08:00 |
|
Jare Guo
|
2a140e789c
|
Merge pull request #1292 from pandamicro/v1.3
Remove state cache to avoid rendering issue on some devices
|
2016-11-16 19:53:21 +08:00 |
|
pandamicro
|
4bacb86070
|
Fix editbox cause page resize in mobile browsers
|
2016-11-16 18:48:17 +08:00 |
|
pandamicro
|
2939b56a4e
|
Remove state cache to avoid rendering issue on some devices
|
2016-11-16 18:43:45 +08:00 |
|
Jare Guo
|
374233acea
|
Merge pull request #1291 from zilongshanren/add-array-option-to-layout
fix padding warnings
|
2016-11-16 18:02:02 +08:00 |
|
zilongshanren
|
48aa2b870c
|
minor fix
|
2016-11-16 18:01:09 +08:00 |
|
zilongshanren
|
3fcee8cf99
|
fix padding warnings
|
2016-11-16 17:58:44 +08:00 |
|
Jare Guo
|
996d41d535
|
Merge pull request #1290 from zilongshanren/improve-layout-padding-options
Improve layout padding options
|
2016-11-16 16:05:08 +08:00 |
|
zilongshanren
|
83738e0037
|
finish improve layout padding options
add missing API docs
improve layout padding
make this.padding return paddingLeft
make editOnly in property declare
|
2016-11-16 16:03:55 +08:00 |
|
zilongshanren
|
159d13f843
|
add the missing en API doc for layout
migrate old padding data
finish layout horizontal
improve vertical layout padding
|
2016-11-16 16:03:52 +08:00 |
|
Wang Nan
|
a552c1b77a
|
Merge pull request #1288 from zilongshanren/improve-jsb-label
improve jsb label polyfill
|
2016-11-16 12:00:52 +08:00 |
|
zilongshanren
|
8ff6679935
|
improve jsb label polyfill
|
2016-11-16 11:56:46 +08:00 |
|