Jare Guo
|
9db1044cac
|
Merge pull request #815 from cocos-creator/v1.1
Sync V1.1
|
2016-06-21 14:53:37 +08:00 |
|
Jare Guo
|
c8ba6efcf7
|
Merge pull request #814 from 2youyou2/animation
load event curve at last
|
2016-06-21 11:01:31 +08:00 |
|
2youyouo2
|
b151cbaf0f
|
load event curve at last
|
2016-06-21 10:51:49 +08:00 |
|
Jare Guo
|
0bbbcdfc8f
|
Merge pull request #811 from zilongshanren/fix-button-interactive-toggle
fix bmfont and ttf shrink in editor
|
2016-06-20 18:04:50 +08:00 |
|
Jare Guo
|
b9fa9364e0
|
Merge pull request #812 from jareguo/temp
spine should use postImport
|
2016-06-20 10:13:22 +08:00 |
|
Jare Guo
|
ee5f5137e9
|
Merge pull request #810 from jareguo/v1.1
load json from pack
|
2016-06-19 22:22:18 +08:00 |
|
Jare Guo
|
0300460296
|
spine meta should support postImport being called twice
|
2016-06-18 16:19:27 +08:00 |
|
Jare Guo
|
afc8b48f5d
|
spine should use postImport
|
2016-06-17 20:29:10 +08:00 |
|
zilongshanren
|
14b9d3a8db
|
fix infinit recursive function call
|
2016-06-17 16:44:19 +08:00 |
|
zilongshanren
|
3b9d875014
|
fix bmfont and ttf shrink in editor
fix bmfont vertical clamp precision
fix a bunch of label issues
fix bmfont inital font metrics
|
2016-06-17 16:32:02 +08:00 |
|
Jare Guo
|
a9747315f0
|
forgot license....
|
2016-06-17 16:26:35 +08:00 |
|
Jare Guo
|
844a88219b
|
add debug info
|
2016-06-17 00:17:12 +08:00 |
|
Jare Guo
|
09c3563abf
|
implement load from pack
|
2016-06-16 19:01:59 +08:00 |
|
Jare Guo
|
16849e9992
|
add PackDownloader
|
2016-06-16 18:08:05 +08:00 |
|
Jare Guo
|
2882e90e81
|
add json-unpacker
|
2016-06-16 18:08:05 +08:00 |
|
Wang Nan
|
f09da6fdfc
|
Merge pull request #809 from nantas/v1.1
for preview engine do not include source content in map files
|
2016-06-16 17:39:08 +08:00 |
|
Nan Wang
|
77d1896e76
|
for preview engine do not include source content in map files
|
2016-06-16 17:34:20 +08:00 |
|
Jare Guo
|
4e11bb4e3f
|
Merge pull request #808 from zilongshanren/fix-button-interactive-toggle
fix toggle button interactable in editor
|
2016-06-16 17:31:11 +08:00 |
|
zilongshanren
|
91ded17834
|
add _previousNormalSprite to ctor
|
2016-06-16 17:13:15 +08:00 |
|
zilongshanren
|
64144568a3
|
fix toggle button interactable in editor
|
2016-06-16 17:04:19 +08:00 |
|
Wang Nan
|
f5b73b464c
|
Merge pull request #806 from natural-law/issue2215
Add method refreshUrl in CCLoader for Editor.
|
2016-06-16 14:16:23 +08:00 |
|
Wang Nan
|
db3fd67de5
|
Merge pull request #805 from zilongshanren/fixEditBoxDoubleClick
fix bmfont long word wrap
|
2016-06-16 13:40:56 +08:00 |
|
zilongshanren
|
46e2edc5ac
|
fix invalid letter
|
2016-06-16 12:05:52 +08:00 |
|
zhangbin
|
941d4e145d
|
Add method refreshUrl in CCLoader for Editor.
|
2016-06-16 11:51:33 +08:00 |
|
zilongshanren
|
36759f0032
|
fix bmfont long word wrap
|
2016-06-16 11:23:04 +08:00 |
|
Jare Guo
|
0090606853
|
Merge pull request #804 from knoxHuang/v1.1
fix createWithSpriteFrames api erro
|
2016-06-16 11:21:53 +08:00 |
|
knoxHuang
|
91c1746cbb
|
fix createWithSpriteFrames api erro
|
2016-06-16 11:21:12 +08:00 |
|
Wang Nan
|
250cc6f9c0
|
Merge pull request #803 from knoxHuang/v1.1
fix createWithSpriteFrames api erro for animation-clip.js
|
2016-06-16 11:07:51 +08:00 |
|
knoxHuang
|
4b76241f32
|
fix createWithSpriteFrames api erro for animation-clip.js
|
2016-06-16 11:00:19 +08:00 |
|
Jare Guo
|
a954020905
|
Merge pull request #802 from knoxHuang/v1.1
fix get loaded scene name is null bug
|
2016-06-16 10:21:25 +08:00 |
|
knoxHuang
|
97a9da6b3f
|
fix get loaded scene name is null bug
|
2016-06-16 10:15:24 +08:00 |
|
Jare Guo
|
4280508845
|
Merge pull request #800 from 2youyou2/name
refine code
|
2016-06-15 17:35:00 +08:00 |
|
pandamicro
|
5bcdffd2cb
|
Merge pull request #799 from knoxHuang/v1.1
fix prefab save data error fireball/issues/3352
|
2016-06-15 16:07:54 +08:00 |
|
2youyouo2
|
df6407c894
|
refine code
|
2016-06-15 16:04:54 +08:00 |
|
knoxHuang
|
5580368817
|
fix prefab save data error fireball/issues/3352
|
2016-06-15 15:56:13 +08:00 |
|
Wang Nan
|
9973c712e2
|
Merge pull request #798 from 2youyou2/name
prevent '/' in node name
|
2016-06-15 15:26:19 +08:00 |
|
2youyouo2
|
d00c6aa3c6
|
prevent '/' in node name
|
2016-06-15 15:13:58 +08:00 |
|
Wang Nan
|
4ec39fe511
|
Merge pull request #796 from knoxHuang/v1.1
fix node.targetOff Interface registered event cannot be cancelled
|
2016-06-15 14:27:09 +08:00 |
|
knoxHuang
|
2e3702e4f7
|
fix node.targetOff Interface registered event cannot be cancelled
|
2016-06-15 14:25:11 +08:00 |
|
Nan Wang
|
5db7aac968
|
Merge branch 'v1.1' of github.com:cocos-creator/engine
|
2016-06-15 11:47:13 +08:00 |
|
Jare Guo
|
35814fd14f
|
Merge pull request #794 from zilongshanren/fixEditBoxDoubleClick
Improve VideoPlayer docs and coding style
|
2016-06-15 11:47:09 +08:00 |
|
zilongshanren
|
134c3d8679
|
add docs to VideoPlayer component
|
2016-06-15 11:46:29 +08:00 |
|
pandamicro
|
c8194e2e90
|
Merge pull request #781 from mbunger/master
Chrome on Android is supporting WebGL since v. 30
|
2016-06-15 11:40:44 +08:00 |
|
zilongshanren
|
ae42b8950b
|
refactor private method of videoPlayer component
|
2016-06-15 11:22:58 +08:00 |
|
pandamicro
|
15f861a68c
|
Merge pull request #793 from pandamicro/v1.1
Fix director event registration issue
|
2016-06-14 18:40:34 +08:00 |
|
pandamicro
|
662716d320
|
Fix director event registration issue
|
2016-06-14 18:37:23 +08:00 |
|
pandamicro
|
ece83a22e0
|
Merge pull request #792 from knoxHuang/v1.1
fix CCLabel TextAlignment API
|
2016-06-14 17:42:55 +08:00 |
|
knoxHuang
|
89ab77b91a
|
fix CCLabel TextAlignment API
|
2016-06-14 17:00:06 +08:00 |
|
Martin Bünger
|
4b3c81acb7
|
Accidently deleted some code
|
2016-06-13 09:46:27 +02:00 |
|
Martin Bünger
|
25521e34fe
|
Fixed code
|
2016-06-13 09:43:32 +02:00 |
|