pandamicro
|
0af950dc70
|
Use EventTarget to emit EVENT_HIDE & EVENT_SHOW
|
2016-05-19 11:02:17 +08:00 |
|
Jare Guo
|
829cde80e8
|
Merge pull request #686 from VisualSJ/master
删除部分audio测试 fix cocos-creator/fireball#3008
|
2016-05-18 11:57:27 +08:00 |
|
ViusualSJ
|
b187f08c70
|
remove audio source tests
|
2016-05-18 11:52:23 +08:00 |
|
Wang Nan
|
f680c2c591
|
Merge pull request #685 from dabingnn/label_add_outline
adjust outline effect
|
2016-05-17 18:28:42 +08:00 |
|
Huabing.Xu
|
e2c12e672c
|
multiply width by 2
|
2016-05-17 18:13:44 +08:00 |
|
Huabing.Xu
|
714a9816e9
|
adjust outline effect
|
2016-05-17 17:53:27 +08:00 |
|
Jare Guo
|
0c9cce3de4
|
Merge pull request #683 from knoxHuang/master
fix MotionStreak color example
|
2016-05-17 16:26:17 +08:00 |
|
knoxHuang
|
ca6ae57179
|
fix MotionStreak color example
|
2016-05-17 16:24:13 +08:00 |
|
Wang Nan
|
7a328ab6a7
|
Merge pull request #682 from knoxHuang/master
add color for MotionStreak and fix motionStreak warning.
|
2016-05-17 16:03:21 +08:00 |
|
knoxHuang
|
3a5a0d0d4d
|
add color for MotionStreak and fix motionStreak warning.
|
2016-05-17 15:58:33 +08:00 |
|
Nan Wang
|
32beee604f
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2016-05-17 14:10:02 +08:00 |
|
Nan Wang
|
2d170fd1a1
|
merged visualsj
|
2016-05-17 14:09:36 +08:00 |
|
Wang Nan
|
edf92d24a5
|
Merge pull request #679 from dabingnn/label_add_outline
add width for stroke
|
2016-05-17 14:02:10 +08:00 |
|
Nan Wang
|
017f573473
|
merge v1.0
|
2016-05-17 13:00:03 +08:00 |
|
Huabing.Xu
|
a9d5ea5053
|
add width for stroke
|
2016-05-17 12:13:30 +08:00 |
|
Jare Guo
|
d4f1eb6f68
|
Merge pull request #657 from pandamicro/v1.0
Fix setSiblingIndex and some code cleanup
|
2016-05-17 12:00:37 +08:00 |
|
pandamicro
|
f4c86f906a
|
Fix event order not changed in setSiblings and some code cleanup
|
2016-05-17 11:57:21 +08:00 |
|
Jare Guo
|
e73080fcee
|
Merge pull request #678 from 2youyouo2/collider
fixed collision manager
|
2016-05-17 11:42:44 +08:00 |
|
2youyouo2
|
2366d29215
|
fixed collision manager
|
2016-05-17 11:29:25 +08:00 |
|
Jare Guo
|
a8ab54b558
|
Merge pull request #674 from jareguo/temp
add preload lifecycle method
|
2016-05-17 11:26:13 +08:00 |
|
Jare Guo
|
fcaa3aadc2
|
add test for #2561
|
2016-05-17 11:18:54 +08:00 |
|
pandamicro
|
7976787915
|
Merge pull request #676 from jareguo/master
support minimized serialization
|
2016-05-17 10:36:42 +08:00 |
|
Wang Nan
|
0c9d8cee53
|
Merge pull request #663 from natural-law/issue2717
Solve the error in unschedule.
|
2016-05-17 09:24:15 +08:00 |
|
Wang Nan
|
df62232316
|
Merge pull request #670 from dabingnn/label_add_outline
Label add outline
|
2016-05-17 09:23:50 +08:00 |
|
Jare Guo
|
10b259a21c
|
support minimized serialization
|
2016-05-17 00:39:27 +08:00 |
|
Jare Guo
|
3fb7b9f52d
|
Merge pull request #672 from jareguo/master
add preloadScene
|
2016-05-16 15:48:18 +08:00 |
|
Jare Guo
|
142aeed175
|
add preload lifecycle method
|
2016-05-16 15:41:49 +08:00 |
|
ViusualSJ
|
69d786985e
|
Merge origin:master CCAudioSource.js
|
2016-05-16 14:00:29 +08:00 |
|
Jare Guo
|
a29873819b
|
Merge pull request #675 from zilongshanren/refactor-widget-manager
refactoring Widget, don't visit scene every frame
|
2016-05-16 11:48:24 +08:00 |
|
zilongshanren
|
693787493b
|
don't reset nodes dirty flag in loadScene
|
2016-05-16 11:46:32 +08:00 |
|
zilongshanren
|
80fa6e78d9
|
refactoring Widget, don't visit scene every frame
|
2016-05-16 10:47:57 +08:00 |
|
Huabing.Xu
|
0d00b4e9fd
|
fix typo
|
2016-05-16 10:17:48 +08:00 |
|
Wang Nan
|
32acd2b60c
|
Merge pull request #673 from natural-law/issue2995
Solve the error meta data of tmx file on windows.
|
2016-05-13 18:37:01 +08:00 |
|
zhangbin
|
f6797eedcc
|
Solve the error meta data of tmx file on windows.
|
2016-05-13 18:27:37 +08:00 |
|
Jare Guo
|
880f0e28ca
|
add preloadScene
|
2016-05-13 17:37:16 +08:00 |
|
Jare Guo
|
28e6ae187d
|
Merge pull request #668 from jareguo/master
remove cc.sys.isNative in html5
|
2016-05-13 17:12:18 +08:00 |
|
ViusualSJ
|
c8eec29aed
|
simulator audio bug
|
2016-05-13 14:44:53 +08:00 |
|
Huabing.Xu
|
ae7a97debc
|
Merge branch 'v1.0' into label_add_outline
|
2016-05-13 14:12:32 +08:00 |
|
Wang Nan
|
5d9ce5d57e
|
Merge pull request #669 from cocos-creator/v1.0
merge V1.0
|
2016-05-13 13:45:01 +08:00 |
|
Jare Guo
|
f8edcbe802
|
remove cc.sys.isNative in html5
|
2016-05-13 11:21:22 +08:00 |
|
pandamicro
|
74a53fd5b4
|
Merge pull request #665 from jareguo/v1.0
fix memory leak in JSB
|
2016-05-13 11:19:52 +08:00 |
|
Jare Guo
|
1ba10d8122
|
fix memory leak in JSB
|
2016-05-13 11:10:37 +08:00 |
|
Huabing.Xu
|
101e710683
|
implement outline effect
|
2016-05-13 10:32:20 +08:00 |
|
Wang Nan
|
003b309a63
|
Merge pull request #666 from VisualSJ/master_2673
tintTo 第二个参数允许传入cc.color
|
2016-05-12 18:49:59 +08:00 |
|
ViusualSJ
|
b6097d0294
|
indent
|
2016-05-12 18:41:56 +08:00 |
|
Huabing.Xu
|
c8a56b13f7
|
add outline effect
|
2016-05-12 18:38:34 +08:00 |
|
Jare Guo
|
83f28c26ca
|
Merge pull request #667 from zilongshanren/remove-all-events-on-node
make emit code more robust
|
2016-05-12 18:25:27 +08:00 |
|
zilongshanren
|
7011bf2a3d
|
make emit code more robust
|
2016-05-12 18:23:30 +08:00 |
|
ViusualSJ
|
791a790d2c
|
tintTo support cc.Color
|
2016-05-12 18:06:46 +08:00 |
|
Jare Guo
|
0b84eb8ff4
|
Merge pull request #664 from 2youyouo2/anim
stop animation on destroy
|
2016-05-12 17:40:41 +08:00 |
|