Merge branch 'develop' of https://github.com/spritebuilder/cocos2d-swift into private-develop

Author: slembcke

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -465,6 +465,11 @@ - (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
@@ -506,25 +511,12 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
                     }
                 }
             }
-            
-            // 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;
 }
 

external/ObjectAL/Session/OALAudioSession.m

@@ -33,7 +33,7 @@
 #import "ARCSafe_MemMgmt.h"
 #import "OALNotifications.h"
 
-#if __CC_PLATFORM_IOS || __CC_PLATFORM_MAC
+#if __CC_PLATFORM_IOS
 
 #import <AudioToolbox/AudioToolbox.h>
 #import "IOSVersion.h"
@@ -780,7 +780,8 @@ - (void)inputIsAvailableChanged:(BOOL)isInputAvailable
 
 #endif /* __IPHONE_OS_VERSION_MAX_ALLOWED */
 
-#elif __CC_PLATFORM_ANDROID // ANDROID
+
+#elif __CC_PLATFORM_ANDROID || __CC_PLATFORM_MAC// ANDROID
 #pragma mark Android OALAudioSession
 #import "CCDirector.h"
 @implementation OALAudioSession