Commit Graph

3294 Commits

Author SHA1 Message Date
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 99d386bfef fix migrate padding data 2016-11-17 17:46:40 +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
pandamicro 8dbf49ab72 Improve ios 9 uiwebview detection 2016-11-14 18:45:42 +08:00
pandamicro bf5e1fb3ac Support release url loaded texture which don't have a uuid 2016-11-14 15:15:31 +08:00
2youyouo2 b310b4ee8f fixed CircleCollider boudingbox calculation 2016-11-14 10:04:51 +08:00
knoxHuang abb655c274 fix RotateTo bug for fireball/issues/4610 2016-11-14 09:53:55 +08:00
zilongshanren fc9429a04f remove unused code 2016-11-10 20:54:05 +08:00
Jare Guo aa7bb4425d Merge pull request #1277 from natural-law/solve-warn
Solve the warning in TMXXMLParser.
2016-11-10 16:50:05 +08:00
zhangbin cba8ddc932 Solve the warning in TMXXMLParser. 2016-11-10 16:45:50 +08:00
zilongshanren 3aee3a4e4b remove duplicated code 2016-11-10 16:29:04 +08:00
zilongshanren 086f092227 add custom font loader
add richtext font load

improve custom ttf font cache

fix almost the cases

fix for android mobile device

add custom font loader

fix font load issue

remove unneeded logs
2016-11-10 16:18:45 +08:00
zilongshanren cc543d98cc add custom font support 2016-11-10 16:18:39 +08:00
Jare Guo 8c87e61ed4 Merge pull request #1275 from natural-law/improve-dragonbones
Not set the default animation name at runtime.
2016-11-10 16:12:39 +08:00
zhangbin e9c75d45ae Not set the default animation name at runtime. 2016-11-10 15:52:52 +08:00
Nan Wang d6a2a1aa88 update engine version to 1.3.2-beta.1 2016-11-10 10:37:28 +08:00
Wang Nan b9dcf02df1 Merge pull request #1264 from zilongshanren/improve-button-cancel-behavior
improve button cancel behavior
2016-11-10 10:12:06 +08:00
Jare Guo c1b6c7ad86 Merge pull request #1274 from natural-law/issue4644
Solve the error calculation of the image object's position.
2016-11-09 15:12:54 +08:00
zhangbin 5ff80345a7 Solve the error calculation of the image object's position. 2016-11-09 14:13:41 +08:00
Jare Guo 5d76a93eff Merge pull request #1273 from zilongshanren/improve-label-editor-fontseting
fix system font toggle
2016-11-09 13:41:03 +08:00
zilongshanren 8b20d1de85 fix system font toggle 2016-11-09 12:00:08 +08:00
Jare Guo a3414b60d0 Merge pull request #1270 from natural-law/issue4637
Solve the error when set dragonAsset value at runtime.
2016-11-08 18:01:35 +08:00
zhangbin 2d3f850eb8 Solve the error when set dragonAsset value at runtime. 2016-11-08 17:55:31 +08:00
zilongshanren a22b669d02 remove unused logic 2016-11-08 17:43:54 +08:00
zilongshanren 4b7066f76c improve scale transition touch move 2016-11-08 17:41:12 +08:00
zilongshanren 362b8b131f refactoring button 2016-11-08 16:52:38 +08:00
zilongshanren b672b8d0fe improve button cancel behavior 2016-11-08 16:03:44 +08:00