Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3

Former-commit-id: 724393c

Author: jjxtra

Chipmunk7-ios.xcodeproj/project.pbxproj

@@ -397,7 +397,6 @@
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -421,7 +420,6 @@
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -430,6 +428,7 @@
 		D3E5F01B0AA32EAC004E361B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -446,13 +445,14 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/external/Chipmunk/include\"";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DDEBUG",
 					"-ffast-math",
 				);
+				SDKROOT = iphoneos;
 				WARNING_CFLAGS = (
 					"-Wall",
 					"-W",
@@ -466,6 +466,7 @@
 		D3E5F01C0AA32EAC004E361B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -482,12 +483,14 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/external/Chipmunk/include\"";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DNDEBUG",
 					"-ffast-math",
 				);
+				SDKROOT = iphoneos;
 				WARNING_CFLAGS = (
 					"-Wall",
 					"-W",

UnitTests/CCPhysicsTests.m

@@ -361,46 +361,50 @@ -(void)testBasicSequences11
 
 -(void)testDynamicAnchorPoint
 {
+	cpFloat accuracy = 1e-4;
+	
 	CCPhysicsNode *physicsNode = [CCPhysicsNode node];
 
 	CCNode *node = [CCNode node];
 	node.contentSize = CGSizeMake(2, 2);
 	node.anchorPoint = ccp(0.5, 0.5);
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
 	node.physicsBody.type = CCPhysicsBodyTypeDynamic;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode addChild:node];
 	[physicsNode onEnter];
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.rotation = 90;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode onExit];
 }
 
 -(void)testStaticAnchorPoint
 {
+	cpFloat accuracy = 1e-4;
+	
 	CCPhysicsNode *physicsNode = [CCPhysicsNode node];
 
 	CCNode *node = [CCNode node];
 	node.contentSize = CGSizeMake(2, 2);
 	node.anchorPoint = ccp(0.5, 0.5);
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
 	node.physicsBody.type = CCPhysicsBodyTypeStatic;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode addChild:node];
 	[physicsNode onEnter];
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.rotation = 90;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode onExit];
 }

cocos2d-ios.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-11bc1d4cdb4f251665a23432b31a4395f2e92a41
+4bf2f73a96f043b11ee11d5725f7f4a14bcb4c5f

cocos2d-tests-ios.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-e0b7d0d766cb18fbd60978ab63f4115adb941160
+06369bce67a32b973ff96054cf1489afadb70db2

cocos2d-ui-tests/MainMenu.m

@@ -73,6 +73,7 @@ - (id) init
     // Load resources
     [[CCSpriteFrameCache sharedSpriteFrameCache] registerSpriteFramesFile:@"Interface.plist"];
     [[CCSpriteFrameCache sharedSpriteFrameCache] registerSpriteFramesFile:@"Sprites.plist"];
+    [[CCSpriteFrameCache sharedSpriteFrameCache] registerSpriteFramesFile:@"TilesAtlassed.plist"];
 
     // Make the node the same size as the parent container (i.e. the screen)
     self.contentSizeType = CCSizeTypeNormalized;