Wang Nan
|
788778b47f
|
Merge pull request #1135 from pandamicro/loader
Refactor CCLoader to support multi queues and better progression
|
2016-09-26 10:57:52 +08:00 |
|
zhangbin
|
6a0bcec5ad
|
Solve the reviewed issues:
1. Remove empty functions.
2. Use the added method in Editor to refresh the inspector.
3. Add DragonBones into modules config.
|
2016-09-23 15:37:58 +08:00 |
|
pandamicro
|
2d45da56c6
|
Refactor CCLoader to support multi queues and better progression
|
2016-09-22 17:30:02 +08:00 |
|
zilongshanren
|
66eb9c6db9
|
make html text parser modular
|
2016-09-21 16:10:37 +08:00 |
|
zilongshanren
|
4a19c75688
|
Add Toggle and Toggle Group
commit 88cc46ea71258d32698157c8b6cbd5453d98bffe
Merge: e4323ec 91c87a8
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Sep 21 14:16:52 2016 +0800
Merge branch 'master' into addCheckBox
commit e4323ecf3b21f54850228ff9a6bb3d81ce86462a
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Sep 21 14:11:26 2016 +0800
fix toggle group tooltip
commit 897fe28ec0f750c0c0c7fa01b19bd95f6ea7a6c6
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Sep 20 17:44:00 2016 +0800
update component doc string
commit 90559147b74d581b229c916521265c92f22b6205
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Sep 20 11:33:05 2016 +0800
remove executeInEditMode
commit 2c60439c4166f36c785c04d74e6d0d02aa6d7eb0
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Sep 20 10:55:19 2016 +0800
refactor checkmark
commit e91cab956f93df0460be7de960ad27fab23dbe42
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Sep 20 10:19:38 2016 +0800
add missing class docs
commit bf800a799873e0afa8026f98833cbbf73b00863c
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Sep 19 18:33:37 2016 +0800
rename member variables
commit a4f0e859f033a78a76797e3fb820ac897521aaf0
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Sep 19 18:20:11 2016 +0800
refine the Toggle and ToggleGroup
commit 54204c36c219f770ad58148b766f0419d25bf21c
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Sep 19 09:24:05 2016 +0800
add ToggleGroup
refactor toggle
fix button zoom scale
finish checkbox
finish toggle and togglegroup
commit 3a18c096ef49ada7e8cc9757cd2df2900743890c
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Sep 14 10:18:43 2016 +0800
add toggle.js
|
2016-09-21 14:19:28 +08:00 |
|
knoxHuang
|
9f5dc12c61
|
add slider component for fireball/issues/1462
|
2016-09-21 11:34:52 +08:00 |
|
knoxHuang
|
99765ac2f4
|
add pageview to componet for fireball/issues/1461
|
2016-09-12 10:37:15 +08:00 |
|
VisualSJ
|
cc8b9ed11b
|
Merge branch 'master' of github.com:cocos-creator/engine into master_audioEngine
Conflicts:
cocos2d/core/CCGame.js
|
2016-09-01 14:02:23 +08:00 |
|
zilongshanren
|
2f4da7092e
|
add RichText to modules.json
|
2016-08-26 10:07:08 +08:00 |
|
VisualSJ
|
5adb19ca26
|
Update audioEngine
|
2016-08-18 18:26:01 +08:00 |
|
2youyouo2
|
e92ef8e3ba
|
add graphics to modules.json
|
2016-06-30 11:43:33 +08:00 |
|
VisualSJ
|
210139ec89
|
Prevent the file missing from causing errors
|
2016-06-28 17:13:53 +08:00 |
|
ViusualSJ
|
e88b424b69
|
add modules entries
|
2016-06-23 16:07:09 +08:00 |
|
ViusualSJ
|
d2d2dcbc80
|
Merge Collider
|
2016-06-23 15:55:00 +08:00 |
|
ViusualSJ
|
cd3f9aa4ca
|
review code
|
2016-06-23 15:16:39 +08:00 |
|