Merge branch 'v3.1' into develop

Conflicts:
	cocos2d/CCEffectRenderer.m

Author: slembcke

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -254,6 +254,8 @@ - (void)setAnimatedProperty:(NSString*)name forNode:(CCNode*)node toValue:(id)va
         } else if ([name isEqualToString:@"skew"]) {
             node.skewX = [[value objectAtIndex:0] floatValue];
             node.skewY = [[value objectAtIndex:1] floatValue];
+        } else if ([name isEqualToString:@"visible"]) {
+            [(CCSprite*)node setVisible:[value boolValue]];
         } else if ([name isEqualToString:@"spriteFrame"]) {
             [(CCSprite*)node setSpriteFrame:value];
         } else {
@@ -463,11 +465,6 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
     _paused = YES;
     [self clearAllActions];
 
-	// Set the running scene
-    _runningSequence      = [self sequenceFromSequenceId:seqId];
-    _runningSequence.time = 0.0f;
-	_runningSequence.tween = tweenDuration;
-	
 	[self addSequenceCallBacks:seqId tweenDuration:tweenDuration startTime:0];
 
     // Contains all Sequence Propertys / Keyframe
@@ -493,7 +490,7 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
         }
 
 
-        if(_lastSequence.sequenceId!=seqId) {
+        if(_lastSequence.sequenceId!=seqId || _runningSequence.sequenceId!=seqId) {
             _loop = NO;
 
             // Reset the nodes that may have been changed by other timelines
@@ -504,17 +501,30 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
 
                     id value = [nodeBaseValues objectForKey:propName];
 
-                    if (value) {
+                    if (value!=nil) {
                         [self setAnimatedProperty:propName forNode:node toValue:value tweenDuration:tweenDuration];
                     }
                 }
             }
+            
+            // Reset nodes that have sequence node properties, build first keyframe action sequence.
+            for (NSString* propName in seqNodeProps) {
+                CCBSequenceProperty* seqProp = [seqNodeProps objectForKey:propName];
+                [seqNodePropNames addObject:propName];
+                
+                // Reset Node State to First KeyFrame
+                [self setKeyFrameForNode:node sequenceProperty:seqProp tweenDuration:tweenDuration keyFrame:0];
+                
+            }
         }
 
-
 
     }
 
+    // Set the running scene
+    _runningSequence      = [self sequenceFromSequenceId:seqId];
+    _runningSequence.time = 0.0f;
+    
     _paused = NO;
 }
 
@@ -845,6 +855,13 @@ - (CCActionSequence*)createActionForNode:(CCNode*)node sequenceProperty:(CCBSequ
 
         CCActionInterval* action = [self actionFromKeyframe0:startKF andKeyframe1:endKF propertyName:seqProp.name node:node];
 
+        // Create delay to fix instant easing on non instant actions
+        if(startKF.easingType==kCCBKeyframeEasingInstant &&
+           ![seqProp.name isEqualToString:@"spriteFrame"] &&
+           ![seqProp.name isEqualToString:@"visible"]) {
+            [actions addObject:[CCActionDelay actionWithDuration:action.duration]];
+        }
+        
         if (action) {
             // Apply Easing
             action = [self easeAction:action easingType:startKF.easingType easingOpt:startKF.easingOpt];