Merge pull request #1372 from oxeron/develop-v3.5-ext

s1ddok · s1ddok · commit 46c2b2e837bc · 2016-03-23T18:36:37.000+04:00
SpriteBuilder renamed to CocosBuilder
diff --git a/cocos2d-ext/CCBReader/CCAnimationManager.h b/cocos2d-ext/CCBReader/CCAnimationManager.h
@@ -46,7 +46,7 @@
 #pragma mark Animation Manager
 
 /**
- The animation manager plays back animations, usually created by a tool such as SpriteBuilder.
+ The animation manager plays back animations, usually created by a tool such as CocosBuilder.
  Any animation can have an arbitrary number of sequences (timelines) which each have keyframes for different properties.
  
  @note Animation names are case sensitive.
diff --git a/cocos2d-ext/CCBReader/CCBAnimationManager.h b/cocos2d-ext/CCBReader/CCBAnimationManager.h
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBAnimationManager.m b/cocos2d-ext/CCBReader/CCBAnimationManager.m
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBKeyframe.h b/cocos2d-ext/CCBReader/CCBKeyframe.h
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBKeyframe.m b/cocos2d-ext/CCBReader/CCBKeyframe.m
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBLocalizationManager.h b/cocos2d-ext/CCBReader/CCBLocalizationManager.h
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2013 Apportable Inc.
  *
diff --git a/cocos2d-ext/CCBReader/CCBLocalizationManager.m b/cocos2d-ext/CCBReader/CCBLocalizationManager.m
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2013 Apportable Inc.
  *
@@ -44,7 +43,7 @@ - (id) init
     self = [super init];
     if (!self) return NULL;
     
-    [self loadStringsFile:@"Strings.ccbLang"];
+    [self loadStringsFile:@"Strings.ccblang"];
     
     return self;
 }
@@ -58,7 +57,7 @@ - (void) loadStringsFile:(NSString*) file
     NSDictionary* ser = [NSDictionary dictionaryWithContentsOfFile:path];
     
     // Check that format of file is correct
-    NSAssert([[ser objectForKey:@"fileType"] isEqualToString:@"SpriteBuilderTranslations"], @"Invalid file format for SpriteBuilder localizations");
+    NSAssert([[ser objectForKey:@"fileType"] isEqualToString:@"CocosBuilderTranslations"], @"Invalid file format for CocosBuilder localizations");
     
     // Check that file version is correct
     NSAssert([[ser objectForKey:@"fileVersion"] intValue] == 1, @"Translation file version is incompatible with this reader");
@@ -72,7 +71,7 @@ - (void) loadStringsFile:(NSString*) file
     NSArray* preferredLangs = [NSLocale preferredLanguages];
     for (NSString* preferredLang in preferredLangs)
     {
-        // now loop thru languages from our spritebuilder
+        // now loop thru languages from our cocosbuilder
         for (NSString *localizedLanguage in languages)
         {
             // doing range of string as we might have en-GB set in our phone and that will match our en from the activeLanguages
diff --git a/cocos2d-ext/CCBReader/CCBReader.h b/cocos2d-ext/CCBReader/CCBReader.h
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
@@ -28,7 +27,7 @@
 #import "cocos2d.h"
 
 /**
- The CCBReader loads SpriteBuilder (CCB) documents.
+ The CCBReader loads CocosBuilder (CCB) documents.
  
  For the most part you'll just use one of these two methods:
  
@@ -41,10 +40,10 @@
     // load a CCB document wrapped in a CCScene instance
     CCScene* scene = [CCBReader loadAsScene:@"MyNode"];
  
- You can optionally pass an owner object to the CCBReader load methods. This owner object then gets assigned all of the SpriteBuilder document's member variables that are marked to be set to the "Owner".
+ You can optionally pass an owner object to the CCBReader load methods. This owner object then gets assigned all of the CocosBuilder document's member variables that are marked to be set to the "Owner".
  In all other cases owner is nil and assigning variables to Owner discards their assignment.
  
- When a SpriteBuilder document was loaded, all nodes created from the document will receive the didLoadFromCCB message, if implemented as follows:
+ When a CocosBuilder document was loaded, all nodes created from the document will receive the didLoadFromCCB message, if implemented as follows:
  
  **Objective-C:**
  
@@ -58,7 +57,7 @@
         NSLog("%@ did load", self)
     }
  
- Nodes created from a SpriteBuilder document will also have a valid CCAnimationManager instance assigned to their [CCNode animationManager] property.
+ Nodes created from a CocosBuilder document will also have a valid CCAnimationManager instance assigned to their [CCNode animationManager] property.
  */
 
 #define kCCBVersion 10
