Skip to content

Commit 221b63a

Browse files
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
2 parents 8654c25 + 06e9c2d commit 221b63a

File tree

155 files changed

+1422
-12085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1422
-12085
lines changed

README.md

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,24 @@
1-
<img src="http://www.cocos2d-iphone.org/blog/wp-content/uploads/2014/03/angry_small.png">
1+
Cocos2D Swift
2+
=============
23

3-
cocos2d for iPhone
4-
==================
4+
[Cocos2D-Swift][1] is a framework for building 2D games, demos, and other
5+
graphical/interactive applications for iOS, Mac and Android.
6+
It is based on the [Cocos2D][2] design, but instead of using Python it uses Swift or Objective-C.
57

6-
[cocos2d for iPhone][1] is a framework for building 2D games, demos, and other
7-
graphical/interactive applications for iPod Touch, iPhone, iPad and Mac OS X.
8-
It is based on the [cocos2d][2] design, but instead of using Python it uses Objective-C.
9-
10-
cocos2d for iPhone is:
8+
Cocos2D Swift is:
119

1210
* Fast
1311
* Free
1412
* Easy to use
1513
* Community Supported
1614

1715

18-
Templates Installation
19-
-----------------------
20-
21-
1. Download the code from [Github][5]
22-
23-
2. Run the install script by executing `./install.sh` in Terminal
24-
(for more help and usage execute `./install.sh -h`)
16+
Creating New Projects
17+
---------------------
2518

