Skip to content
Browse files

Using new CocosDragon

  • Loading branch information...
1 parent 1fd3575 commit 5dc6bf5a8b9839b455e74757ba8f05b9569ad254 @ricardoquesada ricardoquesada committed
Showing with 9 additions and 17 deletions.
  1. +8 −4 cocos2d-ios.xcodeproj/project.pbxproj
  2. +0 −12 cocos2d-osx.xcodeproj/project.pbxproj
  3. +1 −1 tests/CocosDragonJS
View
12 cocos2d-ios.xcodeproj/project.pbxproj
@@ -1294,7 +1294,7 @@
A003A8A21656C56F00C7B792 /* settings-caption-tilt.png in Resources */ = {isa = PBXBuildFile; fileRef = A003A8561656C56F00C7B792 /* settings-caption-tilt.png */; };
A003A8A31656C56F00C7B792 /* settings-caption-touch.png in Resources */ = {isa = PBXBuildFile; fileRef = A003A8571656C56F00C7B792 /* settings-caption-touch.png */; };
A003A8A81656C58900C7B792 /* ccbResources in Resources */ = {isa = PBXBuildFile; fileRef = A003A8A41656C58900C7B792 /* ccbResources */; };
- A003A8A91656C58900C7B792 /* resources-hd in Resources */ = {isa = PBXBuildFile; fileRef = A003A8A51656C58900C7B792 /* resources-hd */; };
+ A003A8A91656C58900C7B792 /* resources-iphonehd in Resources */ = {isa = PBXBuildFile; fileRef = A003A8A51656C58900C7B792 /* resources-iphonehd */; };
A003A8AA1656C58900C7B792 /* resources-ipad in Resources */ = {isa = PBXBuildFile; fileRef = A003A8A61656C58900C7B792 /* resources-ipad */; };
A003A8AB1656C58900C7B792 /* resources-ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = A003A8A71656C58900C7B792 /* resources-ipadhd */; };
A003AC8C1657071100C7B792 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = A003AC8B1657071100C7B792 /* ccFPSImages.h */; };
@@ -2568,6 +2568,7 @@
A0D3A927149D2FAE0077CD93 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A0D3A8FE149D2FA40077CD93 /* BaseAppController.m */; };
A0D3A928149D2FAE0077CD93 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A0D3A8FE149D2FA40077CD93 /* BaseAppController.m */; };
A0D3A929149D2FAF0077CD93 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A0D3A8FE149D2FA40077CD93 /* BaseAppController.m */; };
+ A0D44E54165C57E5005D92C9 /* resources-iphone in Resources */ = {isa = PBXBuildFile; fileRef = A0D44E53165C57E5005D92C9 /* resources-iphone */; };
A0D6BFEF159B6A25008EED97 /* b1.png in Resources */ = {isa = PBXBuildFile; fileRef = 5001659D0E72DB470085673F /* b1.png */; };
A0D6BFF0159B6A25008EED97 /* b2.png in Resources */ = {isa = PBXBuildFile; fileRef = 5001659E0E72DB470085673F /* b2.png */; };
A0D6BFF1159B6A25008EED97 /* f1.png in Resources */ = {isa = PBXBuildFile; fileRef = 5001659F0E72DB470085673F /* f1.png */; };
@@ -5576,7 +5577,7 @@
A003A8561656C56F00C7B792 /* settings-caption-tilt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-caption-tilt.png"; sourceTree = "<group>"; };
A003A8571656C56F00C7B792 /* settings-caption-touch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-caption-touch.png"; sourceTree = "<group>"; };
A003A8A41656C58900C7B792 /* ccbResources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ccbResources; sourceTree = "<group>"; };
- A003A8A51656C58900C7B792 /* resources-hd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-hd"; sourceTree = "<group>"; };
+ A003A8A51656C58900C7B792 /* resources-iphonehd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-iphonehd"; sourceTree = "<group>"; };
A003A8A61656C58900C7B792 /* resources-ipad */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-ipad"; sourceTree = "<group>"; };
A003A8A71656C58900C7B792 /* resources-ipadhd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-ipadhd"; sourceTree = "<group>"; };
A003AC8B1657071100C7B792 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = "<group>"; };
@@ -6064,6 +6065,7 @@
A0CFE61D15BE3D0E00264229 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
A0D3A8FD149D2F9D0077CD93 /* BaseAppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BaseAppController.h; path = tests/BaseAppController.h; sourceTree = "<group>"; };
A0D3A8FE149D2FA40077CD93 /* BaseAppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BaseAppController.m; path = tests/BaseAppController.m; sourceTree = "<group>"; };
+ A0D44E53165C57E5005D92C9 /* resources-iphone */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-iphone"; sourceTree = "<group>"; };
A0D6C037159B6A25008EED97 /* JS Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JS Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A0D77A0E146E3244000960C7 /* markerFelt-hd.fnt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "markerFelt-hd.fnt"; sourceTree = "<group>"; };
A0D77A0F146E3244000960C7 /* markerFelt-hd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "markerFelt-hd.png"; sourceTree = "<group>"; };
@@ -8594,7 +8596,8 @@
isa = PBXGroup;
children = (
A003A8A41656C58900C7B792 /* ccbResources */,
- A003A8A51656C58900C7B792 /* resources-hd */,
+ A0D44E53165C57E5005D92C9 /* resources-iphone */,
+ A003A8A51656C58900C7B792 /* resources-iphonehd */,
A003A8A61656C58900C7B792 /* resources-ipad */,
A003A8A71656C58900C7B792 /* resources-ipadhd */,
A003A8081656C56F00C7B792 /* Bomb.ccbi */,
@@ -13749,9 +13752,10 @@
A003A8761656C56F00C7B792 /* main.js in Resources */,
A003A8781656C56F00C7B792 /* MainMenuScene.js in Resources */,
A003A8A81656C58900C7B792 /* ccbResources in Resources */,
- A003A8A91656C58900C7B792 /* resources-hd in Resources */,
+ A003A8A91656C58900C7B792 /* resources-iphonehd in Resources */,
A003A8AA1656C58900C7B792 /* resources-ipad in Resources */,
A003A8AB1656C58900C7B792 /* resources-ipadhd in Resources */,
+ A0D44E54165C57E5005D92C9 /* resources-iphone in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
12 cocos2d-osx.xcodeproj/project.pbxproj
@@ -130,9 +130,6 @@
A003A9581656CEE500C7B792 /* settings-caption-tilt.png in Resources */ = {isa = PBXBuildFile; fileRef = A003A90C1656CEE500C7B792 /* settings-caption-tilt.png */; };
A003A9591656CEE500C7B792 /* settings-caption-touch.png in Resources */ = {isa = PBXBuildFile; fileRef = A003A90D1656CEE500C7B792 /* settings-caption-touch.png */; };
A003A95E1656CEFE00C7B792 /* ccbResources in Resources */ = {isa = PBXBuildFile; fileRef = A003A95A1656CEFE00C7B792 /* ccbResources */; };
- A003A95F1656CEFE00C7B792 /* resources-hd in Resources */ = {isa = PBXBuildFile; fileRef = A003A95B1656CEFE00C7B792 /* resources-hd */; };
- A003A9601656CEFE00C7B792 /* resources-ipad in Resources */ = {isa = PBXBuildFile; fileRef = A003A95C1656CEFE00C7B792 /* resources-ipad */; };
- A003A9611656CEFE00C7B792 /* resources-ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = A003A95D1656CEFE00C7B792 /* resources-ipadhd */; };
A003ACA7165731D500C7B792 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = A003ACA5165731D500C7B792 /* ccFPSImages.h */; };
A003ACA8165731D500C7B792 /* ccFPSImages.m in Sources */ = {isa = PBXBuildFile; fileRef = A003ACA6165731D500C7B792 /* ccFPSImages.m */; };
A003ACA9165731FA00C7B792 /* ccFPSImages.m in Sources */ = {isa = PBXBuildFile; fileRef = A003ACA6165731D500C7B792 /* ccFPSImages.m */; };
@@ -6803,9 +6800,6 @@
A003A90C1656CEE500C7B792 /* settings-caption-tilt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-caption-tilt.png"; sourceTree = "<group>"; };
A003A90D1656CEE500C7B792 /* settings-caption-touch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-caption-touch.png"; sourceTree = "<group>"; };
A003A95A1656CEFE00C7B792 /* ccbResources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ccbResources; sourceTree = "<group>"; };
- A003A95B1656CEFE00C7B792 /* resources-hd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-hd"; sourceTree = "<group>"; };
- A003A95C1656CEFE00C7B792 /* resources-ipad */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-ipad"; sourceTree = "<group>"; };
- A003A95D1656CEFE00C7B792 /* resources-ipadhd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-ipadhd"; sourceTree = "<group>"; };
A003ACA5165731D500C7B792 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = "<group>"; };
A003ACA6165731D500C7B792 /* ccFPSImages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ccFPSImages.m; sourceTree = "<group>"; };
A009440015181C8D0029A5C6 /* MultithreadTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MultithreadTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -8582,9 +8576,6 @@
isa = PBXGroup;
children = (
A003A95A1656CEFE00C7B792 /* ccbResources */,
- A003A95B1656CEFE00C7B792 /* resources-hd */,
- A003A95C1656CEFE00C7B792 /* resources-ipad */,
- A003A95D1656CEFE00C7B792 /* resources-ipadhd */,
A003A8BE1656CEE500C7B792 /* Bomb.ccbi */,
A003A8BF1656CEE500C7B792 /* Bomb.js */,
A003A8CB1656CEE500C7B792 /* cloud.png */,
@@ -13206,9 +13197,6 @@
A003A9581656CEE500C7B792 /* settings-caption-tilt.png in Resources */,
A003A9591656CEE500C7B792 /* settings-caption-touch.png in Resources */,
A003A95E1656CEFE00C7B792 /* ccbResources in Resources */,
- A003A95F1656CEFE00C7B792 /* resources-hd in Resources */,
- A003A9601656CEFE00C7B792 /* resources-ipad in Resources */,
- A003A9611656CEFE00C7B792 /* resources-ipadhd in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
2 tests/CocosDragonJS
@@ -1 +1 @@
-Subproject commit 265f49386da1904e87579805e3f62bef5f793baa
+Subproject commit 5085ac147a9ab6031ff070f765f8ac6ee57ad93d

0 comments on commit 5dc6bf5

Please sign in to comment.
Something went wrong with that request. Please try again.