Merge remote-tracking branch 'cocos/develop' into CCDirector/ResponderRefactoring

Conflicts:
	cocos2d-tests.xcodeproj/project.pbxproj

Author: andykorth

API-Index.md

@@ -1,2 +1,2 @@
 This is the Cocos2D-Swift Objective-C Class Reference.<br/>
-To learn Cocos2D/SpriteBuilder please read the [**Developer Guide**](http://makegameswith.us/docs/).
+To learn Cocos2D/SpriteBuilder please read the [**Developer Guide**](http://makeschool.com/docs/).

AUTHORS

@@ -57,7 +57,7 @@ People and companies, who have contributed, in alphabetical order.
 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.
 
-Special thanks to Ben-G from makegameswith.us, for making several outstanding V3 tutorials
+Special thanks to Ben-G (Benjamin Encz) from makeschool.com, for making several outstanding V3 tutorials
 
 cocos2d for iPhone 2.1 authors
 ------------------------------

Android/AppActivity.h

@@ -0,0 +1,31 @@
+/*
+ * SpriteBuilder: http://www.spritebuilder.org
+ *
+ * Copyright (c) 2014 Apportable Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#import "CCActivity.h"
+
+BRIDGE_CLASS("com.apportable.GLActivity")
+@interface PROJECTIDENTIFIERActivity : CCActivity
+
+@end

Android/AppActivity.m

@@ -0,0 +1,50 @@
+/*
+ * SpriteBuilder: http://www.spritebuilder.org
+ *
+ * Copyright (c) 2014 Apportable Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#import "PROJECTIDENTIFIERActivity.h"
+#import "PROJECTIDENTIFIERController.h"
+
+#import <AndroidKit/AndroidKeyEvent.h>
+
+@implementation PROJECTIDENTIFIERActivity
+
+
+- (BOOL)onKeyUp:(int32_t)keyCode keyEvent:(AndroidKeyEvent *)event
+{
+    if (keyCode == AndroidKeyEventKeycodeBack)
+    {
+        [self finish];
+    }
+    return NO;
+}
+
+- (void)run
+{
+    [super run];
+    
+    [PROJECTIDENTIFIERController setupApplication];
+}
+
+@end

Mac/AppDelegate.h

@@ -0,0 +1,6 @@
+#import <Cocoa/Cocoa.h>
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+
+@end
+

Mac/AppDelegate.m

@@ -0,0 +1,28 @@
+#import "AppDelegate.h"
+#import "CCPackageManager.h"
+#import "CCDirector_Private.h"
+#import "AppController.h"
+
+@interface AppDelegate ()
+
+@property (weak) IBOutlet NSWindow *window;
+@property (weak) IBOutlet CC_VIEW<CCView> *glView;
+@end
+
+@implementation AppDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    AppController *controller = [AppController sharedController];
+    controller.window = _window;
+    controller.glView = _glView;
+    [controller setupApplication];
+    return;
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification
+{
+    [[CCPackageManager sharedManager] savePackages];
+}
+
+@end

Mac/main.m

@@ -0,0 +1,7 @@
+//  Copyright (c) 2015 Apportable. All rights reserved.
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, const char * argv[]) {
+    return NSApplicationMain(argc, argv);
+}

Resources/Images/powered_normals.png

@@ -323,7 +323,6 @@ - (void)testCopyActionClearsState
     XCTAssertEqualWithAccuracy(actionCopy.elapsed, 0.0f, accuracy, @"Elapsed time was not reset.");
     XCTAssertEqualWithAccuracy(actionCopy.duration, 1.0f, accuracy, @"Duration should have been copied.");
     XCTAssertNil(actionCopy.target, @"Target not reset");
-    XCTAssertNil(actionCopy.originalTarget, @"originalTarget not reset");
 }
 
 - (void)testCopyActionClearsStateForCompletedActions
@@ -340,7 +339,6 @@ - (void)testCopyActionClearsStateForCompletedActions
     XCTAssertEqualWithAccuracy(actionCopy.elapsed, 0.0f, accuracy, @"Elapsed time was not reset.");
     XCTAssertEqualWithAccuracy(actionCopy.duration, 1.0f, accuracy, @"Duration should have been copied.");
     XCTAssertNil(actionCopy.target, @"Target not reset");
-    XCTAssertNil(actionCopy.originalTarget, @"originalTarget not reset");
 }
 
 

UnitTests/CCActionTest.m

@@ -15,7 +15,7 @@ - (void)setUp
 {
     [super setUp];
 
-    [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
+//    [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
 }
 
 -(void)testTextureCache