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

Author: cocojoe

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -85,7 +85,7 @@ -(void) onEnter {
 
 - (void)addNode:(CCNode*)node andSequences:(NSDictionary*)seq
 {
-#ifdef DEBUG
+#if DEBUG
 	//Sanity check sequences;
 
 	for (NSMutableDictionary* seqNodeProps in seq.allValues) {

cocos2d/CCDirector.m

@@ -265,7 +265,7 @@ -(void) calculateDeltaTime
 		_dt = MAX(0,_dt);
 	}
 
-#ifdef DEBUG
+#if DEBUG
 	// If we are debugging our code, prevent big delta time
 	if( _dt > 0.2f )
 		_dt = 1/60.0f;
@@ -864,7 +864,8 @@ -(void) showStats
 			NSString *fpsstr = [[NSString alloc] initWithFormat:@"%.1f", _frameRate];
 			[_FPSLabel setString:fpsstr];
 
-			NSString *draws = [[NSString alloc] initWithFormat:@"%4lu", (unsigned long)__ccNumberOfDraws];
+			// Subtract one for the stat label's own batch. This caused a lot of confusion on the forums...
+			NSString *draws = [[NSString alloc] initWithFormat:@"%4lu", (unsigned long)__ccNumberOfDraws - 1];
 			[_drawsLabel setString:draws];
 		}
 

cocos2d/CCDrawNode.m

@@ -56,6 +56,9 @@ @implementation CCDrawNode {
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCDrawNode class]) return;
+	
 	SHADER = [[CCShader alloc] initWithFragmentShaderSource:FRAGMENT_SHADER_SOURCE];
 }
 

cocos2d/CCNode+Debug.h

@@ -25,7 +25,7 @@
 
 #import "CCNode.h"
 
-#ifdef DEBUG
+#if DEBUG
 
 /** Debugging extensions of CCNode.  They are available when the DEBUG macro is defined at compile time. */
 @interface CCNode (Debug)

cocos2d/CCNode+Debug.m

@@ -26,7 +26,7 @@
 #import "CCNode+Debug.h"
 #import "CCNode_Private.h"
 
-#ifdef DEBUG
+#if DEBUG
 
 @implementation CCNode (Debug)
 

cocos2d/CCPhysicsBody.m

@@ -514,7 +514,7 @@ -(void)didRemoveFromPhysicsNode:(CCPhysicsNode *)physics
 //The following are properties which we track on the parent nodes in order to update the child nodes.
 NSString *  kDependantProperties[2] = { @"position", @"rotation"};
 
-#ifdef DEBUG
+#if DEBUG
 //The following are properties which cannot be animated. Changing their values after onEnter in unhandled.
 NSString *  kRestrictedProperties[3] = { @"scale", @"scaleX", @"scaleY"};
 #endif
@@ -531,7 +531,7 @@ -(void)trackParentTransformations:(CCPhysicsNode *)physics
             [node addObserver:self forKeyPath:kDependantProperties[i] options:NSKeyValueObservingOptionNew context:nil];
         }
 
-#ifdef DEBUG
+#if DEBUG
         for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)
         {
             [node addObserver:self forKeyPath:kRestrictedProperties[i] options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
@@ -552,7 +552,7 @@ -(void)removeParentTransformTracking:(CCPhysicsNode *)physics
         {
             [node removeObserver:self forKeyPath:kDependantProperties[i]];
         }
-#ifdef DEBUG
+#if DEBUG
         for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)
         {
             [node removeObserver:self forKeyPath:kRestrictedProperties[i]];
@@ -567,7 +567,7 @@ -(void)removeParentTransformTracking:(CCPhysicsNode *)physics
 
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
-#ifdef DEBUG
+#if DEBUG
     for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)
     {
         if([kRestrictedProperties[i] isEqualToString:keyPath])

cocos2d/CCRenderer.m

@@ -170,6 +170,9 @@ -(instancetype)initWithOptions:(NSDictionary *)options
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCBlendMode class]) return;
+	
 	CCBLENDMODE_CACHE = [[CCBlendModeCache alloc] init];
 
 	// Add the default modes
@@ -276,6 +279,9 @@ @implementation CCRenderState {
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCRenderState class]) return;
+	
 	CCRENDERSTATE_CACHE = [[CCRenderStateCache alloc] init];
 	CCRENDERSTATE_DEBUGCOLOR = [[self alloc] initWithBlendMode:CCBLEND_DISABLED shader:[CCShader positionColorShader] shaderUniforms:@{}];
 }

cocos2d/CCShader.m

@@ -449,6 +449,9 @@ -(instancetype)copyWithZone:(NSZone *)zone
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCShader class]) return;
+	
 	CC_SHADER_CACHE = [[CCShaderCache alloc] init];
 
 	// Setup the builtin shaders.

cocos2d/CCSpriteFrameCache.m

@@ -449,6 +449,10 @@ -(CCSpriteFrame*) spriteFrameByName:(NSString*)name
 
     if (!frame)
     {
+        // Check fileLookup.plist
+        NSString *newName = [[CCFileUtils sharedFileUtils].filenameLookup objectForKey:name];
+        name = newName ?: name;
+        
         // Try finding the frame in one of the registered sprite sheets
         NSString* spriteFrameFile = [_spriteFrameFileLookup objectForKey:name];
         if (spriteFrameFile) [self addSpriteFramesWithFile:spriteFrameFile];

cocos2d/CCTMXXMLParser.h

@@ -77,7 +77,7 @@ typedef enum ccTMXTileFlags_ {
 @property (nonatomic,readwrite)			BOOL visible;
 
 /** Layer Opacity. */
-@property (nonatomic,readwrite)			unsigned char opacity;
+@property (nonatomic,readwrite)			float opacity;
 
 /** True to release ownership of layer tiles. */
 @property (nonatomic,readwrite)			BOOL ownTiles;