Permalink
Browse files

Fixed some merge issues with previous merge

  • Loading branch information...
1 parent c6d3e74 commit 89b99d523ea55286bcfdfb7d8fcb801b7da68cf2 @ricardoquesada ricardoquesada committed Jul 11, 2011
View
@@ -1,5 +1,6 @@
-version 1.0.0 -
+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
. [NEW] Director: frames is a readonly property
. [NEW] Menu: MenuItemFont can change size and font from instance (issue #1192)
. [NEW] Scheduler: Added isTargetPaused method
@@ -9,6 +10,8 @@ version 1.0.0 -
. [FIX] ccpLineIntersect works as expected. Improved performance (issue #1174, #1193)
. [FIX] cocosLive: fixed memory leak in ScoreServerPost
. [FIX] Director: Added asserts to prevent calling startAnimation twice.
+. [FIX] Menu: Column aligment is centered. Removed the +10 pixels padding.
+. [FIX] Node: Node#Draw calls super#draw
. [FIX] Tests: Fixed memory leak in ParticleTest
. [FIX] Tests: Fixed memory leak in cocosLiveTest
. [FIX] TouchDispatcher: added setPriority (issue #757)
View
@@ -103,7 +103,7 @@ -(void) updateAtlasValues
#pragma mark CCAtlasNode - draw
- (void) draw
{
- [super draw];
+ [super draw];
// Default GL states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY
// Needed states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_TEXTURE_COORD_ARRAY
View
@@ -153,7 +153,7 @@ -(NSString*) string
// XXX: overriding draw from AtlasNode
- (void) draw
{
- [super draw];
+ [super draw];
// Default GL states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY
// Needed states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_TEXTURE_COORD_ARRAY
View
@@ -663,6 +663,7 @@ -(void) setAnchorPoint:(CGPoint)point
-(void) draw
{
[super draw];
+
CGSize s = [self contentSize];
CGPoint vertices[4]={
ccp(0,0),ccp(s.width,0),
View
@@ -355,7 +355,7 @@ - (void) updateColor
- (void)draw
{
- [super draw];
+ [super draw];
// Default GL states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY
// Needed states: GL_VERTEX_ARRAY, GL_COLOR_ARRAY
@@ -97,7 +97,7 @@ -(void) postStep
-(void) draw
{
- [super draw];
+ [super draw];
if (particleIdx==0)
return;
@@ -258,7 +258,7 @@ -(void) postStep
// overriding draw method
-(void) draw
{
- [super draw];
+ [super draw];
// Default GL states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY
// Needed states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY
@@ -459,7 +459,7 @@ -(CGPoint)boundaryTexCoord:(char)index
-(void)draw
{
- [super draw];
+ [super draw];
if(!vertexData_)return;
if(!sprite_)return;
View
@@ -251,7 +251,7 @@ -(void)addPointAt:(CGPoint)location width:(float)w
-(void) draw
{
- [super draw];
+ [super draw];
if ([segments_ count] > 0)
{
View
@@ -595,7 +595,7 @@ -(void) getTransformValues:(struct transformValues_*) tv
-(void) draw
{
- [super draw];
+ [super draw];
NSAssert(!usesBatchNode_, @"If CCSprite is being rendered by CCSpriteBatchNode, CCSprite#draw SHOULD NOT be called");
@@ -258,7 +258,7 @@ -(void)removeAllChildrenWithCleanup:(BOOL)doCleanup
#pragma mark CCSpriteBatchNode - draw
-(void) draw
{
- [super draw];
+ [super draw];
// Optimization: Fast Dispatch
if( textureAtlas_.totalQuads == 0 )
View
@@ -93,7 +93,7 @@ -(void) sceneOrder
-(void) draw
{
- [super draw];
+ [super draw];
if( inSceneOnTop_ ) {
[outScene_ visit];
@@ -484,11 +484,7 @@ - (NSRange)rangeOfAttributeRunsForRange:(NSRange)range {
if ([[_attributes objectAtIndex:firstAfter] index] > NSMaxRange(range)) {
// the first after is too far after, insert another run!
ZAttributeRun *newRun = [[ZAttributeRun alloc] initWithIndex:NSMaxRange(range)
-<<<<<<< HEAD
- attributes:(NSDictionary*)[[_attributes objectAtIndex:firstAfter-1] attributes]];
-=======
attributes:[(ZAttributeRun *)[_attributes objectAtIndex:firstAfter-1] attributes]];
->>>>>>> stable
[_attributes insertObject:newRun atIndex:firstAfter];
[newRun release];
}
@@ -8,7 +8,7 @@
enum {
kMaxNodes = 10000,
- kNodesIncrease = 100,
+ kNodesIncrease = 50,
};
enum {
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -1575,8 +1575,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocos2d-ios-PerformanceTests" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -2012,7 +2015,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = ChildrenNodePerformance;
};
name = Debug;
@@ -2024,7 +2026,6 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
INFOPLIST_FILE = ../../Resources/Info.plist;
@@ -2035,7 +2036,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = ChildrenNodePerformance;
ZERO_LINK = NO;
};
@@ -2060,7 +2060,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = SpritePerformance;
};
name = Debug;
@@ -2072,7 +2071,6 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
INFOPLIST_FILE = ../../Resources/Info.plist;
@@ -2084,7 +2082,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = SpritePerformance;
ZERO_LINK = NO;
};
@@ -2108,7 +2105,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = ParticlePerformance;
};
name = Debug;
@@ -2120,7 +2116,6 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
INFOPLIST_FILE = ../../Resources/Info.plist;
@@ -2131,7 +2126,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = ParticlePerformance;
ZERO_LINK = NO;
};
@@ -2150,7 +2144,6 @@
"-ObjC",
"-all_load",
);
- PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
};
name = Debug;
@@ -2161,13 +2154,11 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
OTHER_LDFLAGS = (
"-ObjC",
"-all_load",
);
- PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
ZERO_LINK = NO;
};
@@ -2180,7 +2171,6 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
- PREBINDING = NO;
PRODUCT_NAME = FontLabel;
};
name = Debug;
@@ -2191,8 +2181,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- PREBINDING = NO;
PRODUCT_NAME = FontLabel;
ZERO_LINK = NO;
};
@@ -2202,7 +2190,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = (
+ armv6,
+ armv7,
+ );
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = s;
@@ -2213,13 +2204,12 @@
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 3.1;
ONLY_ACTIVE_ARCH = YES;
- PREBINDING = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -2229,7 +2219,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = (
+ armv6,
+ armv7,
+ );
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = s;
@@ -2241,13 +2234,12 @@
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_UNROLL_LOOPS = YES;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 3.1;
OTHER_CFLAGS = "";
- PREBINDING = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -2271,7 +2263,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = TexturePerformance;
};
name = Debug;
@@ -2283,7 +2274,6 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
INFOPLIST_FILE = ../../Resources/Info.plist;
@@ -2294,7 +2284,6 @@
"-framework",
UIKit,
);
- PREBINDING = NO;
PRODUCT_NAME = TexturePerformance;
ZERO_LINK = NO;
};

0 comments on commit 89b99d5

Please sign in to comment.