@@ -167,7 +166,7 @@ enum
 /// -----------------------------------------------------------------------
 
 /**
- *  Call this method to configure the CCFileUtils to work correctly with SpriteBuilder. It will setup search paths for the resources to use with the current device and resolution. It assumes that the SpriteBuilder resources has been published to a directory named Published-iOS that has been added as a blue folder in Xcode.
+ *  Call this method to configure the CCFileUtils to work correctly with CocosBuilder. It will setup search paths for the resources to use with the current device and resolution. It assumes that the CocosBuilder resources has been published to a directory named Published-iOS that has been added as a blue folder in Xcode.
  */
 + (void) configureCCFileUtils;
 
@@ -183,7 +182,7 @@ enum
 + (CCBReader*) reader;
 
 /// -----------------------------------------------------------------------
-/// @name Loading SpriteBuilder documents
+/// @name Loading CocosBuilder documents
 /// -----------------------------------------------------------------------
 
 /**
@@ -214,7 +213,7 @@ enum
 + (CCScene*) loadAsScene:(NSString*) file;
 
 /// -----------------------------------------------------------------------
-/// @name Loading SpriteBuilder documents with custom owner
+/// @name Loading CocosBuilder documents with custom owner
 /// -----------------------------------------------------------------------
 
 /**
diff --git a/cocos2d-ext/CCBReader/CCBReader.m b/cocos2d-ext/CCBReader/CCBReader.m
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
@@ -79,7 +78,7 @@ + (void) configureCCFileUtils
 {
     CCFileUtils *sharedFileUtils = [CCFileUtils sharedFileUtils];
     
-    // Setup file utils for use with SpriteBuilder
+    // Setup file utils for use with CocosBuilder
     [sharedFileUtils setEnableiPhoneResourcesOniPad:NO];
     
     sharedFileUtils.directoriesDict =
diff --git a/cocos2d-ext/CCBReader/CCBSequence.h b/cocos2d-ext/CCBReader/CCBSequence.h
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBSequenceProperty.h b/cocos2d-ext/CCBReader/CCBSequenceProperty.h
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBSequenceProperty.m b/cocos2d-ext/CCBReader/CCBSequenceProperty.m
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBsequence.m b/cocos2d-ext/CCBReader/CCBsequence.m
@@ -1,5 +1,4 @@
 /*
- * SpriteBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCBReader/CCBuilderReader.h b/cocos2d-ext/CCBReader/CCBuilderReader.h
@@ -1,5 +1,4 @@
 /*
- * CocosBuilder: http://www.spritebuilder.org
  *
  * Copyright (c) 2012 Zynga Inc.
  * Copyright (c) 2013 Apportable Inc.
diff --git a/cocos2d-ext/CCPackages/CCPackage.h b/cocos2d-ext/CCPackages/CCPackage.h
@@ -3,7 +3,7 @@
 
 @class CCPackageManager;
 
-/** CCPackage represents a Spritebuilder package. It's a data object managed by CCPackageManager describing the details of a package.
+/** CCPackage represents a CocosBuilder package. It's a data object managed by CCPackageManager describing the details of a package.
  A package is a bundle containing resource files.
 
  Most of the properties are readonly and are not meant to be set by a developer. They are set by the CCPackageManager.
diff --git a/cocos2d-ext/CCPackages/CCPackageHelper.h b/cocos2d-ext/CCPackages/CCPackageHelper.h
@@ -19,16 +19,16 @@
 + (NSString *)cachesFolder;
 
 /**
- * Maps a CCFileUtil's device/resolution suffix string, for instance `CCFileUtilsSuffixiPadHD`, to a SpriteBuilder resolution string, for instance `tablethd`.
+ * Maps a CCFileUtil's device/resolution suffix string, for instance `CCFileUtilsSuffixiPadHD`, to a CocosBuilder resolution string, for instance `tablethd`.
  *
  * @param suffix A CCFileUtils resolution suffix, as defined by the CCFileUtilsSuffix* constants.
- * @returns A SpriteBuilder resolution string, one of: `phone`, `phonehd`, `tablet`, `tablethd`. Returns `nil` if there is no matching SpriteBuilder suffix for the given input suffix.
+ * @returns A CocosBuilder resolution string, one of: `phone`, `phonehd`, `tablet`, `tablethd`. Returns `nil` if there is no matching CocosBuilder suffix for the given input suffix.
  * @since v3.3 and later
  */
 + (NSString *)ccFileUtilsSuffixToResolution:(NSString *)suffix;
 
 /**
- * Returns the preferred SpriteBuilder resolution string (`phone`, `phonehd`, `tablet`, `tablethd`) for the current Cocos2D setup by looking at the entries
+ * Returns the preferred CocosBuilder resolution string (`phone`, `phonehd`, `tablet`, `tablethd`) for the current Cocos2D setup by looking at the entries
  * in [CCFileUtils searchResolutionsOrder] array. If none can be found or mapped `phonehd` will be returned as default.
  * @since v3.3 and later
  */
