Merge branch 'v3.0' of github.com:cocos2d/cocos2d-iphone into v3.0

Author: slembcke

cocos2d-ui-tests/Resources-shared/TileMaps/resources-phone/desert_resolution.png

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Desert" tilewidth="32" tileheight="32" spacing="1" margin="1">
+  <image source="desert_resolution.png"/>
+ </tileset>
+ <layer name="Tile Layer 1" width="10" height="10">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA5NkYGCQIoClgViRgTBQpoM6JSimljpquw+XOk0g1iKAtYEYAF51CouQAQAA
+  </data>
+ </layer>
+</map>

cocos2d-ui-tests/Resources-shared/TileMaps/resources-phone/orthogonal_resolution.tmx

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="64" tileheight="64">
+ <tileset firstgid="1" name="Desert" tilewidth="64" tileheight="64" spacing="2" margin="2">
+  <image source="desert_resolution.png"/>
+ </tileset>
+ <layer name="Tile Layer 1" width="10" height="10">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA5NkYGCQIoClgViRgTBQpoM6JSimljpquw+XOk0g1iKAtYEYAF51CouQAQAA
+  </data>
+ </layer>
+</map>

cocos2d-ui-tests/Resources-shared/TileMaps/resources-phonehd/desert_resolution.png

@@ -87,4 +87,17 @@ -(void) setupTilemap6Test
 	scroll.scrollPosition = ccp(map.contentSizeInPoints.width/2 - scroll.contentSizeInPoints.width/2, 0);
 }
 
+-(void) setupTilemap7Test
+{
+	// These files are in the SB directories.
+	self.subTitle = @"TileMaps/orthogonal_resolution.tmx";
+	
+	CCNode *map = [CCTiledMap tiledMapWithFile:self.subTitle];
+	CCScrollView *scroll = [[CCScrollView alloc] initWithContentNode:map];
+	scroll.flipYCoordinates = NO;
+	
+	[self.contentNode addChild:scroll];
+	scroll.scrollPosition = ccp(map.contentSizeInPoints.width/2 - scroll.contentSizeInPoints.width/2, 0);
+}
+
 @end

cocos2d-ui-tests/Resources-shared/TileMaps/resources-phonehd/orthogonal_resolution.tmx

@@ -76,6 +76,8 @@ - (void) updateSliderPositionFromValue
 
 - (void) touchEntered:(UITouch*)touch withEvent:(UIEvent*)event
 {
+    if (!self.enabled) return;
+    
     CGPoint worldLocation = [touch locationInWorld];
 
     [self inputEnteredWithWorlPos:worldLocation];

cocos2d-ui-tests/tests/TilemapTest.m

@@ -211,7 +211,7 @@
  *  Features:
  *
  *  - It supports one or more children
- *  - Only one children will be active a time
+ *  - Only one child will be active a time
  */
 @interface CCNodeMultiplexer : CCNode {
 	unsigned int _enabledNode;
@@ -224,21 +224,21 @@
 /// -----------------------------------------------------------------------
 
 /**
- *  Creates a CCNodeMultiplexer with an array of layers.
+ *  Creates a CCNodeMultiplexer with an array of nodes.
  *
  *  @param arrayOfNodes Array of nodes.
  *
- *  @return The CCNodeMultiplexer Object.
+ *  @return The CCNodeMultiplexer object.
  */
 +(id)nodeWithArray:(NSArray*)arrayOfNodes;
 
-/** Creates a CCMultiplexLayer with one or more layers using a variable argument list.
+/** Creates a CCMultiplexLayer with one or more nodes using a variable argument list.
  *  Example: 
  *  @code mux = [CCNodeMultiplexer nodeWithNodes:nodeA, nodeB, nodeC, nil];
  *  
  *  @param node List of nodes.
  *  @param ... Nil terminator.
- *  @return The CCNodeMultiplexer Object.
+ *  @return The CCNodeMultiplexer object.
  */
 +(id)nodeWithNodes:(CCNode*)node, ... NS_REQUIRES_NIL_TERMINATION;
 
@@ -248,7 +248,7 @@
 /// -----------------------------------------------------------------------
 
 /**
- *  Initializes a CCNodeMultiplexer with an array of layers.
+ *  Initializes a CCNodeMultiplexer with an array of nodes.
  *
  *  @param arrayOfNodes Array of nodes.
  *

cocos2d-ui/CCSlider.m

@@ -46,6 +46,7 @@
 #import "CCSprite_Private.h"
 #import "CCSpriteBatchNode_Private.h"
 #import "CCTexture_Private.h"
+#import "CCDrawingPrimitives.h"
 
 // external
 #import "kazmath/GL/matrix.h"

cocos2d/CCNodeColor.h

@@ -27,6 +27,7 @@
 
 #import "CCSprite9Slice.h"
 #import "CCTexture_Private.h"
+#import "CCDrawingPrimitives.h"
 
 // ---------------------------------------------------------------------