Commit Graph

2832 Commits

Author SHA1 Message Date
knoxHuang 99765ac2f4 add pageview to componet for fireball/issues/1461 2016-09-12 10:37:15 +08:00
Wang Nan 2c3197ea51 Merge pull request #1103 from natural-law/issue4153
Solve the error in the TiledMap parser.
2016-09-09 14:20:35 +08:00
Wang Nan d9bc0e19f6 Merge pull request #1104 from jareguo/temp
support premultipliedAlpha on spine
2016-09-09 14:17:48 +08:00
Wang Nan fbc78162fd Merge pull request #1111 from zilongshanren/add-button-scale-transition
Add button scale transition
2016-09-09 14:16:22 +08:00
zilongshanren 8fe1d04111 improve button equality test logic 2016-09-09 11:41:21 +08:00
zilongshanren d15afcf418 improve button scale transition 2016-09-09 11:37:07 +08:00
zilongshanren e93b8c22a4 finish resize node to target node 2016-09-08 19:02:03 +08:00
zilongshanren 05591ad27e all button custom scale 2016-09-08 16:35:43 +08:00
zilongshanren 9ac8238770 refactoring zoom feature 2016-09-08 14:50:48 +08:00
zilongshanren 1cfde666a7 fix transition touch move 2016-09-08 14:05:41 +08:00
zilongshanren d735f05096 add scale transition 2016-09-07 17:53:41 +08:00
Jare Guo 6e0f299d2b support premultipliedAlpha on spine 2016-09-07 16:31:01 +08:00
zhangbin d33cb280ae Solve the error in the TiledMap parser. 2016-09-07 15:15:56 +08:00
Jare Guo 789bd1a677 Merge pull request #1101 from cocos-creator/v1.2
Sync V1.2
2016-09-07 14:00:11 +08:00
Wang Nan bf6ce8fcb5 Merge pull request #1094 from zilongshanren/fix-richtext-edge-cases
fix RichText element wrap edge cases
2016-09-07 13:46:58 +08:00
Wang Nan 40f5f45e75 Merge pull request #1057 from VisualSJ/master_audioEngine
Master audio engine
2016-09-07 10:57:17 +08:00
Wang Nan 839a8ac98d Merge pull request #1100 from dabingnn/v1.2_fix_ttf_loading
V1.2 fix ttf loading
2016-09-07 10:56:44 +08:00
Wang Nan d7952024b7 Merge pull request #1092 from zilongshanren/fix-label-shrink
fix label shrink effect
2016-09-07 10:39:15 +08:00
Wang Nan 2a4eba33be Merge pull request #1095 from zilongshanren/improve-scrollview-web-desktop-scroll
fix Scrollview mouse wheel scroll direction
2016-09-07 10:38:58 +08:00
Wang Nan 83908b2ea3 Merge pull request #1097 from dabingnn/v1.2_fix_ttf_loading
refine ttf file loading
2016-09-07 10:38:07 +08:00
Wang Nan ecaf6e2fd4 Merge pull request #1098 from jareguo/temp
API 中加入 spine 官方文档链接
2016-09-07 10:36:54 +08:00
Wang Nan 83626ae7c9 Merge pull request #1099 from pandamicro/v1.2
Fix cc.log issue
2016-09-07 10:36:17 +08:00
Huabing.Xu dd62837856 small adjusts 2016-09-07 10:13:49 +08:00
pandamicro 4bdf2446c9 Fix cc.log issue 2016-09-07 09:52:06 +08:00
VisualSJ 2bc87645f2 review code and support jsb 2016-09-06 18:22:54 +08:00
Jare Guo c6d5368997 add api href for spine official runtime 2016-09-06 18:03:08 +08:00
Huabing.Xu 4734c20e22 refine ttf file loading 2016-09-06 18:02:00 +08:00
zilongshanren 232e6a53c5 fix Scrollview mouse wheel scroll direction 2016-09-06 11:45:32 +08:00
pandamicro 8ab1d1eee7 Merge pull request #1091 from pandamicro/master
Fix cc.log issue in JSB
2016-09-06 11:40:13 +08:00
zilongshanren 58f1d4ac9b fix wrap edge cases 2016-09-06 11:19:55 +08:00
Jare Guo 3fd5e24955 Merge pull request #1093 from jareguo/v1.2
minor fix
2016-09-06 11:01:43 +08:00
Jare Guo 30f1edfcfc minor fix 2016-09-06 11:00:35 +08:00
zilongshanren d15b82f476 fix label shrink effect 2016-09-06 10:41:03 +08:00
VisualSJ 4a38d84fbf create cc.Audio 2016-09-06 09:28:42 +08:00
VisualSJ c1f319721f Merge branch 'master' of github.com:cocos-creator/engine into master_audioEngine 2016-09-05 18:47:32 +08:00
VisualSJ bd1d89ae98 review code 2016-09-05 18:46:56 +08:00
pandamicro 54e07aa6ac Fix cc.log issue in JSB 2016-09-05 17:50:40 +08:00
pandamicro eeff6e9f07 Merge pull request #1090 from pandamicro/master
Improve webgl support detection and orientation adaptation
2016-09-05 14:09:57 +08:00
pandamicro 7ceba7b512 Improve webgl support detection and orientation adaptation 2016-09-05 13:52:04 +08:00
Nan Wang 6acbbe6373 merged v1.2 2016-09-05 12:06:47 +08:00
Wang Nan 62c86589e6 Merge pull request #1056 from jareguo/temp
synced prefab
2016-09-05 12:02:18 +08:00
Wang Nan 6edaf95340 Merge pull request #1084 from zilongshanren/add-richtext-element-br
Add richtext element br
2016-09-05 11:39:54 +08:00
Jare Guo 770c3d3956 Merge pull request #1088 from knoxHuang/v1.2_fixBug
fix tintTo and tintBy in the Simulator displays an error for fireball…
2016-09-05 11:32:51 +08:00
knoxHuang fda6c98d8a fix tintTo and tintBy in the Simulator displays an error for fireball/issues/4137 2016-09-05 11:31:06 +08:00
pandamicro 8d251ec608 Merge pull request #1085 from knoxHuang/v1.2
fix targetedAction error for fireball/issues/4129
2016-09-05 11:25:35 +08:00
knoxHuang dccf301be3 fix targetedAction error for fireball/issues/4129 2016-09-05 10:55:18 +08:00
Wang Nan 636d666776 Merge pull request #1086 from pandamicro/master
Improve webgl support detection and orientation adaptation
2016-09-05 10:09:30 +08:00
Jare Guo 8a244d64b2 minor tweaks 2016-09-03 17:20:00 +08:00
Jare Guo 7c53c47b5f working on synced prefab 2016-09-03 16:56:39 +08:00
pandamicro c5bf08e526 Improve webgl support detection and orientation adaptation 2016-09-02 18:34:36 +08:00