diff --git a/cocos2d-ext/CCPackages/CCPackageManager.h b/cocos2d-ext/CCPackages/CCPackageManager.h
@@ -70,7 +70,7 @@
  *  Helpful if you are using packages of a different resolution.
  *
  *  @param name Name of the package
- *  @param resolution SpriteBuilder resolution string (ie `phonehd`)
+ *  @param resolution CocosBuilder resolution string (ie `phonehd`)
  *  @since v3.3 and later
  *  @see CCPackage
  */
@@ -81,7 +81,7 @@
  *  Helpful if you are using packages of a different resolution and os
  *
  *  @param name Name of the package
- *  @param resolution SpriteBuilder resolution string (ie `phonehd`)
+ *  @param resolution CocosBuilder resolution string (ie `phonehd`)
  *  @param os operating system string (ie iOS, Mac)
  *  @since v3.3 and later
  *  @see CCPackage
diff --git a/cocos2d-ext/CCParticles/CCParticleSystemBase.h b/cocos2d-ext/CCParticles/CCParticleSystemBase.h
@@ -138,7 +138,7 @@ typedef void (*_CC_UPDATE_PARTICLE_IMP)(id, SEL, _CCParticle*, CGPoint);
 
  ### Supported editors
  
- A particle system can be edited visually within SpriteBuilder or compatible 3rd party tools such as
+ A particle system can be edited visually within CocosBuilder or compatible 3rd party tools such as
  [Particle Designer](http://particledesigner.71squared.com/) and several others.
  
  @warning It is strongly recommended to use a visual design tool to create particle effects. Creating and tweaking particle
diff --git a/cocos2d-ui-tests/Resources-shared/Strings.ccbLang b/cocos2d-ui-tests/Resources-shared/Strings.ccbLang
@@ -5,7 +5,7 @@
 	<key>activeLanguages</key>
 	<array/>
 	<key>fileType</key>
-	<string>SpriteBuilderTranslations</string>
+	<string>CocosBuilderTranslations</string>
 	<key>fileVersion</key>
 	<integer>1</integer>
 	<key>translations</key>
diff --git a/cocos2d-ui-tests/TestGraphics.spritebuilder/Resources/Strings.ccbLang b/cocos2d-ui-tests/TestGraphics.spritebuilder/Resources/Strings.ccbLang
@@ -5,7 +5,7 @@
 	<key>activeLanguages</key>
 	<array/>
 	<key>fileType</key>
-	<string>SpriteBuilderTranslations</string>
+	<string>CocosBuilderTranslations</string>
 	<key>fileVersion</key>
 	<integer>1</integer>
 	<key>translations</key>
diff --git a/cocos2d-ui/CCControlSubclass.h b/cocos2d-ui/CCControlSubclass.h
@@ -55,7 +55,7 @@
 
 /**
  Can be implemented by sub-classes. Override this method if you are using custom properties and need to set them by name using the setValue:forKey method.
- This is needed for integration with editors such as SpriteBuilder. When overriding this method, make sure to call its super method if you cannot handle the key.
+ This is needed for integration with editors such as CocosBuilder. When overriding this method, make sure to call its super method if you cannot handle the key.
  
  @param value The value to set.
  @param key   The key to set the value for.
diff --git a/cocos2d/CCActionEase.h b/cocos2d/CCActionEase.h
@@ -300,7 +300,7 @@
 
 @end
 
-// SpriteBuilder Support Ease
+// CocosBuilder Support Ease
 @interface CCActionEaseInstant : CCActionEase <NSCopying>
 
 @end
diff --git a/cocos2d/CCActionInterval.m b/cocos2d/CCActionInterval.m
@@ -595,7 +595,7 @@ -(void) startWithTarget:(CCNode *)aTarget
 {
 	[super startWithTarget:aTarget];
     
-    // Simple Rotation (Support SpriteBuilder)
+    // Simple Rotation (Support CocosBuilder)
     if(_simple) {
         _startAngleX = _startAngleY = [(CCNode*)_target rotation];
         _diffAngleX = _dstAngleX - _startAngleX;
diff --git a/cocos2d/CCNode.h b/cocos2d/CCNode.h
@@ -110,7 +110,7 @@
  - CCSizeUnitInset - The content size will be the size of it's parent container, but inset by a number of points.
  - CCSizeUnitInsetScaled - The content size will be the size of it's parent container, but inset by a number of points multiplied by the UIScaleFactor.
  
- Even if the positions and content sizes are not set in points you can use actions to animate the nodes. See the examples and tests for more information on how to set positions and content sizes, or use SpriteBuilder to easily play around with the settings. There are also more positioning options available by using CCLayout and CCLayoutBox.
+ Even if the positions and content sizes are not set in points you can use actions to animate the nodes. See the examples and tests for more information on how to set positions and content sizes, or use CocosBuilder to easily play around with the settings. There are also more positioning options available by using CCLayout and CCLayoutBox.
  
 #### Prefer to use ..InPoints
  
@@ -706,7 +706,7 @@
 -(NSUInteger) numberOfRunningActions;
 
 /// -----------------------------------------------------------------------
-/// @name SpriteBuilder Animation Manager
+/// @name CocosBuilder Animation Manager
 /// -----------------------------------------------------------------------
 
 /**
diff --git a/cocos2d/CCNode.m b/cocos2d/CCNode.m
@@ -202,7 +202,7 @@ - (void)cleanup
 	// timers
 	[_children makeObjectsPerformSelector:@selector(cleanup)];
 #if CC_CCBREADER
-    // CCAnimationManager Cleanup (Set by SpriteBuilder)
+    // CCAnimationManager Cleanup (Set by CocosBuilder)
     [_animationManager performSelector:@selector(cleanup)];
 #endif
 }
diff --git a/cocos2d/Platforms/iOS/CCAppDelegate.h b/cocos2d/Platforms/iOS/CCAppDelegate.h
@@ -90,7 +90,7 @@
  *  - `CCSetupFixedUpdateInterval`: NSNumber with double. Specifies the desired interval between fixed updates. Should be smaller than `CCSetupAnimationInterval`. Defaults to `1.0/60.0` (60 Hz).
  *  - `CCSetupShowDebugStats`: NSNumber with bool. Specifies if the stats (FPS, frame time and draw call count) should be rendered. Defaults to NO.
  *  - `CCSetupTabletScale2X`: NSNumber with bool. If true, the iPad will be setup to act like it has a 512x384 points "logical" screen size with a "Retina" pixel resolution of 1024x768. 
- *      This makes it much easier to make universal iOS games. This is the default mode for SpriteBuilder projects. This value is ignored when using the fixed screen mode.
+ *      This makes it much easier to make universal iOS games. This is the default mode for CocosBuilder projects. This value is ignored when using the fixed screen mode.
  *
  *  - `CCSetupDepthFormat`: NSNumber with integer. Specifies the desired depth buffer format. Values are 0 (no depth buffering), `GL_DEPTH24_STENCIL8_OES` (8-Bit depth buffer) and `GL_DEPTH_COMPONENT24_OES` (24-bit depth buffer).
  *      Depth buffering is only needed in rare cases and comes at the expense of performance and additional memory usage.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`/*`
`2`		`- * SpriteBuilder: http://www.spritebuilder.org`
`3`	`2`	`*`
`4`	`3`	`* Copyright (c) 2012 Zynga Inc.`
`5`	`4`	`* Copyright (c) 2013 Apportable Inc.`