Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

tagged release v0.8.1-rc

  • Loading branch information...
commit 7a00f73d1112820ca31f8501370d808034ff82f0 1 parent d42fca5
@ricardoquesada ricardoquesada authored
View
1  AUTHORS
@@ -29,6 +29,7 @@ Poeple/companies who were/are contributing code to cocos2d for iPhone (alphabeti
* Brian Hammond: patches for Demos
* Bryan/Acceleroto: patch for CocosDenshion
* CJ Hanson: RenderTexture generates UIImages patch
+ * cjlesh: RotateTo action rotates to shortest angle patch
* Clinth Harris: patches for Doc generator script
* Codemattic: patches for CocosNode
patches fro MenuItemFont
View
3  CHANGELOG
@@ -1,6 +1,7 @@
-version 0.8.1-rc -
+version 0.8.1-rc -19-Ago-2009
. All: Using nonatomic properties (issue #509)
. ActionManager: fixed crash (issue #490)
+ . Actions: RotateTo always rotates to shortest angle fix (issue #499)
. Box2d: using google code r8 (issue #494)
. Box2d: added box2dTestBed (part of issue #494)
. CocosDenshion: correct channel in SimpleAudioEngine (issue #465)
View
18 cocos2d-iphone.xcodeproj/project.pbxproj
@@ -3974,8 +3974,8 @@
50175B240F33B22300624901 /* cocosLiveDemo */,
50F992430F9F183500767ABC /* PerformanceSpriteTest */,
50F998EC0F9F277D00767ABC /* PerformanceParticleTest */,
- 5012DD3E0FE299EA00D6DDD1 /* TouchesTest */,
50DFC2CC0FF62852007E7827 /* Samples */,
+ 5012DD3E0FE299EA00D6DDD1 /* TouchesTest */,
317070360E29409E00DD3360 /* AccelViewportTest.h */,
317070350E29409E00DD3360 /* AccelViewportTest.m */,
504CC3441035BECA0096894C /* ActionManagerTest.h */,
@@ -4784,9 +4784,9 @@
productReference = 504225700FC0B39C00B992F7 /* libbox2d.a */;
productType = "com.apple.product-type.library.static";
};
- 504226120FC0B5D500B992F7 /* Box2dTest */ = {
+ 504226120FC0B5D500B992F7 /* Box2dAccelTouchTest */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 5042262B0FC0B5D500B992F7 /* Build configuration list for PBXNativeTarget "Box2dTest" */;
+ buildConfigurationList = 5042262B0FC0B5D500B992F7 /* Build configuration list for PBXNativeTarget "Box2dAccelTouchTest" */;
buildPhases = (
504226170FC0B5D500B992F7 /* Resources */,
5042261A0FC0B5D500B992F7 /* Sources */,
@@ -4798,7 +4798,7 @@
504226130FC0B5D500B992F7 /* PBXTargetDependency */,
504226340FC0B67200B992F7 /* PBXTargetDependency */,
);
- name = Box2dTest;
+ name = Box2dAccelTouchTest;
productName = ChipmunkDemo;
productReference = 5042262E0FC0B5D500B992F7 /* Box2dTest.app */;
productType = "com.apple.product-type.application";
@@ -5438,10 +5438,11 @@
509B39DE0F31020900F2FB95 /* TouchJSON */,
8E6CBEEE0F7A758000D47B3A /* vorbis */,
317070410E2940C900DD3360 /* AccelViewportTest */,
+ 504CC30C1035BDE90096894C /* ActionManagerTest */,
506881F40E95761200F943E5 /* AtlasTest */,
501C7C6D0F91EFFF0024A296 /* AtlasSpriteTest */,
5048287F0F45AED700A30CEF /* AttachTest */,
- 504226120FC0B5D500B992F7 /* Box2dTest */,
+ 504226120FC0B5D500B992F7 /* Box2dAccelTouchTest */,
50010EBA103B3DB80059EC2E /* Box2dTestBed */,
50B2C5CE0E100EF000AE9530 /* ChipmunkAccelTouchTest */,
50B2CE450E129FD900AE9530 /* ChipmunkTest */,
@@ -5474,7 +5475,6 @@
50D0E0480FF9232E00098927 /* HelloActionsSample */,
50D0E0C70FF930BA00098927 /* HelloEventsSample */,
DA5F0EC10FFE96D400C7C82E /* Bug422 */,
- 504CC30C1035BDE90096894C /* ActionManagerTest */,
);
};
/* End PBXProject section */
@@ -7998,7 +7998,7 @@
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
GCC_PREPROCESSOR_DEFINITIONS = "COCOS2D_DEBUG=1";
GCC_THUMB_SUPPORT = NO;
- INFOPLIST_FILE = "/Users/riq/progs/cocos2d-iphone/trunk/Resources/Info copy.plist";
+ INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-ObjC",
@@ -8008,7 +8008,7 @@
UIKit,
);
PREBINDING = NO;
- PRODUCT_NAME = ParallaxTest;
+ PRODUCT_NAME = ActionManagerTest;
SDKROOT = iphoneos2.0;
};
name = Debug;
@@ -9767,7 +9767,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 5042262B0FC0B5D500B992F7 /* Build configuration list for PBXNativeTarget "Box2dTest" */ = {
+ 5042262B0FC0B5D500B992F7 /* Build configuration list for PBXNativeTarget "Box2dAccelTouchTest" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5042262C0FC0B5D500B992F7 /* Debug */,
View
7 cocos2d/IntervalAction.m
@@ -411,6 +411,13 @@ -(id) copyWithZone: (NSZone*) zone
-(void) start
{
[super start];
+
+ //
+ if (startAngle > 0)
+ startAngle = fmodf(startAngle, 360.0f);
+ else
+ startAngle = fmodf(startAngle, -360.0f);
+
startAngle = [target rotation];
angle -= startAngle;
if (angle > 180)
View
2  cocoslive/cocoslive.h
@@ -18,7 +18,7 @@
#define COCOSLIVE_VERSION 0x00000302
// to use localserver. DEBUG ONLY
-#define USE_LOCAL_SERVER 1
+//#define USE_LOCAL_SERVER 1
// all cocos live include files
//
View
2  tests/AtlasSpriteTest.m
@@ -454,7 +454,7 @@ -(id) init
[mgr addChild:sprite z:0];
}
- [self runAction:[OrbitCamera actionWithDuration:10 radius: 1 deltaRadius:0 angleZ:0 deltaAngleZ:360 angleX:0 deltaAngleX:0]];
+ [mgr runAction:[OrbitCamera actionWithDuration:10 radius: 1 deltaRadius:0 angleZ:0 deltaAngleZ:360 angleX:0 deltaAngleX:0]];
}
return self;
}
View
2  tests/ParallaxTest.m
@@ -245,7 +245,7 @@ -(id) init
-(void) registerWithTouchDispatcher
{
- [[TouchDispatcher sharedDispatcher] addTargetedDelegate:self priority:INT_MIN+1 swallowsTouches:YES];
+ [[TouchDispatcher sharedDispatcher] addTargetedDelegate:self priority:0 swallowsTouches:YES];
}
-(BOOL) ccTouchBegan:(UITouch *)touch withEvent:(UIEvent *)event
View
2  tests/ParticleTest.m
@@ -127,7 +127,7 @@ - (void) dealloc
-(void) registerWithTouchDispatcher
{
- [[TouchDispatcher sharedDispatcher] addTargetedDelegate:self priority:INT_MIN+1 swallowsTouches:NO];
+ [[TouchDispatcher sharedDispatcher] addTargetedDelegate:self priority:0 swallowsTouches:NO];
}
-(BOOL) ccTouchBegan:(UITouch*)touch withEvent:(UIEvent*)event
View
11 tests/SpritesTest.m
@@ -206,12 +206,19 @@ -(void) onEnter
[self centerSprites];
id actionTo = [RotateTo actionWithDuration: 2 angle:45];
+ id actionTo2 = [RotateTo actionWithDuration: 2 angle:-45];
+ id actionTo0 = [RotateTo actionWithDuration:2 angle:0];
+ [tamara runAction: [Sequence actions:actionTo, actionTo0, nil]];
+
id actionBy = [RotateBy actionWithDuration:2 angle: 360];
id actionByBack = [actionBy reverse];
+ [grossini runAction: [Sequence actions:actionBy, actionByBack, nil]];
+ Sprite *kathia = [Sprite spriteWithFile:@"grossinis_sister2.png"];
+ [self addChild:kathia];
+ [kathia setPosition:ccp(240,160)];
+ [kathia runAction: [Sequence actions:actionTo2, [[actionTo0 copy] autorelease], nil]];
- [tamara runAction: actionTo];
- [grossini runAction: [Sequence actions:actionBy, actionByBack, nil]];
}
-(NSString *) title
{
Please sign in to comment.
Something went wrong with that request. Please try again.