Commit Graph

3318 Commits

Author SHA1 Message Date
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
Wang Nan 717de8c46f Merge pull request #1287 from zilongshanren/fix-bmfont-color-setting
fix label outline color error
2016-11-16 11:42:12 +08:00
zilongshanren de2e981423 fix label outline color error 2016-11-16 11:36:02 +08:00
Nan Wang 0e52cf6ea1 update version to 1.3.2 2016-11-16 10:12:43 +08:00
Wang Nan 2f6a15ab7e Merge pull request #1285 from 2youyou2/animation
improve animation interface, fixed typo
2016-11-16 09:28:34 +08:00
Nan Wang 90941f0039 Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3 2016-11-15 18:31:23 +08:00
Nan Wang b0bf554d53 update version to 1.3.2-beta.2 2016-11-15 18:30:57 +08:00
VisualSJ d29d80d435 Can't stop audio 2016-11-15 18:17:35 +08:00
2youyouo2 3a48a569b4 improve animation interface, fixed typo 2016-11-15 11:41:41 +08:00
Jare Guo 861003102c Merge pull request #1283 from 2youyou2/circle-collider
fixed CircleCollider boudingbox calculation
2016-11-15 10:18:31 +08:00
Wang Nan 6e6433f433 Merge pull request #1280 from knoxHuang/action
fix RotateTo bug for fireball/issues/4610
2016-11-15 09:37:04 +08:00
Wang Nan 85fa661925 Merge pull request #1276 from zilongshanren/add-custom-font-richtext
Add custom font richtext
2016-11-15 09:32:32 +08:00
Jare Guo 99df0915b5 Merge pull request #1282 from pandamicro/v1.3
Improve ios 9 uiwebview detection
2016-11-14 18:51:57 +08:00