Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3

Former-commit-id: b3fc902

Author: slembcke

AUTHORS

@@ -24,6 +24,9 @@ People and companies, who have contributed, in alphabetical order.
 * Apportable (http://www.apportable.com)
     Making it all happen
 
+* Christian Enevoldsen
+    Improved scroll view class
+
 * Dominik Hadl
     Templates, scripts and other ninja stuff
 
@@ -50,9 +53,6 @@ People and companies, who have contributed, in alphabetical order.
     Coordination and planning
     Sprite Builder integration
     Countless other contributions
-    
-* Christian Enevoldsen
-    Improved scroll view class
 
 Thanks to Wangsheng, Shintaro Kaneko, frranck and Yannick Loriot, Magician, masanorythm, Jogn Vu for various minor contributions.
 Also thanks to all those who contributed on git, helped us testing, and took part in the discussions even if their suggestions didn't make it to release.

RELEASE TODO.txt

@@ -5,18 +5,24 @@ Update the file VERSION with latest version number.
 Add no CR/LF or any other formatting to the file.
 
 2)
-Update cocos2d.m, with the correct version number
+Update install.sh
+Edit the line 
+COCOS2D_VER="Cocos2D-v3.x.x”
+with the correct version number
 
 3)
-Add any new authors to the AUTHORS file
+Update cocos2d.m, with the correct version number
 
 4)
-Add major changes and additions to the file RELEASE_NOTES
+Add any new authors to the AUTHORS file
 
 5)
-Tag the release, with the according version number
+Add major changes and additions to the file RELEASE_NOTES
 
 6)
+Tag the release, with the according version number
+
+7)
 Currently two set of files are made available to the users, upon release
 a) A DMG, automating the install process
 b) a ZIP, allowing for manual install

install.sh

@@ -13,7 +13,7 @@
 # Variables setup
 # ----------------------------------------------------
 SCRIPT_VER="v0.9.5"
-COCOS2D_VER="Cocos2D-v3.0.0.RC.2"
+COCOS2D_VER="Cocos2D-v3.0.0"
 COCOS2D_DST_DIR="cocos2d v3.x"
 SCRIPT_DIR="$(dirname $0)"
 

templates/cocos2d iOS Newton.xctemplate/Classes/AppDelegate.h

@@ -0,0 +1,13 @@
+//
+//  AppDelegate.h
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
+//
+// -----------------------------------------------------------------------
+
+#import "cocos2d.h"
+
+@interface AppDelegate : CCAppDelegate
+@end

templates/cocos2d iOS Newton.xctemplate/Classes/AppDelegate.m

@@ -0,0 +1,55 @@
+//
+//  AppDelegate.m
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
+//
+// -----------------------------------------------------------------------
+
+#import "AppDelegate.h"
+#import "IntroScene.h"
+#import "HelloWorldScene.h"
+
+@implementation AppDelegate
+
+// 
+-(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+	// This is the only app delegate method you need to implement when inheriting from CCAppDelegate.
+	// This method is a good place to add one time setup code that only runs when your app is first launched.
+	
+	// Setup Cocos2D with reasonable defaults for everything.
+	// There are a number of simple options you can change.
+	// If you want more flexibility, you can configure Cocos2D yourself instead of calling setupCocos2dWithOptions:.
+	[self setupCocos2dWithOptions:@{
+		// Show the FPS and draw call label.
+		CCSetupShowDebugStats: @(YES),
+		
+		// More examples of options you might want to fiddle with:
+		// (See CCAppDelegate.h for more information)
+		
+		// Use a 16 bit color buffer: 
+//		CCSetupPixelFormat: kEAGLColorFormatRGB565,
+		// Use a simplified coordinate system that is shared across devices.
+//		CCSetupScreenMode: CCScreenModeFixed,
+		// Run in portrait mode.
+//		CCSetupScreenOrientation: CCScreenOrientationPortrait,
+		// Run at a reduced framerate.
+//		CCSetupAnimationInterval: @(1.0/30.0),
+		// Run the fixed timestep extra fast.
+//		CCSetupFixedUpdateInterval: @(1.0/180.0),
+		// Make iPad's act like they run at a 2x content scale. (iPad retina 4x)
+//		CCSetupTabletScale2X: @(YES),
+	}];
+	
+	return YES;
+}
+
+-(CCScene *)startScene
+{
+	// This method should return the very first scene to be run when your app starts.
+	return [IntroScene scene];
+}
+
+@end

templates/cocos2d iOS Newton.xctemplate/Classes/HelloWorldScene.h

@@ -0,0 +1,27 @@
+//
+//  HelloWorldScene.h
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
+//
+// -----------------------------------------------------------------------
+
+// Importing cocos2d.h and cocos2d-ui.h, will import anything you need to start using Cocos2D v3
+#import "cocos2d.h"
+#import "cocos2d-ui.h"
+
+// -----------------------------------------------------------------------
+
+/**
+ *  The main scene
+ */
+@interface HelloWorldScene : CCScene
+
+// -----------------------------------------------------------------------
+
++ (HelloWorldScene *)scene;
+- (id)init;
+
+// -----------------------------------------------------------------------
+@end

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

