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

Former-commit-id: 2a8226f

Author: jtwigg

AUTHORS

@@ -39,7 +39,7 @@ People and companies, who have contributed, in alphabetical order.
     Apportable integration
 
 * Scott Lembcke
-    Co-author of chipmunk (http://howlingmoonsoftware.com/index.php)
+    Co-author of Chipmunk2D (http://chipmunk2d.net)
     CCPhysics
     Being the unstopable force
     An incredible number of contributions and suggestions
@@ -51,7 +51,7 @@ People and companies, who have contributed, in alphabetical order.
     Countless other contributions
 
 Thanks to Wangsheng, Shintaro Kaneko, frranck and Yannick Loriot, for various minor contributions.
-Also thanks to those who contributed on git, and took part in the discussions (Ben-G mentioned, but no-one forgotten) even if their suggestions didnt make it to release.
+Also thanks to those who contributed on git, and took part in the discussions (Ben-G mentioned, but no-one forgotten) even if their suggestions didn't make it to release.
 
 cocos2d for iPhone 2.1 authors
 ------------------------------

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

@@ -1 +1 @@
-40af2ecdcbc1edb7178d4fff03c6c62e439fee8a
+11bc1d4cdb4f251665a23432b31a4395f2e92a41

cocos2d-ui/CCTextField.m

@@ -24,8 +24,13 @@
 
 #import "CCTextField.h"
 #import "CCControlSubclass.h"
+#import "CCDirector_Private.h"
 
-@implementation CCTextField
+@implementation CCTextField {
+#if defined(APPORTABLE)
+    BOOL _textFieldIsEditing;
+#endif
+}
 
 + (id) textFieldWithSpriteFrame:(CCSpriteFrame *)frame
 {
@@ -189,6 +194,10 @@ - (void) layout
 #ifdef __CC_PLATFORM_IOS
 - (void)textFieldDidBeginEditing:(UITextField *)textField
 {
+#if defined(APPORTABLE)
+    _textFieldIsEditing = YES;
+#endif
+    
     if (_keyboardIsShown)
     {
         [self focusOnTextField];
@@ -197,6 +206,9 @@ - (void)textFieldDidBeginEditing:(UITextField *)textField
 
 - (void)textFieldDidEndEditing:(UITextField *)textField
 {
+#if defined(APPORTABLE)
+    _textFieldIsEditing = NO;
+#endif
     [self endFocusingOnTextField];
 }
 
@@ -256,7 +268,13 @@ - (void)keyboardWasShown:(NSNotification*)notification
 
     _keyboardHeight = kbSize.height;
 
-    if (_textField.isEditing)
+    BOOL focusOnTextField = _textField.isEditing;
+    
+#if defined(APPORTABLE)
+    focusOnTextField = _textFieldIsEditing;
+#endif
+    
+    if (focusOnTextField)
     {
         [self focusOnTextField];
     }
@@ -275,11 +293,18 @@ - (void) keyboardWillBeHidden:(NSNotification*) notification
 
 - (void) focusOnTextField
 {
+#if defined(APPORTABLE)
+    // Ensure that all textfields have actually been positioned before checkings textField.frame property,
+    // it's possible for the apportable keyboard notification to be fired before the mainloop has had a chance to kick of a scheduler update
+    CCDirector *director = [CCDirector sharedDirector];
+    [director.scheduler update:0.0];
+#endif
+    
     CGSize windowSize = [[CCDirector sharedDirector] viewSize];
 
     // Find the location of the textField
     float fieldCenterY = _textField.frame.origin.y - (_textField.frame.size.height/2);
-    
+
     // Upper third part of the screen
     float upperThirdHeight = windowSize.height / 3;
 
@@ -290,8 +315,16 @@ - (void) focusOnTextField
         // Calculate offset
         float dstYLocation = windowSize.height / 4;
         float offset = -(fieldCenterY - dstYLocation);
+        
         if (offset < -_keyboardHeight) offset = -_keyboardHeight;
 
+#if defined(APPORTABLE)
+        // Apportable does not support changing the openglview position, so we will just change the current scenes position instead
+        CCScene *runningScene = [[CCDirector sharedDirector] runningScene];
+        CGPoint newPosition = runningScene.position;
+        newPosition.y = (offset * -1);
+        runningScene.position = newPosition;
+#else
         // Calcualte target frame
         UIView* view = [[CCDirector sharedDirector] view];
         CGRect frame = view.frame;
@@ -303,16 +336,23 @@ - (void) focusOnTextField
         [UIView setAnimationDuration: 0.2f];
 
         view.frame = frame;
-        
         [UIView commitAnimations];
+#endif
     }
 }
 
 - (void) endFocusingOnTextField
 {
-    UIView* view = [[CCDirector sharedDirector] view];
-    
     // Slide the main view back down
+    
+#if defined(APPORTABLE)
+    // Apportable does not support changing the openglview position, so we will just change the current scenes position instead
+    CCScene *runningScene = [[CCDirector sharedDirector] runningScene];
+    CGPoint newPosition = CGPointZero;
+    newPosition.y = 0.0f;
+    runningScene.position = newPosition;
+#else
+    UIView* view = [[CCDirector sharedDirector] view];
     [UIView beginAnimations: @"textFieldAnim" context: nil];
     [UIView setAnimationBeginsFromCurrentState: YES];
     [UIView setAnimationDuration: 0.2f];
@@ -322,6 +362,8 @@ - (void) endFocusingOnTextField
     view.frame = frame;
 
     [UIView commitAnimations];
+#endif
+    
 }
 
 #endif

cocos2d.xcworkspace/xcshareddata/cocos2d.xccheckout

@@ -5,46 +5,46 @@
 	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
-	<string>BAB2EF7E-733F-4AA6-AF6F-DC4E801C55EE</string>
+	<string>A65B7BE5-B206-48B3-B33B-3563050F370A</string>
 	<key>IDESourceControlProjectName</key>
 	<string>cocos2d</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>DFBFA92A-FF14-4180-9A6E-807312C9A80A</key>
-		<string>https://github.com/slembcke/Chipmunk2D.git</string>
-		<key>FE1DDE1C-A6E5-4F8B-B7BE-96022811DCBE</key>
-		<string>https://github.com/cocos2d/cocos2d-iphone.git</string>
+		<key>625E0235-0E1B-4490-9002-129C7865DDEE</key>
+		<string>github:cocos2d/cocos2d-iphone.git</string>
+		<key>E2E4EF31-484E-410D-BA9A-5DA0CD3BD5CD</key>
+		<string>ssh://github.com/slembcke/Chipmunk2D.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>cocos2d.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>DFBFA92A-FF14-4180-9A6E-807312C9A80A</key>
-		<string>../external/Chipmunk</string>
-		<key>FE1DDE1C-A6E5-4F8B-B7BE-96022811DCBE</key>
+		<key>625E0235-0E1B-4490-9002-129C7865DDEE</key>
 		<string>..</string>
+		<key>E2E4EF31-484E-410D-BA9A-5DA0CD3BD5CD</key>
+		<string>../external/Chipmunk</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/cocos2d/cocos2d-iphone.git</string>
+	<string>github:cocos2d/cocos2d-iphone.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>110</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>FE1DDE1C-A6E5-4F8B-B7BE-96022811DCBE</string>
+	<string>625E0235-0E1B-4490-9002-129C7865DDEE</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>DFBFA92A-FF14-4180-9A6E-807312C9A80A</string>
+			<string>E2E4EF31-484E-410D-BA9A-5DA0CD3BD5CD</string>
 			<key>IDESourceControlWCCName</key>
 			<string>Chipmunk</string>
 		</dict>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>FE1DDE1C-A6E5-4F8B-B7BE-96022811DCBE</string>
+			<string>625E0235-0E1B-4490-9002-129C7865DDEE</string>
 			<key>IDESourceControlWCCName</key>
 			<string>cocos2d-iphone</string>
 		</dict>

cocos2d/CCNode.m

@@ -242,7 +242,12 @@ -(float) rotation
 }
 
 -(float)rotationalSkewX {
-	return _rotationalSkewX;
+	CCPhysicsBody *body = GetBodyIfRunning(self);
+	if(body){
+		return -CC_RADIANS_TO_DEGREES(body.absoluteRadians) + NodeToPhysicsRotation(self.parent);
+	} else {
+		return _rotationalSkewX;
+	}
 }
 
 -(void) setRotationalSkewX: (float)newX
@@ -255,7 +260,12 @@ -(void) setRotationalSkewX: (float)newX
 
 -(float)rotationalSkewY
 {
-	return _rotationalSkewY;
+	CCPhysicsBody *body = GetBodyIfRunning(self);
+	if(body){
+		return -CC_RADIANS_TO_DEGREES(body.absoluteRadians) + NodeToPhysicsRotation(self.parent);
+	} else {
+		return _rotationalSkewY;
+	}
 }
 
 -(void) setRotationalSkewY: (float)newY

cocos2d/Platforms/iOS/CCAppDelegate.m

@@ -35,6 +35,8 @@
 #import "kazmath/kazmath.h"
 #import "kazmath/GL/matrix.h"
 
+#import "OALSimpleAudio.h"
+
 NSString* const CCSetupPixelFormat = @"CCSetupPixelFormat";
 NSString* const CCSetupScreenMode = @"CCSetupScreenMode";
 NSString* const CCSetupScreenOrientation = @"CCSetupScreenOrientation";
@@ -242,6 +244,9 @@ - (void) setupCocos2dWithOptions:(NSDictionary*)config
 	// It can be RGBA8888, RGBA4444, RGB5_A1, RGB565
 	// You can change this setting at any time.
 	[CCTexture setDefaultAlphaPixelFormat:CCTexturePixelFormat_RGBA8888];
+    
+    // Initialise OpenAL
+    [OALSimpleAudio sharedInstance];
 
 	// Create a Navigation Controller with the Director
 	navController_ = [[CCNavigationController alloc] initWithRootViewController:director];