Wang Nan
|
694875dc93
|
Merge pull request #1429 from natural-law/hot-fix
Solve the error logic in dragonBones.CCSlot.
|
2017-01-11 13:51:48 +08:00 |
|
zhangbin
|
d187fdfef9
|
Solve the error logic in dragonBones.CCSlot.
|
2017-01-11 13:45:38 +08:00 |
|
Jare Guo
|
cbad139f11
|
Merge pull request #1426 from jareguo/temp2
fix unit tests about loader
|
2017-01-10 16:28:17 +08:00 |
|
Jare Guo
|
9ed97adbc8
|
fix unit tests about loader
|
2017-01-10 16:23:23 +08:00 |
|
pandamicro
|
b63811d53c
|
Merge pull request #1424 from pandamicro/v1.4
Fix auto culling issues when node is rotated
|
2017-01-10 09:59:36 +08:00 |
|
pandamicro
|
9f7df65ee7
|
Fix auto culling issues when node is rotated
|
2017-01-10 09:42:28 +08:00 |
|
Wang Nan
|
a3005b32dc
|
Merge pull request #1419 from cocos-creator/master
merge master
|
2017-01-09 11:54:10 +08:00 |
|
Jare Guo
|
f77df50736
|
Merge pull request #1417 from natural-law/issue5053
Solve the error effect of DragonBones when re-enter an auto-released scene.
|
2017-01-09 11:31:35 +08:00 |
|
zhangbin
|
7f9da20240
|
Improve the logic.
|
2017-01-09 11:31:08 +08:00 |
|
pandamicro
|
01e00c6aaa
|
Merge pull request #1410 from pandamicro/master
修复加载器的新 bug
|
2017-01-07 20:02:05 +08:00 |
|
pandamicro
|
963b7254f2
|
Ensure remove scene after loaded
|
2017-01-07 16:35:09 +08:00 |
|
Jare Guo
|
8cab9f31a9
|
Merge pull request #1416 from VisualSJ/1.4-5050
The problem of audio playback
|
2017-01-06 21:43:32 +08:00 |
|
pandamicro
|
9a8bc63ab0
|
Fix _info in CCLoader incorrect issue
|
2017-01-06 18:56:47 +08:00 |
|
pandamicro
|
d3a0c2f80e
|
Merge pull request #1 from VisualSJ/master-pandamicro
Add parameter for Audio
|
2017-01-06 18:40:10 +08:00 |
|
VisualSJ
|
7bab7e2740
|
Review code
|
2017-01-06 18:14:02 +08:00 |
|
zhangbin
|
337e8346e6
|
Solve the error effect of DragonBones when re-enter an auto-released scene.
|
2017-01-06 18:00:28 +08:00 |
|
VisualSJ
|
477853c3ca
|
Review code
|
2017-01-06 16:17:39 +08:00 |
|
VisualSJ
|
98f7bd5aaf
|
The problem of audio playback
|
2017-01-06 16:15:40 +08:00 |
|
Jare Guo
|
8f8c0e6cab
|
Merge pull request #1415 from zilongshanren/fix-toggle-event-issue
fix toggle check/uncheck event emit
|
2017-01-06 15:44:11 +08:00 |
|
zilongshanren
|
3ee0c88e33
|
fix toggle check/uncheck event emit
|
2017-01-06 15:26:22 +08:00 |
|
Jare Guo
|
6c205d032c
|
Merge pull request #1414 from zilongshanren/add-fillcolor-to-richtext
Add outline tag to richtext
|
2017-01-05 17:09:17 +08:00 |
|
zilongshanren
|
9c436f0bcc
|
add label outline to richtext
|
2017-01-05 16:59:49 +08:00 |
|
zilongshanren
|
1a799671e5
|
finish outline tag parser
|
2017-01-05 16:37:14 +08:00 |
|
zilongshanren
|
8a89d303d9
|
add more outline tests
|
2017-01-05 16:17:46 +08:00 |
|
zilongshanren
|
98c151c405
|
add outline color
|
2017-01-04 16:55:50 +08:00 |
|
Jare Guo
|
69aef0634e
|
Merge pull request #1413 from zilongshanren/fix-scrollbar-size-issue
Fix scrollbar size issue
|
2017-01-04 16:02:53 +08:00 |
|
zilongshanren
|
0e3a66e71c
|
fix scrollbar size less than scrollview size
|
2017-01-04 15:57:10 +08:00 |
|
zilongshanren
|
802b59354e
|
don't resize bar node size to it's parent
|
2017-01-04 14:41:34 +08:00 |
|
Jare Guo
|
f71bd7ad36
|
Merge pull request #1411 from knoxHuang/v1.4
Add the Canvas defaults to the project settings for fireball/issues/4602
|
2017-01-04 11:11:37 +08:00 |
|
knoxHuang
|
9130bf34a1
|
Add the Canvas defaults to the project settings for fireball/issues/4602
|
2017-01-04 11:10:46 +08:00 |
|
zilongshanren
|
2da17ecbb8
|
fix pageview_indicator cellSize tooltip
|
2017-01-04 10:50:14 +08:00 |
|
Jare Guo
|
3ba9e8f39e
|
Merge pull request #1412 from natural-law/issue5006
Solve the error when close application with DragonBones on native.
|
2017-01-03 18:36:14 +08:00 |
|
zhangbin
|
9ef7374324
|
Solve the error when close application with DragonBones on native.
|
2017-01-03 18:29:22 +08:00 |
|
VisualSJ
|
3342821082
|
Add parameter for Audio
|
2017-01-03 16:22:57 +08:00 |
|
pandamicro
|
4013c99521
|
Always use user inputed url as id
|
2016-12-30 17:59:08 +08:00 |
|
pandamicro
|
e2d2480613
|
Fix some raw assets not being set the correct type issue
|
2016-12-30 17:57:57 +08:00 |
|
Jare Guo
|
92e8054669
|
Merge pull request #1408 from zilongshanren/fix-editbox-background-images
fix EditBox API docs typo
|
2016-12-30 15:32:37 +08:00 |
|
zilongshanren
|
b1e7855d70
|
fix typo
|
2016-12-30 11:26:01 +08:00 |
|
pandamicro
|
85e6852b5b
|
Improve orientation check
|
2016-12-30 10:17:19 +08:00 |
|
pandamicro
|
e89e498718
|
Fix clippingNode alphaThreshold property
|
2016-12-30 10:17:19 +08:00 |
|
Wang Nan
|
ae545eacb9
|
Merge pull request #1405 from jareguo/temp2
initialization callback for game.run should be invoked before cc.game.EVENT_GAME_INITED
|
2016-12-29 15:25:55 +08:00 |
|
Wang Nan
|
03e31f8dd9
|
Merge pull request #1407 from 2youyou2/watch
fixed watch sourcemaps error
|
2016-12-29 15:25:23 +08:00 |
|
Wang Nan
|
16746b7bd4
|
Merge pull request #1397 from natural-law/issue4989
Update the event listeners implementation of Spine.
|
2016-12-29 14:13:26 +08:00 |
|
Wang Nan
|
9279764bd7
|
Merge pull request #1406 from natural-law/hot-fix
Remove the usage of bind in DragonBones addEvent on JSB.
|
2016-12-29 13:59:20 +08:00 |
|
zhangbin
|
5d64ffa913
|
Remove the usage of bind in DragonBones addEvent on JSB.
|
2016-12-29 12:01:14 +08:00 |
|
Wang Nan
|
2c555cfa3d
|
Merge pull request #1401 from natural-law/issue4959
Add interface setNodeToParentTransform for the rendering of DragonBones.
|
2016-12-29 11:10:05 +08:00 |
|
zhangbin
|
940f00be83
|
Support cancel the usage of specified transform.
|
2016-12-29 10:54:51 +08:00 |
|
Wang Nan
|
bf52d85afa
|
Merge pull request #1403 from jareguo/master
remove deprecated files
|
2016-12-29 10:43:50 +08:00 |
|
Wang Nan
|
2087c599f1
|
Merge pull request #1404 from jareguo/temp
prevent method name duplicate with property name
|
2016-12-29 10:39:42 +08:00 |
|
Jare Guo
|
5f51d3a764
|
initialization callback for game.run should be invoked before cc.game.EVENT_GAME_INITED
|
2016-12-29 10:01:37 +08:00 |
|