26-
```bash
27-
Example:
28-
$ cd cocos2d-iphone # change directory to cocos2d-iphone
29-
$ ./install.sh # execute the template installer script
30-
```
19+
New Cocos2D projects are created with SpriteBuilder. SpriteBuilder is, just like Cocos2D, free and open source. You can get SpriteBuilder from [spritebuilder.com](http://spritebuilder.com) or from the Mac App Store. Projects created using SpriteBuilder contains the complete Cocos2D source code, and after the project has been created using SpriteBuilder is optional.
3120

32-
3. And then open `Xcode → New → New Project → cocos2d v3.x`
21+
You can find the full Cocos2D documentation and user guide at our [documentation page](http://www.cocos2d-swift.org/docs).
3322

3423
Features
3524
-------------
@@ -71,7 +60,7 @@ Mac OS X 10.6 (or newer), Xcode 4.2 (or newer)
7160

7261
Runtime Requirements
7362
--------------------
74-
* iOS 5.0 or newer for iOS games
63+
* iOS 6.0 or newer for iOS games
7564
* Snow Leopard (v10.6) or newer for Mac games
7665

7766

@@ -83,16 +72,9 @@ Running Tests
8372
2. Then click on `Xcode → Product → Run`
8473

8574

86-
Contributing to the Project
87-
--------------------------------
88-
89-
Did you find a bug? Do you have feature request? Do you want to merge a feature?
90-
91-
* [contributing to cocos2d][3]
92-
9375
Forum
9476
-----
95-
* [cocos2d for iphone forum][4]
77+
* [Cocos2D User Forum][4]
9678

9779

9880
Download from Github
@@ -107,6 +89,6 @@ Download from Github
10789
[1]: http://www.cocos2d-iphone.org "cocos2d for iPhone"
10890
[2]: http://www.cocos2d.org "cocos2d"
10991
[3]: http://www.cocos2d-iphone.org/wiki/doku.php/faq#i_found_a_bug_i_have_an_enhancement_proposal_what_should_i_do "contributing to cocos2d"
110-
[4]: http://www.cocos2d-iphone.org/forum "cocos2d for iPhone forum"
92+
[4]: http://forum.cocos2d-swift.org "cocos2d for iPhone forum"
11193
[5]: https://github.com/cocos2d/cocos2d-iphone/archive/develop-v3.zip
11294
[6]: http://www.chipmunk-physics.net

UnitTests/CCReaderTest.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ - (void)setUp
5555

5656
-(void)testReaderPerformance
5757
{
58+
/*
5859
NSString *filePath =[[NSBundle mainBundle] pathsForResourcesOfType:@"ccbi" inDirectory:@"Resources-shared/Tests"][0];
5960
XCTAssertNotNil(filePath);
6061
@@ -69,6 +70,7 @@ -(void)testReaderPerformance
6970
}
7071
7172
NSLog(@"TimeToRun: %0.8f", machGetClockDiffS());
73+
*/
7274
}
7375

7476
- (void)tearDown

cocos2d-tests-ios.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
B7EE69811818760700B983FE /* CCSprite9SliceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE69801818760700B983FE /* CCSprite9SliceTest.m */; };
7070
B7EE69CF1819D82300B983FE /* CCLayoutTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE69CE1819D82300B983FE /* CCLayoutTest.m */; };
7171
B7EE6A28181B075E00B983FE /* CCSliderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE6A27181B075E00B983FE /* CCSliderTest.m */; };
72-
D29698121926DF7500BBB097 /* CCEffectPongTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D29698111926DF7500BBB097 /* CCEffectPongTest.m */; };
7372
D2B4894C1917EE6700C3443A /* CCEffectsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B4894B1917EE6700C3443A /* CCEffectsTest.m */; };
7473
D3395F1A187F83E600F22C74 /* CCMemoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D3395F19187F83E600F22C74 /* CCMemoryTests.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
7574
D340E10E185660BE006E605C /* CCPhysicsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D340E10C185660BE006E605C /* CCPhysicsTest.m */; };
@@ -194,7 +193,6 @@
194193
B7EE69801818760700B983FE /* CCSprite9SliceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSprite9SliceTest.m; path = "cocos2d-ui-tests/tests/CCSprite9SliceTest.m"; sourceTree = SOURCE_ROOT; };
195194
B7EE69CE1819D82300B983FE /* CCLayoutTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCLayoutTest.m; path = "cocos2d-ui-tests/tests/CCLayoutTest.m"; sourceTree = SOURCE_ROOT; };
196195
B7EE6A27181B075E00B983FE /* CCSliderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSliderTest.m; path = "cocos2d-ui-tests/tests/CCSliderTest.m"; sourceTree = SOURCE_ROOT; };
197-
D29698111926DF7500BBB097 /* CCEffectPongTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCEffectPongTest.m; path = "cocos2d-ui-tests/tests/CCEffectPongTest.m"; sourceTree = SOURCE_ROOT; };
198196
D2B4894B1917EE6700C3443A /* CCEffectsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCEffectsTest.m; path = "cocos2d-ui-tests/tests/CCEffectsTest.m"; sourceTree = SOURCE_ROOT; };
199197
D3395F19187F83E600F22C74 /* CCMemoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCMemoryTests.m; sourceTree = "<group>"; };
200198
D340E10C185660BE006E605C /* CCPhysicsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCPhysicsTest.m; path = "cocos2d-ui-tests/tests/CCPhysicsTest.m"; sourceTree = SOURCE_ROOT; };
@@ -381,7 +379,6 @@
381379
D3B2A7E4187DD60B00406C5A /* CCBMFontTest.m */,
382380
A6167B92189A7D4D0044D391 /* VertexZTest.m */,
383381
A664A4EE18A3D9B8006184B8 /* PositioningTest.m */,
384-
D29698111926DF7500BBB097 /* CCEffectPongTest.m */,
385382
);
386383
name = Tests;
387384
path = "cocos2d-ui-tests/tests";
@@ -657,7 +654,6 @@
657654
D3870C6018B440150033D885 /* SpritePerformanceTest.m in Sources */,
658655
B71B088217EA5B6A0082EBC0 /* CCScrollViewTest.m in Sources */,
659656
B7EE697918186D5200B983FE /* CCTextFieldTest.m in Sources */,
660-
D29698121926DF7500BBB097 /* CCEffectPongTest.m in Sources */,
661657
B7E2620017E7D321007067F0 /* AppDelegate.m in Sources */,
662658
0E28FE1A197FCE4500F78989 /* CCCacheTest.m in Sources */,
663659
B77060AB1832E3310043CC67 /* CCTextureCacheTest.m in Sources */,

0 commit comments

Comments
 (0)