Merge remote-tracking branch 'origin/develop' into issue1254

Conflicts:
	cocos2d/Platforms/iOS/EAGLView.m
	cocos2d/Platforms/iOS/ES1Renderer.m

AUTHORS

@@ -18,6 +18,15 @@ Lead Developers:
 
 Contributors (alphabetically ordered):
 
+* Christoph Winkler (http://raketenbasis.de)
+	Word Wrap works on LabelTTF on Mac
+
+* Jerrod Putman (http://www.tinytimgames.com)
+	Original author of ARC compatibility code
+
+* John Wordsworth ( http://www.johnwordsworth.com/ )
+	CCAnimationCache: Added animation data format. Can be loaded into the animation cache
+
 * Marco Tillemans (AKA araker: http://www.welcometothefabrik.com/)
 	Texture2D: drawInRect / drawAtPoint disables color state
 	SpriteBatchNode: fixed bug in removeAllChildrenWithCleanup
@@ -27,19 +36,29 @@ Contributors (alphabetically ordered):
 	Actions: Instant actions can be sequenceables
 	Actions: durtion is not divided by zero
 	Actions: Repeat & RepeatForever work as expectd
+	Author of ParticleBatchNode node
+	Improved ESRenderer layoutSubview
+	Improved Debug Drawing for Sprite batched node	
+
+* podhrask...@gmail.com
+	TouchDispatcher: correctly handles addition and removal of handlers when being inside a touch handler. patch
 
 * Ricardo Ruiz:
 	Added support for RGB888 textures
 
+* Scott Lembcke (AKA slembcke) (http://chipmunk-physics.net/)
+	Improved ARC compatiblity code
+
+* Shakthi:
+	Added CCNode#onExitTransitionDidStart method
+
 * slycrel (http://geopherlite.blogspot.com/)
 	Added support for flipped tiles in TMX maps. Also added test case
+	Added support for in-memory TMX map creation. Also added a test case
 
 * Stepan Generalov (iPsi) (http://www.itraceur.ru/)
 	FileUtils: Loads -hd resources even if the -sd resource is not present. patch
 
-* John Wordsworth ( http://www.johnwordsworth.com/ )
-	CCAnimationCache: Added animation data format. Can be loaded into the animation cache
-
 
 cocos2d for iPhone authors for v1.0
 -----------------------------------
@@ -152,6 +171,8 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
 		actions uses FLT_EPSILON macro. patch.
 	* effervens:
 		patches for Director
+	* effervecents (https://github.com/effervescent):
+		Sprite: Skew is performed after scale
 	* Ernesto Corvi & On-Core (http://www.on-core.com/):
 		author of TGA RLE support
 		patches for TextureMgr

CHANGELOG

@@ -1,23 +1,34 @@
-version 1.1 - XX-Ago-2011
+version 1.1-beta2 xx - 2011
+. [NEW] All: Code is compatible with ARC (issue #1199)
+. [NEW] TileMap: supports in-memory TMX map creation (issue #1239)
+. [NEW] Node: Added onExitTransitionDidStart (issue #792)
+. [FIX] Node: orderOfArrival is @synthezied correctly (issue #1273)
+. [FIX] Node & Sprite: Scale before Skew to prevent issues with negatives scales.
+. [FIX] TouchDispatcher: correctly handles addition and removal of handlers when being inside a touch handler (issue #1084, #1139)
+. [FIX-MAC] LabelTTF: word wrap works on Mac (issue #1074)
+
+version 1.1-beta 11-Oct-2011
 . [NEW] Animation: Added file format. AnimationCache can load animations from file
 . [NEW] ccConfig: Removed CC_RETINA_DISPLAY_FILENAME_SUFFIX. Use CCFileUtils API instead
 . [NEW] ccConfig: Removed CC_RETINA_DISPLAY_SUPPORT. It is always enabled.
 . [NEW] FileUtils: Added iPad / RetinaDisplay extension. To use it, call [CCFileUtils setiPadSuffix:@"-ipad"] or setRetinaDisplaySuffix (issue #1211)
 . [NEW] FileUtils: Added xxxFileExistAtPath for iPad and RetinaDisplay resources
-. [NEW] Node: improved speed when reordering nodes
-. [NEW] Sprite: improved speed when reordering sprites
+. [NEW] Node: improved speed when reordering and adding nodes (integration of reorderSprite branch)
+. [NEW] Particles: Added ParticleBatchNode (issue #955)
+. [NEW] Sprite: improved speed when reordering and adding sprites (integration of reorderSprite branch)
 . [NEW] Scheduler: Added support for delay and repeat (issue #630)
 . [NEW] Textures: Added support for RGB888 textures (issue #958)
 . [NEW] TileMap: TMX map supports flipped tiles (issue #1233)
+. [FIX] TileMap: don't use new sorting for tilemap (issue #1262)
 . [FIX] Actions: removed #undef CLAMP (issue #1210)
 . [FIX] Actions: Repeat & RepeatForEver work as expected(issue #1247)
 . [FIX] Actions: duration is not divided by zero (issue #615)
 . [FIX] Actions: Instant actions can be sequenceables (issue #1166)
-. [FIX] ESRenderer: Don't recreate if it is not needed (issue #1153)
 . [FIX] FileUtils: Loads -hd resources even if the sd resource is not present (issue #1179)
 . [FIX] FileUtils: renamed ccRemoveSuffixFromFile to +[CCFileUtils removeSuffixFromFile:];
 . [FIX] FileUtils: localized resources can be loaded using fullPathFromRelativePath (issue #1230)
 . [FIX] LayerColor: init calls initWithColor:width:height (issue #1226)
+. [FIX] Sprite: Debug draw fixed (issue #1069)
 . [FIX] SpriteBatchNode: removeAllChildrenWithCleanup works correctly (issue #1216)
 . [FIX] Texture2D: drawAtPoint uses the correct vertices
 . [FIX] Texture2D: drawAtPoint, drawInRect disables color state (issue #1222)

CocosDenshion/TestsAndDemos/FancyRatMeteringDemo/Classes/AudioVisualization.m

@@ -34,7 +34,7 @@ -(id)init {
 		avAvgPowerLevelSel_ = @selector(avAvgPowerLevelDidChange:channel:);
 		avPeakPowerLevelSel_ = @selector(avPeakPowerLevelDidChange:channel:);
 
-		[[CCScheduler sharedScheduler] scheduleSelector:@selector(tick:) forTarget:self interval:0 paused:NO];
+		[[CCScheduler sharedScheduler] scheduleSelector:@selector(tick:) forTarget:self interval:0 paused:NO repeat:kCCRepeatForever delay:0.0f];
 
 		[SimpleAudioEngine sharedEngine];
 		if([[SimpleAudioEngine sharedEngine] isBackgroundMusicPlaying]){
@@ -61,7 +61,7 @@ -(void)dealloc
 -(void)setMeteringInterval:(float) seconds
 {
 	[[CCScheduler sharedScheduler] unscheduleSelector:@selector(tick:) forTarget:self];
-	[[CCScheduler sharedScheduler] scheduleSelector:@selector(tick:) forTarget:self interval:seconds paused:NO];
+	[[CCScheduler sharedScheduler] scheduleSelector:@selector(tick:) forTarget:self interval:seconds paused:NO repeat:kCCRepeatForever delay:0.0f];
 }
 
 -(void)tick:(ccTime) dt

DONORS

@@ -38,6 +38,7 @@ Celeski, Sanjin (http://www.rastafungame.com)
 Chei Hoon Ker
 Clickable Bliss ( http://clickablebliss.com/ )
 Cooper, Neil
+Cooper, Jeremy ( http://www.blindsquirreldigital.com/ )
 Copsey, Ben (http://allseeing-i.com/)
 Da Silva, Vitor Almedia (http://myplaymobile.com/)
 Daley, Michael (http://particledesigner.71squared.com/)
@@ -93,6 +94,7 @@ Murff, James (http://www.deedogdevelopment.com/)
 Newman, Michael (http://www.bigduckgames.com/)
 Norris, Eoin
 Oestermeier, Uwe
+Ordonez, Elizabeth
 P-Edge Media (http://www.p-edge.nl/)
 Packt Publishing (http://packtpub.com)
 Pavley, John (http://www.pavley.com/)
@@ -101,6 +103,7 @@ Périer, Sébastien (http://www.sperier.com)
 Pritchard, Jason
 Prop Group (http://www.prop.gr)
 Quantum Blue, Inc (http://qblueinc.com)
+RAdenkov, Tihomir
 Razma, Rolandas
 Revolti, James (http://www.novasoftware.com.br/)
 Rios, Conlan (http://www.conlanrios.com)
@@ -111,6 +114,7 @@ Roselieb, Matthias
 Rousseau, Alexandre (http://www.ninermedia.com)
 S A Jenkins
 Sangwoo Im (http://www.sangwooim.name/)
+Scharf, David (http://huesforalice.com/)
 Sephton, Matt (http://www.gingerbeardman.com)
 Shawnsbits LLC (http://www.shawnsbits.com)
 Shapiro, Scott

ParticleBatchTest-Info.plist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

Resources/Info copy.plist

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>Icon.png</string>
+		<string>Icon@2x.png</string>
+		<string>Icon-72.png</string>
+		<string>Icon-Small-50.png</string>
+		<string>Icon-Small.png</string>
+		<string>Icon-Small@2x.png</string>
+	</array>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIPrerenderedIcon</key>
+	<true/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<dict>
+		<key>accelerometer</key>
+		<true/>
+		<key>opengles-1</key>
+		<true/>
+	</dict>
+	<key>UIStatusBarHidden</key>
+	<true/>
+</dict>
+</plist>