zhangbin
|
337e8346e6
|
Solve the error effect of DragonBones when re-enter an auto-released scene.
|
2017-01-06 18:00:28 +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 |
|
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 |
|
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 |
|
Jare Guo
|
338c8d90d2
|
prevent method name duplicate with property name
|
2016-12-28 23:51:03 +08:00 |
|
Jare Guo
|
63893905b7
|
Merge pull request #1402 from jareguo/master
prompt dialog if user wants to nest prefabs
|
2016-12-28 22:43:04 +08:00 |
|
Jare Guo
|
96ecaba46e
|
remove deprecated files
|
2016-12-28 22:42:28 +08:00 |
|
Jare Guo
|
5320ab1a65
|
name of prefab node should equals to prefab asset
|
2016-12-28 22:40:28 +08:00 |
|
Jare Guo
|
c4a1ec752f
|
prompt dialog if user wants to nest prefabs
|
2016-12-28 17:28:48 +08:00 |
|
zhangbin
|
10a9c22079
|
Add interface setNodeToParentTransform for the rendering of DragonBones.
|
2016-12-28 16:48:53 +08:00 |
|
Jare Guo
|
6ce7691b01
|
Merge pull request #1399 from jareguo/master
improve log if script not found
|
2016-12-28 14:05:03 +08:00 |
|
Jare Guo
|
8becd8f9d7
|
improve log if script not found
|
2016-12-27 17:04:20 +08:00 |
|
zhangbin
|
53f3b28ba5
|
Update the event listeners implementation of Spine.
|
2016-12-27 16:12:27 +08:00 |
|
Wang Nan
|
b117e49762
|
Merge pull request #1396 from jareguo/master
improve error message if asset not found
|
2016-12-26 17:05:14 +08:00 |
|
Jare Guo
|
adb94371aa
|
improve error message if asset not found
|
2016-12-26 16:35:31 +08:00 |
|
Wang Nan
|
64573f89b3
|
Merge pull request #1395 from jareguo/master
fileId of child of prefab should not cloned from existing node
|
2016-12-26 13:51:17 +08:00 |
|
Jare Guo
|
1b841bb31f
|
fileId of child of prefab should not cloned from existing node
|
2016-12-26 12:40:54 +08:00 |
|
Wang Nan
|
ca9bf7d5ed
|
Merge pull request #1392 from zilongshanren/add-label-atlas-support
add labelatlas support
|
2016-12-26 10:20:51 +08:00 |
|
Wang Nan
|
b4bce6cbd4
|
Merge pull request #1388 from natural-law/issue4921
Improve the implementation of event listeners in DragonBones.
|
2016-12-26 10:20:36 +08:00 |
|
zilongshanren
|
a514d4ddc6
|
make labelatlas inheritent from bitmapfont
|
2016-12-23 21:18:41 +08:00 |
|
zilongshanren
|
331c65ac5f
|
fix parsing fnt data string error
|
2016-12-23 17:57:27 +08:00 |
|
zilongshanren
|
025f92da24
|
finish labelatlas
|
2016-12-23 17:43:38 +08:00 |
|
Jare Guo
|
b3a5a54140
|
Merge pull request #1390 from jareguo/master
fully support serialization for FastDefined value types
|
2016-12-23 14:22:07 +08:00 |
|
Jare Guo
|
31efbebb60
|
fully support serialization for FastDefined value types
|
2016-12-23 14:11:45 +08:00 |
|
Jare Guo
|
18f0e4181f
|
Merge pull request #1389 from natural-law/hot-fix
Solve the error when using getBoundingBox method of SGSkeleton.
|
2016-12-23 09:57:01 +08:00 |
|
zhangbin
|
c770273a92
|
Solve the error when using getBoundingBox method of SGSkeleton.
|
2016-12-23 09:53:15 +08:00 |
|
zhangbin
|
0b6018d664
|
Add missing methods.
|
2016-12-22 17:21:28 +08:00 |
|
zhangbin
|
426afd3f39
|
Fix : once armatureName is changed, the listeners added before will not be invoked.
|
2016-12-22 17:00:04 +08:00 |
|
zhangbin
|
058121c1ad
|
Mixin CCArmatureDisplay with EventTarget in jsb environment.
|
2016-12-22 16:39:58 +08:00 |
|
Jare Guo
|
b199e49992
|
Merge pull request #1383 from zilongshanren/add-bitmap-font-batch-v2
add bmfont batch rendering
|
2016-12-22 11:29:06 +08:00 |
|
Jare Guo
|
de1c6b174b
|
Merge pull request #1384 from natural-law/issue4891
Update the runtime version of DragonBones.
|
2016-12-22 11:20:59 +08:00 |
|
Jare Guo
|
a093f4b41c
|
Merge pull request #1386 from pandamicro/master
Fix getReferenceKey issue and fix loadResDir no result issue
|
2016-12-22 11:06:17 +08:00 |
|
pandamicro
|
2040a82eb1
|
Revert changes to CCAssetLibrary
|
2016-12-22 11:03:35 +08:00 |
|