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 |
|