Jare Guo
|
ea90fb1da9
|
remove loadingItem.deserializeInfo
|
2016-10-19 16:59:24 +08:00 |
|
Jare Guo
|
db4d56dd93
|
support es6 for testing engine-extends
|
2016-10-19 16:48:15 +08:00 |
|
Jare Guo
|
8af7a81640
|
Merge pull request #1208 from cocos-creator/revert-1158-master
Revert "try to fix #4269"
|
2016-10-17 15:31:24 +08:00 |
|
Jare Guo
|
6382ca1216
|
Revert "try to fix #4269"
|
2016-10-17 15:29:59 +08:00 |
|
Wang Nan
|
271f47de6f
|
Merge pull request #1173 from jareguo/master
小优化
|
2016-10-11 12:12:41 +08:00 |
|
Jare Guo
|
7a22b24448
|
Merge pull request #1172 from cocos-creator/v1.3
Sync 1.3
|
2016-10-09 14:33:29 +08:00 |
|
Jare Guo
|
76de928cd4
|
minor optimize
|
2016-10-09 14:32:02 +08:00 |
|
Wang Nan
|
e91bd5f9bc
|
Merge pull request #1170 from zilongshanren/improve-editbox-webchat-v1.3
Improve editbox webchat v1.3
|
2016-10-09 14:24:42 +08:00 |
|
Jare Guo
|
8732aa6d37
|
Merge pull request #1171 from knoxHuang/v1.3
fix cc.repeat error for cocos-creator/fireball/issues/4310
|
2016-10-09 10:50:51 +08:00 |
|
knoxHuang
|
28e0bbcbfb
|
fix cc.repeat error for cocos-creator/fireball/issues/4310
|
2016-10-09 10:45:52 +08:00 |
|
zilongshanren
|
920ea56adc
|
Merge branch 'fix-editbox-webchat-ios' into improve-editbox-webchat-v1.3
|
2016-10-09 10:38:30 +08:00 |
|
zilongshanren
|
0f69c2b882
|
improve docs
|
2016-10-09 10:19:05 +08:00 |
|
zilongshanren
|
005e4fcac8
|
add method to change tabIndex and focus
|
2016-10-08 18:33:32 +08:00 |
|
zilongshanren
|
895e95f865
|
fix dynamic toggle stayOnTop
|
2016-10-08 17:50:56 +08:00 |
|
Jare Guo
|
58588842ea
|
Merge pull request #1169 from knoxHuang/v1.3
fix page view slide error
|
2016-10-08 16:10:01 +08:00 |
|
zilongshanren
|
9f945612d9
|
allow editbox always on top
|
2016-10-08 15:59:16 +08:00 |
|
knoxHuang
|
2e2f7133f7
|
fix page view slide error
|
2016-10-08 15:49:10 +08:00 |
|
Wang Nan
|
30d51deedf
|
Merge pull request #1168 from natural-law/issue4297
Solve the error logic in setTileGID.
|
2016-10-08 14:07:19 +08:00 |
|
zhangbin
|
8c75d1733c
|
Solve the error logic in setTileGID.
|
2016-10-08 13:52:54 +08:00 |
|
Nan Wang
|
c817a61fdb
|
update version to v1.3.0-beta.6
|
2016-10-08 12:01:43 +08:00 |
|
Wang Nan
|
fa73bbfc81
|
Merge pull request #1167 from zilongshanren/fix-button-color-transition-hover
fix button color transition hover state
|
2016-10-08 09:48:25 +08:00 |
|
zilongshanren
|
551802ba26
|
improve sprite transition hover state
|
2016-10-08 09:42:36 +08:00 |
|
zilongshanren
|
c5cde3de2a
|
fix button color transition hover state
|
2016-10-08 08:22:20 +08:00 |
|
Jare Guo
|
152933915d
|
Merge pull request #1165 from pandamicro/master
修复 Loader 重构后的问题
|
2016-09-30 16:28:01 +08:00 |
|
pandamicro
|
ad439bc096
|
Clear log
|
2016-09-30 16:00:37 +08:00 |
|
pandamicro
|
713f85bd3e
|
Protect owner access
|
2016-09-30 15:26:00 +08:00 |
|
pandamicro
|
f19f1b2df0
|
Fix evil async issue
|
2016-09-30 14:41:16 +08:00 |
|
pandamicro
|
b0f4074526
|
Readd circle reference check
|
2016-09-30 13:49:58 +08:00 |
|
Jare Guo
|
5565b7d35d
|
Merge pull request #1164 from knoxHuang/master
fix scrollToOffset error for fireball/issues/4271
|
2016-09-30 09:53:49 +08:00 |
|
Jare Guo
|
97be55eb4b
|
Merge pull request #1162 from natural-law/solve-example-error
Solve the error effect of TiledMap example on native.
|
2016-09-30 09:48:23 +08:00 |
|
Jare Guo
|
a81471bfab
|
Merge pull request #1160 from natural-law/issue4283
Solve the error logic in TMXObjectGroup.
|
2016-09-30 09:47:57 +08:00 |
|
knoxHuang
|
3ed9026a8a
|
fix scrollToOffset error for fireball/issues/4271
|
2016-09-30 09:44:33 +08:00 |
|
Jare Guo
|
cb24c8aab5
|
Merge pull request #1161 from VisualSJ/master_audioDeprecated
移动音频 deprecated 接口
|
2016-09-30 09:39:11 +08:00 |
|
Jare Guo
|
8841993cbf
|
Merge pull request #1163 from knoxHuang/master
fix slider off error for fireball/issues/4271
|
2016-09-29 18:25:00 +08:00 |
|
knoxHuang
|
6d7eb7a5a7
|
fix slider off error for fireball/issues/4271
|
2016-09-29 18:22:45 +08:00 |
|
VisualSJ
|
8a2826ad22
|
review code
|
2016-09-29 18:07:01 +08:00 |
|
zhangbin
|
5e58a29f7f
|
Solve reviewed issues.
|
2016-09-29 18:00:26 +08:00 |
|
zhangbin
|
71f3573e93
|
Solve the error effect of TiledMap example on native.
|
2016-09-29 17:12:16 +08:00 |
|
VisualSJ
|
b6e8ef6236
|
Moving audio deprecated interface
|
2016-09-29 16:40:54 +08:00 |
|
zhangbin
|
0fe0d20f85
|
Solve the error logic in TMXObjectGroup.
|
2016-09-29 16:28:35 +08:00 |
|
Jare Guo
|
24ee5c9842
|
Merge pull request #1159 from VisualSJ/master_audioDeprecated
音频问题
|
2016-09-29 13:39:02 +08:00 |
|
VisualSJ
|
c88826c247
|
review code
|
2016-09-29 13:35:04 +08:00 |
|
VisualSJ
|
ee41bc2a38
|
audio compatibility
|
2016-09-29 12:04:07 +08:00 |
|
pandamicro
|
19996c45b6
|
Merge pull request #1155 from 2youyou2/loader
fixed CCLoader
|
2016-09-28 12:56:13 +08:00 |
|
Jare Guo
|
d8f1b29f68
|
Merge pull request #1158 from jareguo/master
try to fix #4269
|
2016-09-28 10:13:36 +08:00 |
|
Jare Guo
|
f1f21b7758
|
try to fix #4269
|
2016-09-28 10:10:30 +08:00 |
|
Jare Guo
|
20065b9319
|
Merge pull request #1153 from knoxHuang/master
update player_control for fireball/issues/4237
|
2016-09-27 17:14:28 +08:00 |
|
knoxHuang
|
3a11d6bcb6
|
update CCSystemEvent
|
2016-09-27 11:27:38 +08:00 |
|
Jare Guo
|
e4e4757391
|
Merge pull request #1157 from pandamicro/master
Fix CallbacksHandler has detection issue
|
2016-09-27 11:17:33 +08:00 |
|
knoxHuang
|
f75058c20b
|
add player_CCSystemEvent for fireball/issues/4237
|
2016-09-27 11:00:54 +08:00 |
|