@@ -0,0 +1,129 @@
+//
+//  HelloWorldScene.m
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
+//
+// -----------------------------------------------------------------------
+
+#import "HelloWorldScene.h"
+#import "IntroScene.h"
+#import "NewtonScene.h"
+
+// -----------------------------------------------------------------------
+#pragma mark - HelloWorldScene
+// -----------------------------------------------------------------------
+
+@implementation HelloWorldScene
+{
+    CCSprite *_sprite;
+}
+
+// -----------------------------------------------------------------------
+#pragma mark - Create & Destroy
+// -----------------------------------------------------------------------
+
++ (HelloWorldScene *)scene
+{
+    return [[self alloc] init];
+}
+
+// -----------------------------------------------------------------------
+
+- (id)init
+{
+    // Apple recommend assigning self with supers return value
+    self = [super init];
+    if (!self) return(nil);
+    
+    // Enable touch handling on scene node
+    self.userInteractionEnabled = YES;
+    
+    // Create a colored background (Dark Grey)
+    CCNodeColor *background = [CCNodeColor nodeWithColor:[CCColor colorWithRed:0.2f green:0.2f blue:0.2f alpha:1.0f]];
+    [self addChild:background];
+    
+    // Add a sprite
+    _sprite = [CCSprite spriteWithImageNamed:@"Icon-72.png"];
+    _sprite.position  = ccp(self.contentSize.width/2,self.contentSize.height/2);
+    [self addChild:_sprite];
+    
+    // Animate sprite with action
+    CCActionRotateBy* actionSpin = [CCActionRotateBy actionWithDuration:1.5f angle:360];
+    [_sprite runAction:[CCActionRepeatForever actionWithAction:actionSpin]];
+    
+    // Create a back button
+    CCButton *backButton = [CCButton buttonWithTitle:@"[ Menu ]" fontName:@"Verdana-Bold" fontSize:18.0f];
+    backButton.positionType = CCPositionTypeNormalized;
+    backButton.position = ccp(0.85f, 0.95f); // Top Right of screen
+    [backButton setTarget:self selector:@selector(onBackClicked:)];
+    [self addChild:backButton];
+
+    // done
+	return self;
+}
+
+// -----------------------------------------------------------------------
+
+- (void)dealloc
+{
+    // clean up code goes here
+}
+
+// -----------------------------------------------------------------------
+#pragma mark - Enter & Exit
+// -----------------------------------------------------------------------
+
+- (void)onEnter
+{
+    // always call super onEnter first
+    [super onEnter];
+    
+    // In pre-v3, touch enable and scheduleUpdate was called here
+    // In v3, touch is enabled by setting userInterActionEnabled for the individual nodes
+    // Per frame update is automatically enabled, if update is overridden
+    
+}
+
+// -----------------------------------------------------------------------
+
+- (void)onExit
+{
+    // always call super onExit last
+    [super onExit];
+}
+
+// -----------------------------------------------------------------------
+#pragma mark - Touch Handler
+// -----------------------------------------------------------------------
+
+-(void) touchBegan:(UITouch *)touch withEvent:(UIEvent *)event {
+    CGPoint touchLoc = [touch locationInNode:self];
+    
+    // Log touch location
+    CCLOG(@"Move sprite to @ %@",NSStringFromCGPoint(touchLoc));
+    
+    // Move our sprite to touch location
+    CCActionMoveTo *actionMove = [CCActionMoveTo actionWithDuration:1.0f position:touchLoc];
+    [_sprite runAction:actionMove];
+}
+
+// -----------------------------------------------------------------------
+#pragma mark - Button Callbacks
+// -----------------------------------------------------------------------
+
+- (void)onBackClicked:(id)sender
+{
+    // back to intro scene with transition
+    [[CCDirector sharedDirector] replaceScene:[IntroScene scene]
+                               withTransition:[CCTransition transitionPushWithDirection:CCTransitionDirectionRight duration:1.0f]];
+}
+
+- (void)onNewtonClicked:(id)sender
+{
+    [[CCDirector sharedDirector] pushScene:[NewtonScene scene] withTransition:[CCTransition transitionPushWithDirection:CCTransitionDirectionLeft duration:1.0f]];
+}
+
+// -----------------------------------------------------------------------
+@end

templates/cocos2d iOS Newton.xctemplate/Classes/IntroScene.h

@@ -0,0 +1,30 @@
+//
+//  IntroScene.h
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
+//
+// -----------------------------------------------------------------------
+
+// Importing cocos2d.h and cocos2d-ui.h, will import anything you need to start using cocos2d-v3
+#import "cocos2d.h"
+#import "cocos2d-ui.h"
+
+// -----------------------------------------------------------------------
+
+/**
+ *  The intro scene
+ *  Note, that scenes should now be based on CCScene, and not CCLayer, as previous versions
+ *  Main usage for CCLayer now, is to make colored backgrounds (rectangles)
+ *
+ */
+@interface IntroScene : CCScene
+
+// -----------------------------------------------------------------------
+
++ (IntroScene *)scene;
+- (id)init;
+
+// -----------------------------------------------------------------------
+@end