Merge branch 'develop' into reorderSprite

Conflicts: cocos2d/CCSprite.m
brooklynpacket · Jul 29, 2011 · 41dadae · 41dadae
2 parents 790bbc1 + cf6ceee
commit 41dadae
Show file tree

Hide file tree

Showing 58 changed files with 169 additions and 348 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -37,8 +37,9 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
 		patches for MenuItemToggle that supports selectedIndex
 	* arya.irani:
 		CCCallFunc supports class methods (patch)
-	* asad.rehman:
+	* Asad ur Rehman (https://github.com/AsadR)
 		Menu doesn't receive touches when it is invisible (patch)
+		Menu doens't receive touches when one if its acenstors is invisible
 	* Atte Kotiranta (https://github.com/akotiranta)
 		Implemented setPriority in TouchDispatcher.
 		Added setPriority test in MenuTest
@@ -164,6 +165,8 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
 		Fixed CLang compiling warnings
 	* InsertWittyName (http://www.didev-studios.com/):
 		Texture2D allocs the right memory (patch)
+	* iomac (https://github.com/iomac):
+		CocosDenshion: Cleanup buffers to prevent noise in Mac
 	* Ishaq Malik:
 		patches for CocosNode
 	* Joao Caxaria:
@@ -374,7 +377,7 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
 		Author of bug #915 test case
 	* palter AT clozure.com
 		Texture fails gracefully if PVR image can't be loaded (patch)
-	* Pascal Bourque (http://www.polkapps.com/)
+	* Pascal Bourque (http://loopycube.com/)
 		Worked around memory leak in NSXMLParser used by TMXMaps
 	* Patrick Wolowicz:
 		mkatlas: added artifact removal by copying borders to margins

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,15 @@
+version 1.0.1 - 28-July-2011
+. [FIX] All: Implicit atomic properties converted to nonatomic
+. [FIX] All: Removed deprected code
+. [FIX] CCArray: copyWithZone fixed
+. [FIX] Director: frames -> totalFrames, and it works as expected. Value is not being reset.
+. [FIX] Menu: If any ancestor is invisible, then touches won't be accepted
+. [FIX] Node: vertexZ returns points, not "pixels"
+. [FIX] LabelTTF: don't crash when calling description after dealloc
+. [FIX] Tests: [window release] instead of [window dealloc]
+. [FIX] Texture: TextureCache#dump reports the right info (issue #1205)
+. [FIX-MAC] CocosDenshion: Cleanup buffers to prevent noise
+
 version 1.0.0 - 13-July-2011
 . [NEW] ccpSegmentIntersect & ccpPointIntersect: Added helper functions for ccpLineIntersect (issue #1193)
 . [NEW] ccConfig: Added possibility to define the configuration as preprocessor macros

diff --git a/CocosDenshion/CocosDenshion/CDOpenALSupport.m b/CocosDenshion/CocosDenshion/CDOpenALSupport.m
@@ -88,6 +88,8 @@ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 	theData = malloc(dataSize);
 	if (theData)
 	{
+		memset(theData, 0, dataSize);
+
 		AudioFileReadBytes(afid, false, 0, &dataSize, theData);
 		if(err == noErr)
 		{
@@ -195,6 +197,8 @@ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 	theData = malloc(dataSize);
 	if (theData)
 	{
+		memset(theData, 0, dataSize);
+
 		AudioBufferList		theDataBuffer;
 		theDataBuffer.mNumberBuffers = 1;
 		theDataBuffer.mBuffers[0].mDataByteSize = dataSize;

diff --git a/CocosDenshion/TestsAndDemos/DrumPad/DenshionDemo.m b/CocosDenshion/TestsAndDemos/DrumPad/DenshionDemo.m
@@ -546,7 +546,7 @@ -(void) applicationSignificantTimeChange:(UIApplication *)application
 
 - (void) dealloc
 {
-	[window dealloc];
+	[window release];
 	[super dealloc];
 }
 

diff --git a/DONORS b/DONORS
@@ -25,6 +25,7 @@ Alexeev, Andrei
 Amiri, Hesham (http://www.amiri.info/)
 Apple, Jonathan (http://www.jonathanapple.com/)
 Andrle, Tomas (http://www.catnapgames.com/)
+Azzoug, Adam
 Barreto, Leandro (http://www.leandro.co.uk)
 Barta, Markus (http://markus.barta.com)
 Berry, Sean
@@ -61,6 +62,7 @@ Itterheim, Steffen (http://www.gametooldeveloper.com/)
 Khoo, Benny
 KLICKTOCK PTY LTD (http://www.klicktock.com/)
 Kostjens, Barry (http://www.pushpanic.com/)
+Koutavas, Jay (http://heynow.com/)
 Kovalishin, Andrey (http://http://hunter-hamster.com/)
 Georgiadis, Dionisis
 Guitarra del Sur (http://www.guitargame.net)

diff --git a/README.mdown b/README.mdown
@@ -54,7 +54,7 @@ Mac OS X 10.6, Xcode 3.2.3 (or newer)
 Runtime Requirements
 --------------------
   * iOS 3.0 or newer for iOS games
-  * Snow Leopard (v10.6) or newer for Mac games
+  * Snow Leopard (v10.5) or newer for Mac games
 
 
 Files and Folders

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-===== cocos2d for iPhone v1.0.0 Release Notes =====
+===== cocos2d for iPhone v1.0.1 Release Notes =====
 
 
 Please, see the online document:

diff --git a/cocos2d-ios.xcodeproj/project.pbxproj b/cocos2d-ios.xcodeproj/project.pbxproj
@@ -12645,6 +12645,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				COPY_PHASE_STRIP = NO;
 				DOXYGEN_PATH = /Applications/Doxygen.app/Contents/Resources/doxygen;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -12663,6 +12664,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DOXYGEN_PATH = /Applications/Doxygen.app/Contents/Resources/doxygen;

diff --git a/cocos2d/CCAnimation.h b/cocos2d/CCAnimation.h
@@ -69,25 +69,6 @@
  */
 +(id) animationWithFrames:(NSArray*)frames delay:(float)delay;
 
-/** Creates a CCAnimation with a name
- @since v0.99.3
- @deprecated Will be removed in 1.0.1. Use "animation" instead.
- */
-+(id) animationWithName:(NSString*)name DEPRECATED_ATTRIBUTE;
-
-/** Creates a CCAnimation with a name and frames
- @since v0.99.3
- @deprecated Will be removed in 1.0.1. Use "animationWithFrames" instead.
- */
-+(id) animationWithName:(NSString*)name frames:(NSArray*)frames DEPRECATED_ATTRIBUTE;
-
-/** Creates a CCAnimation with a name and delay between frames. */
-+(id) animationWithName:(NSString*)name delay:(float)delay DEPRECATED_ATTRIBUTE;
-
-/** Creates a CCAnimation with a name, delay and an array of CCSpriteFrames. */
-+(id) animationWithName:(NSString*)name delay:(float)delay frames:(NSArray*)frames DEPRECATED_ATTRIBUTE;
-
-
 /** Initializes a CCAnimation with frames.
  @since v0.99.5
 */
@@ -98,28 +79,6 @@
  */
 -(id) initWithFrames:(NSArray *)frames delay:(float)delay;
 
-/** Initializes a CCAnimation with a name
- @since v0.99.3
- @deprecated Will be removed in 1.0.1. Use "init" instead.
- */
--(id) initWithName:(NSString*)name DEPRECATED_ATTRIBUTE;
-
-/** Initializes a CCAnimation with a name and frames
- @since v0.99.3
- @deprecated Will be removed in 1.0.1. Use "initWithFrames" instead.
- */
--(id) initWithName:(NSString*)name frames:(NSArray*)frames DEPRECATED_ATTRIBUTE;
-
-/** Initializes a CCAnimation with a name and delay between frames.
- @deprecated Will be removed in 1.0.1. Use "initWithFrames:nil delay:delay" instead.
-*/
--(id) initWithName:(NSString*)name delay:(float)delay DEPRECATED_ATTRIBUTE;
-
-/** Initializes a CCAnimation with a name, delay and an array of CCSpriteFrames.
- @deprecated Will be removed in 1.0.1. Use "initWithFrames:frames delay:delay" instead.
-*/
--(id) initWithName:(NSString*)name delay:(float)delay frames:(NSArray*)frames DEPRECATED_ATTRIBUTE;
-
 /** Adds a frame to a CCAnimation. */
 -(void) addFrame:(CCSpriteFrame*)frame;
 

diff --git a/cocos2d/CCAnimation.m b/cocos2d/CCAnimation.m
@@ -48,26 +48,6 @@ +(id) animationWithFrames:(NSArray*)frames delay:(float)delay
 	return [[[self alloc] initWithFrames:frames delay:delay] autorelease];
 }
 
-+(id) animationWithName:(NSString*)name
-{
-	return [[[self alloc] initWithName:name] autorelease];
-}
-
-+(id) animationWithName:(NSString*)name frames:(NSArray*)frames
-{
-	return [[[self alloc] initWithName:name frames:frames] autorelease];
-}
-
-+(id) animationWithName:(NSString*)aname delay:(float)d frames:(NSArray*)array
-{
-	return [[[self alloc] initWithName:aname delay:d frames:array] autorelease];
-}
-
-+(id) animationWithName:(NSString*)aname delay:(float)d
-{
-	return [[[self alloc] initWithName:aname delay:d] autorelease];
-}
-
 -(id) init
 {
 	return [self initWithFrames:nil delay:0];
@@ -88,32 +68,6 @@ -(id) initWithFrames:(NSArray*)array delay:(float)delay
 	return self;
 }
 
--(id) initWithName:(NSString*)name
-{
-	return [self initWithName:name delay:0 frames:nil];
-}
-
--(id) initWithName:(NSString*)name frames:(NSArray*)frames
-{
-	return [self initWithName:name delay:0 frames:frames];
-}
-
--(id) initWithName:(NSString*)t delay:(float)d
-{
-	return [self initWithName:t delay:d frames:nil];
-}
-
--(id) initWithName:(NSString*)name delay:(float)delay frames:(NSArray*)array
-{
-	if( (self=[super init]) ) {
-
-		delay_ = delay;
-		self.name = name;
-		self.frames = [NSMutableArray arrayWithArray:array];
-	}
-	return self;
-}
-
 - (NSString*) description
 {
 	return [NSString stringWithFormat:@"<%@ = %08X | frames=%d, delay:%f>", [self class], self,

diff --git a/cocos2d/CCAtlasNode.h b/cocos2d/CCAtlasNode.h
@@ -78,7 +78,7 @@
 @property (nonatomic,readwrite) ccColor3B color;
 
 /** how many quads to draw */
-@property (readwrite) NSUInteger quadsToDraw;
+@property (nonatomic,readwrite) NSUInteger quadsToDraw;
 
 /** creates a CCAtlasNode  with an Atlas file the width and height of each item measured in points and the quantity of items to render*/
 +(id) atlasWithTileFile:(NSString*)tile tileWidth:(NSUInteger)w tileHeight:(NSUInteger)h itemsToRender: (NSUInteger) c;

diff --git a/cocos2d/CCDirector.h b/cocos2d/CCDirector.h
@@ -89,6 +89,8 @@ and when to execute the Scenes.
 	BOOL displayFPS_;
 
 	NSUInteger frames_;
+	NSUInteger totalFrames_;
+
 	ccTime accumDt_;
 	ccTime frameRate_;
 #if	CC_DIRECTOR_FAST_FPS
@@ -167,7 +169,7 @@ and when to execute the Scenes.
  */
 @property (nonatomic,readwrite) ccDirectorProjection projection;
 /** How many frames were called since the director started */
-@property (readonly) NSUInteger	frames;
+@property (nonatomic,readonly) NSUInteger	totalFrames;
 
 /** Whether or not the replaced scene will receive the cleanup message.
  If the new scene is pushed, then the old scene won't receive the "cleanup" message.

diff --git a/cocos2d/CCDirector.m b/cocos2d/CCDirector.m
@@ -86,7 +86,7 @@ @implementation CCDirector
 @synthesize runningThread = runningThread_;
 @synthesize notificationNode = notificationNode_;
 @synthesize projectionDelegate = projectionDelegate_;
-@synthesize frames = frames_;
+@synthesize totalFrames = totalFrames_;
 //
 // singleton stuff
 //
@@ -139,7 +139,7 @@ - (id) init
 
 		// FPS
 		displayFPS_ = NO;
-		frames_ = 0;
+		totalFrames_ = frames_ = 0;
 
 		// paused ?
 		isPaused_ = NO;

diff --git a/cocos2d/CCLabelAtlas.h b/cocos2d/CCLabelAtlas.h
@@ -52,11 +52,6 @@
 /** creates the CCLabelAtlas with a string, a char map file(the atlas), the width and height of each element in points and the starting char of the atlas */
 +(id) labelWithString:(NSString*) string charMapFile: (NSString*) charmapfile itemWidth:(NSUInteger)w itemHeight:(NSUInteger)h startCharMap:(unsigned char)c;
 
-/** creates the CCLabelAtlas with a string, a char map file(the atlas), the width and height of each element in points and the starting char of the atlas.
- @deprecated Will be removed in 1.0.1. Use "labelWithString:" instead
- */
-+(id) labelAtlasWithString:(NSString*) string charMapFile: (NSString*) charmapfile itemWidth:(NSUInteger)w itemHeight:(NSUInteger)h startCharMap:(unsigned char)c DEPRECATED_ATTRIBUTE;
-
 /** initializes the CCLabelAtlas with a string, a char map file(the atlas), the width and height in points of each element and the starting char of the atlas */
 -(id) initWithString:(NSString*) string charMapFile: (NSString*) charmapfile itemWidth:(NSUInteger)w itemHeight:(NSUInteger)h startCharMap:(unsigned char)c;
 @end
diff --git a/cocos2d/CCLabelAtlas.m b/cocos2d/CCLabelAtlas.m
@@ -41,13 +41,6 @@ +(id) labelWithString:(NSString*)string charMapFile:(NSString*)charmapfile itemW
 	return [[[self alloc] initWithString:string charMapFile:charmapfile itemWidth:w itemHeight:h startCharMap:c] autorelease];
 }
 
-// XXX DEPRECATED. Remove it in 1.0.1
-+(id) labelAtlasWithString:(NSString*) string charMapFile: (NSString*) charmapfile itemWidth:(NSUInteger)w itemHeight:(NSUInteger)h startCharMap:(unsigned char)c
-{
-	return [self labelWithString:string charMapFile:charmapfile itemWidth:w itemHeight:h startCharMap:c];
-}
-
-
 -(id) initWithString:(NSString*) theString charMapFile: (NSString*) charmapfile itemWidth:(NSUInteger)w itemHeight:(NSUInteger)h startCharMap:(unsigned char)c
 {
 

diff --git a/cocos2d/CCLabelBMFont.h b/cocos2d/CCLabelBMFont.h
@@ -161,11 +161,6 @@ enum {
 /** creates a BMFont label with an initial string and the FNT file */
 +(id) labelWithString:(NSString*)string fntFile:(NSString*)fntFile;
 
-/** creates a BMFont label with an initial string and the FNT file
- @deprecated Will be removed in 1.0.1. Use "labelWithString" instead.
- */
-+(id) bitmapFontAtlasWithString:(NSString*)string fntFile:(NSString*)fntFile DEPRECATED_ATTRIBUTE;
-
 /** init a BMFont label with an initial string and the FNT file */
 -(id) initWithString:(NSString*)string fntFile:(NSString*)fntFile;
 
@@ -181,10 +176,3 @@ CCBMFontConfiguration * FNTConfigLoadFile( NSString *file );
 void FNTConfigRemoveCache( void );
 
 
-
-/** CCBitmapFontAtlas
- @deprecated Use CCLabelBMFont instead. Will be removed 1.0.1
- */
-DEPRECATED_ATTRIBUTE @interface CCBitmapFontAtlas : CCLabelBMFont
-@end
-
diff --git a/cocos2d/CCLabelBMFont.m b/cocos2d/CCLabelBMFont.m
@@ -445,12 +445,6 @@ +(id) labelWithString:(NSString *)string fntFile:(NSString *)fntFile
 	return [[[self alloc] initWithString:string fntFile:fntFile] autorelease];
 }
 
-// XXX - deprecated - Will be removed in 1.0.1
-+(id) bitmapFontAtlasWithString:(NSString*)string fntFile:(NSString*)fntFile
-{
-	return [self labelWithString:string fntFile:fntFile];
-}
-
 -(id) initWithString:(NSString*)theString fntFile:(NSString*)fntFile
 {	
 

diff --git a/cocos2d/CCLabelTTF.m b/cocos2d/CCLabelTTF.m
@@ -128,11 +128,14 @@ - (void) dealloc
 {
 	[string_ release];
 	[fontName_ release];
+
 	[super dealloc];
 }
 
 - (NSString*) description
 {
-	return [NSString stringWithFormat:@"<%@ = %08X | Label = %@, FontName = %@, FontSize = %.1f>", [self class], self, string_, fontName_, fontSize_];
+	// XXX: string_, fontName_ can't be displayed here, since they might be already released
+
+	return [NSString stringWithFormat:@"<%@ = %08X | FontSize = %.1f>", [self class], self, fontSize_];
 }
 @end
diff --git a/cocos2d/CCLayer.h b/cocos2d/CCLayer.h
@@ -188,14 +188,6 @@
 @property (nonatomic,readwrite) ccBlendFunc blendFunc;
 @end
 
-/** CCColorLayer
- It is the same as CCLayerColor.
- 
- @deprecated Use CCLayerColor instead. This class will be removed in v1.0.1
- */
-DEPRECATED_ATTRIBUTE @interface CCColorLayer : CCLayerColor
-@end
-
 #pragma mark -
 #pragma mark CCLayerGradient
 
@@ -283,11 +275,3 @@ the background.
 -(void) switchToAndReleaseMe: (unsigned int) n;
 @end
 
-/** CCMultiplexLayer
- It is the same as CCLayerMultiplex.
- 
- @deprecated Use CCLayerMultiplex instead. This class will be removed in v1.0.1
- */
-DEPRECATED_ATTRIBUTE  @interface CCMultiplexLayer : CCLayerMultiplex
-@end
-