Merge git://github.com/jjxtra/cocos2d-iphone into v3.0

Author: slembcke

cocos2d/CCLabelBMFont.m

@@ -206,7 +206,7 @@ - (NSMutableString *)parseConfigFile:(NSString*)fntFile
 			element->key = element->fontDef.charID;
 			HASH_ADD_INT(_fontDefDictionary, key, element);
 
-			[validCharsString appendString:[NSString stringWithFormat:@"%C", element->fontDef.charID]];
+            [validCharsString appendFormat:@"%C", element->fontDef.charID];
 		}
 //		else if([line hasPrefix:@"kernings count"]) {
 //			[self parseKerningCapacity:line];
@@ -424,6 +424,39 @@ -(void) parseKerningEntry:(NSString*) line
 #pragma mark -
 #pragma mark CCLabelBMFont
 
+static NSString* stringFromUInt32(UInt32 i)
+{
+    static NSString* strings[] = { @"0", @"1", @"2", @"3", @"4", @"5", @"6", @"7", @"8", @"9",
+        @"10", @"11", @"12", @"13", @"14", @"15", @"16", @"17", @"18", @"19",
+        @"20", @"21", @"22", @"23", @"24", @"25", @"26", @"27", @"28", @"29",
+        @"30", @"31", @"32", @"33", @"34", @"35", @"36", @"37", @"38", @"39",
+        @"40", @"41", @"42", @"43", @"44", @"45", @"46", @"47", @"48", @"49",
+        @"50", @"51", @"52", @"53", @"54", @"55", @"56", @"57", @"58", @"59",
+        @"60", @"61", @"62", @"63", @"64", @"65", @"66", @"67", @"68", @"69",
+        @"70", @"71", @"72", @"73", @"74", @"75", @"76", @"77", @"78", @"79",
+        @"80", @"81", @"82", @"83", @"84", @"85", @"86", @"87", @"88", @"89",
+        @"90", @"91", @"92", @"93", @"94", @"95", @"96", @"97", @"98", @"99",
+        @"100", @"101", @"102", @"103", @"104", @"105", @"106", @"107", @"108", @"109",
+        @"110", @"111", @"112", @"113", @"114", @"115", @"116", @"117", @"118", @"119",
+        @"120", @"121", @"122", @"123", @"124", @"125", @"126", @"127", @"128", @"129",
+        @"130", @"131", @"132", @"133", @"134", @"135", @"136", @"137", @"138", @"139",
+        @"140", @"141", @"142", @"143", @"144", @"145", @"146", @"147", @"148", @"149",
+        @"150", @"151", @"152", @"153", @"154", @"155", @"156", @"157", @"158", @"159",
+        @"160", @"161", @"162", @"163", @"164", @"165", @"166", @"167", @"168", @"169",
+        @"170", @"171", @"172", @"173", @"174", @"175", @"176", @"177", @"178", @"179",
+        @"180", @"181", @"182", @"183", @"184", @"185", @"186", @"187", @"188", @"189",
+        @"190", @"191", @"192", @"193", @"194", @"195", @"196", @"197", @"198", @"199",
+        @"200", @"201", @"202", @"203", @"204", @"205", @"206", @"207", @"208", @"209",
+        @"210", @"211", @"212", @"213", @"214", @"215", @"216", @"217", @"218", @"219",
+        @"220", @"221", @"222", @"223", @"224", @"225", @"226", @"227", @"228", @"229",
+        @"230", @"231", @"232", @"233", @"234", @"235", @"236", @"237", @"238", @"239",
+        @"240", @"241", @"242", @"243", @"244", @"245", @"246", @"247", @"248", @"249",
+        @"250", @"251", @"252", @"253", @"254", @"255" };
+
+
+    return ((i & 0xFFFFFF00) ? @(i).stringValue : strings[i]);
+}
+
 @interface CCLabelBMFont ()
 
 -(int) kerningAmountForFirst:(unichar)first second:(unichar)second;
@@ -553,7 +586,7 @@ - (void)updateLabel
             CCSprite *characterSprite;
             int justSkipped = 0;
             int idx = j+skip+justSkipped;
-            NSString* idxStr = [NSString stringWithFormat:@"%d", idx];
+            NSString* idxStr = stringFromUInt32(idx);
             while(!(characterSprite = (CCSprite *)[self getChildByName:idxStr recursively:NO]))
                 justSkipped++;
             skip += justSkipped;
@@ -678,7 +711,7 @@ - (void)updateLabel
                     index = i + j + lineNumber;
                     if (index < 0)
                         continue;
-                    NSString* indexStr1 = [NSString stringWithFormat:@"%d",(int)index];
+                    NSString* indexStr1 = stringFromUInt32((UInt32)index);
                     CCSprite *characterSprite = (CCSprite *)[self getChildByName:indexStr1 recursively:NO];
                     characterSprite.position = ccpAdd(characterSprite.position, ccp(shift, 0));
                 }
@@ -777,7 +810,7 @@ -(void) createFontChars
 		CCSprite *fontChar;
 
 		BOOL hasSprite = YES;
-        NSString* iStr = [NSString stringWithFormat:@"%d",(int)i];
+        NSString* iStr = stringFromUInt32((UInt32)i);
 		fontChar = (CCSprite*) [self getChildByName:iStr recursively:NO];
 		if( fontChar )
 		{
@@ -797,7 +830,7 @@ -(void) createFontChars
 				hasSprite = NO;
 			} else {
 				fontChar = [[CCSprite alloc] initWithTexture:_textureAtlas.texture rect:rect];
-                NSString* iStr1 = [NSString stringWithFormat:@"%d",(int)i];
+                NSString* iStr1 = stringFromUInt32((UInt32)i);
 				[self addChild:fontChar z:i name:iStr1];
 			}
 

cocos2d/Platforms/iOS/CCDirectorIOS.m

@@ -287,16 +287,29 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
 //		[_delegate willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
 //}
 
-
--(void) viewWillAppear:(BOOL)animated
+-(void) startAnimationIfPossible
 {
-	[super viewWillAppear:animated];
-
     UIApplicationState state = UIApplication.sharedApplication.applicationState;
     if (state != UIApplicationStateBackground)
     {
         [self startAnimation];
     }
+    else
+    {
+        // we are backgrounded, try again in 1 second, we want to make sure that this call eventually goes through in the event
+        // that there was a full screen view controller that caused additional stop animation calls
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^
+        {
+            [self startAnimationIfPossible];
+        });
+    }
+}
+
+-(void) viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+
+    [self startAnimationIfPossible];
 }
 
 -(void) viewDidAppear:(BOOL)animated