Merge branch 'v3.2' into develop

Conflicts:
	external/ObjectAL

Author: slembcke

cocos2d-ui-tests/tests/CCBMFontTest.m

@@ -12,6 +12,7 @@
 static NSString *TEST_STRINGS[] = {
 	@"ABCDEFGHIJKLM\nNOPQRSTUVWXYZ",
 	@"abcdefghijklm\nnopqrstuvwxyz",
+	@"first line\u2028second line",
 	@",.?!;:'\"",
 	@"()[]{}<>\\|/\n",
 	@"@#$%^&*+-=_",

cocos2d/CCLabelBMFont.m

@@ -762,7 +762,7 @@ -(void) createFontChars
 	// since the Y position needs to be calcualted before hand
 	for(NSUInteger i=0; i < stringLen-1;i++) {
 		unichar c = [_string characterAtIndex:i];
-		if( c=='\n')
+		if([[NSCharacterSet newlineCharacterSet] characterIsMember:c])
 			quantityOfLines++;
 	}
 
@@ -776,7 +776,7 @@ -(void) createFontChars
 	for(NSUInteger i = 0; i<stringLen; i++) {
 		unichar c = [_string characterAtIndex:i];
 
-		if (c == '\n') {
+        if ([[NSCharacterSet newlineCharacterSet] characterIsMember:c]) {
 			nextFontPositionX = 0;
 			nextFontPositionY -= _configuration->_commonHeight;
 			continue;

cocos2d/CCNode.h

@@ -531,6 +531,17 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
  *
  *  @return A newly initialized CCTimer object.
  */
+ 
+ /**
+ * Schedules a custom selector with an interval time in seconds.
+ * If the custom selector you pass in is not already scheduled, this method simply schedules it for the first time.
+ * The difference between this method and the schedule:interval: method is that if the selector passed in this method is already scheduled, calling this method will only adjust the interval on the already scheduled method. In contrast, when you call schedule:interval: on an already scheduled selector, your custom selector will be unscheduled and then rescheduled.
+*  @param selector       Selector to execute.
+*  @param interval Interval between execution in seconds.
+ */
+-(CCTimer*)reschedule:(SEL)selector interval:(CCTime)interval;
+ 
+ 
 - (CCTimer *) scheduleOnce:(SEL) selector delay:(CCTime) delay;
 
 /**

cocos2d/CCNode.m

@@ -1184,6 +1184,32 @@ -(CCTimer *) schedule:(SEL)selector interval:(CCTime)interval
 	return [self schedule:selector interval:interval repeat:CCTimerRepeatForever delay:interval];
 }
 
+-(CCTimer*)reschedule:(SEL)selector interval:(CCTime)interval
+{
+    NSString *selectorName = NSStringFromSelector(selector);
+    
+    CCTimer *currentTimerForSelector = nil;
+    
+    for (CCTimer *timer in [_scheduler timersForTarget:self])
+    {
+        if([selectorName isEqual:timer.userData])
+        {
+            CCLOG(@"%@ was already scheduled on %@. Updating interval from %f to %f",NSStringFromSelector(selector),self,timer.repeatInterval,interval);
+            timer.repeatInterval = interval;
+            currentTimerForSelector = timer;
+            break;
+        }
+    }
+    
+    if (currentTimerForSelector == nil)
+    {
+        CCLOG(@"%@ was never scheduled. Scheduling for the first time.",selectorName);
+        currentTimerForSelector = [self schedule:selector interval:interval];
+    }
+
+    return currentTimerForSelector;
+}
+
 -(BOOL)unschedule_private:(SEL)selector
 {
 	NSString *selectorName = NSStringFromSelector(selector);

cocos2d/Platforms/iOS/CCAppDelegate.m

@@ -266,28 +266,32 @@ - (void) setupCocos2dWithOptions:(NSDictionary*)config
 // getting a call, pause the game
 -(void) applicationWillResignActive:(UIApplication *)application
 {
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].paused == NO) {
 		[[CCDirector sharedDirector] pause];
+	}
 }
 
 // call got rejected
 -(void) applicationDidBecomeActive:(UIApplication *)application
 {
 	[[CCDirector sharedDirector] setNextDeltaTimeZero:YES];
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].paused) {
 		[[CCDirector sharedDirector] resume];
+	}
 }
 
 -(void) applicationDidEnterBackground:(UIApplication*)application
 {
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].animating) {
 		[[CCDirector sharedDirector] stopAnimation];
+	}
 }
 
 -(void) applicationWillEnterForeground:(UIApplication*)application
 {
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].animating == NO) {
 		[[CCDirector sharedDirector] startAnimation];
+	}
 }
 
 // application will be killed