Merge pull request #520 from richardgroves/develop-v3

Fixing a typo in comments in onEnter in two Scene files in the new project template

Former-commit-id: 83178f7

Author: vlidholt

cocos2d/CCTransition.h

@@ -68,11 +68,17 @@ typedef NS_ENUM(NSInteger, CCTransitionDirection)
 
 
 /**
- *  Will downscale incoming and outgoing scene.
+ *  Will downscale outgoing scene.
  *  Can be used as an effect, or to decrease render time on complex scenes.
  *  Default 1.0.
  */
 @property (nonatomic, assign) float outgoingDownScale;
+
+/**
+ *  Will downscale incoming scene.
+ *  Can be used as an effect, or to decrease render time on complex scenes.
+ *  Default 1.0.
+ */
 @property (nonatomic, assign) float incomingDownScale;
 
 /**
@@ -89,10 +95,15 @@ typedef NS_ENUM(NSInteger, CCTransitionDirection)
 @property (nonatomic, assign) CCTexturePixelFormat transitionPixelFormat;
 
 /**
- *  Defines whether incoming and outgoing scene will be animated during transition.
+ *  Defines whether outgoing scene will be animated during transition.
  *  Default NO.
  */
 @property (nonatomic, getter = isOutgoingSceneAnimated) BOOL outgoingSceneAnimated;
+
+/**
+ *  Defines whether incoming scene will be animated during transition.
+ *  Default NO.
+ */
 @property (nonatomic, getter = isIncomingSceneAnimated) BOOL incomingSceneAnimated;
 
 /** The actual transition runtime in seconds. */

templates/cocos2d iOS.xctemplate/Classes/HelloWorldScene.m

@@ -82,7 +82,7 @@ - (void)onEnter
 
     // In pre-v3, touch enable and scheduleUpdate was called here
     // In v3, touch is enabled by setting userInterActionEnabled for the individual nodes
-    // Pr frame update is automatically enabled, if update is overridden
+    // Per frame update is automatically enabled, if update is overridden
 
 }
 
@@ -126,4 +126,4 @@ - (void)onNewtonClicked:(id)sender
 }
 
 // -----------------------------------------------------------------------
-@end
+@end

templates/cocos2d iOS.xctemplate/Newton/NewtonScene.m

@@ -189,7 +189,7 @@ - (void)onEnter
 
     // In pre-v3, touch enable and scheduleUpdate was called here
     // In v3, touch is enabled by setting userInterActionEnabled for the individual nodes
-    // Pr frame update is automatically enabled, if update is overridden
+    // Per frame update is automatically enabled, if update is overridden
 
     // Basically this will result in fewer having the need to override onEnter and onExit, but for clarity, it is shown
 }
@@ -298,4 +298,4 @@ - (void)update:(CCTime)delta
 }
 
 // -----------------------------------------------------------------------
-@end
+@end