Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' into navmesh

This commit is contained in:
pandamicro 2015-06-18 00:36:37 +08:00
parent a94b49bdef 5b23e8b381
commit bcf9659408
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin

@ -1 +1 @@
Subproject commit 70a736b030f5766a97740e7deea5558f056bdd36
Subproject commit 1fd5d8c9c117d57fbba60ab4b4880d726b3a8002

7
tests/js-tests/src/tests_resources.js
View File

@ -1097,5 +1097,8 @@ var g_ccs2 = [
"ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png"
];
res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist";
res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png";
if (!cc.sys.isNative) {
var res = res || {};
res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist";
res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png";
}