From 4f226a9705d4410fe11d90a89b6cb3b06c8eadc3 Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Sun, 11 Sep 2011 16:50:44 -0400 Subject: Jump: Disallowed going offscreen after going below ledge level and then riding back up on the wave Fixes #228 --- Classes/JumpGameMode.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Classes/JumpGameMode.m b/Classes/JumpGameMode.m index 15b0e16..1e55b48 100644 --- a/Classes/JumpGameMode.m +++ b/Classes/JumpGameMode.m @@ -182,6 +182,9 @@ if ((cart.sprite.position.y < 86) && (cart.boundedByScreen)) { cart.boundedByScreen = NO; + } else if ((cart.sprite.position.y >= 86) && (!cart.boundedByScreen)) + { + cart.boundedByScreen = YES; } if (cart.sprite.position.y == (0-cart.sprite.boundingBox.size.height/2)) -- cgit 1.4.1 From f3ea6312f1e0d6a0069c41f71f6f40fdfbd8030a Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Sun, 11 Sep 2011 19:55:27 -0400 Subject: Made falling objects on the wave destroy at the ledges Previously, falling objects on the wave floated through the ledges--now they destroy when they touch the ledges just like objects not on the wave. Falling objects also now only fall straight downward if they were dropped while the wave was active. Closes #221 --- Classes/FallingObject.h | 2 -- Classes/FallingObject.m | 10 ---------- Classes/JumpGameMode.m | 29 ++++++++++++++++++++--------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Classes/FallingObject.h b/Classes/FallingObject.h index d3ac638..6cb0c14 100755 --- a/Classes/FallingObject.h +++ b/Classes/FallingObject.h @@ -24,7 +24,5 @@ - (BOOL)tick; - (void)collideWithCart; - (void)collideWithFloor; -- (BOOL)flag:(int)flag; -- (void)setFlag:(int)flag withValue:(BOOL)value; @end diff --git a/Classes/FallingObject.m b/Classes/FallingObject.m index 86edd15..85ea902 100755 --- a/Classes/FallingObject.m +++ b/Classes/FallingObject.m @@ -93,16 +93,6 @@ } -- (BOOL)flag:(int)flag -{ - return flags[flag]; -} - -- (void)setFlag:(int)flag withValue:(BOOL)value -{ - flags[flag] = value; -} - - (void)dealloc { [sprite.parent removeChild:sprite cleanup:YES]; diff --git a/Classes/JumpGameMode.m b/Classes/JumpGameMode.m index 1e55b48..b192058 100644 --- a/Classes/JumpGameMode.m +++ b/Classes/JumpGameMode.m @@ -30,7 +30,19 @@ @end -// FallingObject flag 0 is whether the object is floating in water +@implementation FallingObject (Flags) + +- (BOOL)fellDuringWave +{ + return flags[0]; +} + +- (void)setFellDuringWave:(BOOL)value +{ + flags[0] = value; +} + +@end @implementation JumpGameMode @@ -118,10 +130,12 @@ } } + [ledges minusSet:discardedSet]; + NSMutableSet* discardedObjects = [NSMutableSet set]; for (FallingObject* object in objects) { - if ((object.sprite.position.y < 86) && (![object flag:0])) + if (object.sprite.position.y < (64+object.sprite.boundingBox.size.height/2)) { for (CCSprite* ledge in ledges) { @@ -144,20 +158,14 @@ } } - if ((waterTick >= 180) || ((waterTick > 0) && ([object flag:0]))) + if (object.fellDuringWave) { object.sprite.position = ccp(object.sprite.position.x, MAX(object.sprite.position.y, water.position.y+80+11)); } else { object.sprite.position = ccp(object.sprite.position.x-ledgeScrollSpeed, object.sprite.position.y); } - - if ((waterTick > 0) && (object.sprite.position.y <= (water.position.y+80+11))) - { - [object setFlag:0 withValue:YES]; - } } - [ledges minusSet:discardedSet]; [objects minusSet:discardedObjects]; if (rightmost <= 480) @@ -396,6 +404,7 @@ object.sprite.position = ccp(objectX, 360); object.sprite.scale = 1; + object.fellDuringWave = waterTick > 0; [self addChild:object.sprite]; [objects addObject:object]; @@ -429,6 +438,7 @@ object.sprite.position = ccp(objectX, 360); object.sprite.scale = 1; + object.fellDuringWave = waterTick > 0; [self addChild:object.sprite]; [objects addObject:object]; @@ -464,6 +474,7 @@ object.sprite.position = ccp(objectX, 360); object.sprite.scale = 1; + object.fellDuringWave = waterTick > 0; [self addChild:object.sprite]; [objects addObject:object]; -- cgit 1.4.1 From 4d09a715397de91a66f3fbea0fe2b629f64b6e9a Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Mon, 12 Sep 2011 21:45:12 -0400 Subject: Made the cart in Jump mode fall more quickly Closes #229 --- Classes/Cart.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Cart.m b/Classes/Cart.m index 0344bdf..979226b 100644 --- a/Classes/Cart.m +++ b/Classes/Cart.m @@ -54,7 +54,7 @@ if ((delegate != nil) && ([delegate respondsToSelector:@selector(cartShouldFall:)])) { int bottom = [delegate cartShouldFall:self]; - sprite.position = ccp(sprite.position.x, MAX(bottom, sprite.position.y-6)); + sprite.position = ccp(sprite.position.x, MAX(bottom, sprite.position.y-8)); } else { NSLog(@"Falling is set on a cart without a compatible game mode."); } -- cgit 1.4.1 From 08cb72a92328cb0f38947fe5e8c5f23bab8cd0cc Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Mon, 17 Oct 2011 20:57:46 -0400 Subject: Added support for gyroscope-based movement Closes #230 --- Cartographic.xcodeproj/project.pbxproj | 10 ++++++ Classes/Cart.h | 2 +- Classes/Cart.m | 13 ++++--- Classes/GameMode.h | 6 ++++ Classes/GameMode.m | 63 +++++++++++++++++++++++++++++++--- Classes/JumpGameMode.m | 14 ++++---- 6 files changed, 89 insertions(+), 19 deletions(-) diff --git a/Cartographic.xcodeproj/project.pbxproj b/Cartographic.xcodeproj/project.pbxproj index 75343b3..cd76e10 100755 --- a/Cartographic.xcodeproj/project.pbxproj +++ b/Cartographic.xcodeproj/project.pbxproj @@ -109,6 +109,7 @@ 6C19F1651401917900F9CCD3 /* feedback2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C19F1641401917900F9CCD3 /* feedback2.png */; }; 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; }; 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; }; + 6C2A07781436100C007AB76C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C2A07771436100C007AB76C /* CoreMotion.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFDF13FC2708002B21AF /* tutorial.png */; }; 6C39CFE213FC2713002B21AF /* tutorial2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE113FC2713002B21AF /* tutorial2.png */; }; 6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFE413FC4635002B21AF /* JumpGameMode.m */; }; @@ -444,6 +445,7 @@ 6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = ""; }; 6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = ""; }; 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = ""; }; + 6C2A07771436100C007AB76C /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; 6C39CFDF13FC2708002B21AF /* tutorial.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial.png; sourceTree = ""; }; 6C39CFE113FC2713002B21AF /* tutorial2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial2.png; sourceTree = ""; }; 6C39CFE313FC4635002B21AF /* JumpGameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpGameMode.h; sourceTree = ""; }; @@ -673,6 +675,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 6C2A07781436100C007AB76C /* CoreMotion.framework in Frameworks */, DCCBF1B70F6022AE0040855A /* CoreGraphics.framework in Frameworks */, DCCBF1B90F6022AE0040855A /* Foundation.framework in Frameworks */, DCCBF1BB0F6022AE0040855A /* OpenGLES.framework in Frameworks */, @@ -743,6 +746,7 @@ children = ( 6C88B69314119B5A0049E402 /* libTestFlight.a */, 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */, + 6C2A07771436100C007AB76C /* CoreMotion.framework */, DCCBF1B60F6022AE0040855A /* CoreGraphics.framework */, DCCBF1B80F6022AE0040855A /* Foundation.framework */, DCCBF1BA0F6022AE0040855A /* OpenGLES.framework */, @@ -1686,6 +1690,7 @@ INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = Versioning.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", @@ -1695,6 +1700,7 @@ "-ObjC", ); PRODUCT_NAME = Cartographic; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; WARNING_CFLAGS = "-Wall"; }; @@ -1718,6 +1724,7 @@ INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = Versioning.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", @@ -1727,6 +1734,7 @@ "-ObjC", ); PRODUCT_NAME = Cartographic; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; WARNING_CFLAGS = "-Wall"; }; @@ -1821,6 +1829,7 @@ INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = Versioning.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", @@ -1830,6 +1839,7 @@ "-ObjC", ); PRODUCT_NAME = Cartographic; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; WARNING_CFLAGS = "-Wall"; }; diff --git a/Classes/Cart.h b/Classes/Cart.h index 1058025..af463f2 100644 --- a/Classes/Cart.h +++ b/Classes/Cart.h @@ -26,6 +26,6 @@ @property (assign) BOOL boundedByScreen; - (id)initWithSprite:(CCSprite*)sprite; - (void)tick; -- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration; +- (void)deviceDidRotate:(double)pitch; @end diff --git a/Classes/Cart.m b/Classes/Cart.m index 979226b..f9da181 100644 --- a/Classes/Cart.m +++ b/Classes/Cart.m @@ -62,15 +62,14 @@ } } -- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration +#define kFilterFactor 0.05f + +- (void)deviceDidRotate:(double)pitch { static float prevY=0; - -#define kFilterFactor 0.05f - - float accelY = -((float) acceleration.y * kFilterFactor + (1- kFilterFactor)*prevY); - - prevY = accelY; + float accelY = -((float) pitch * kFilterFactor + (1- kFilterFactor)*prevY); + + prevY = accelY; accelX = accelY * 750; } diff --git a/Classes/GameMode.h b/Classes/GameMode.h index e82ad10..2fcf275 100644 --- a/Classes/GameMode.h +++ b/Classes/GameMode.h @@ -8,6 +8,7 @@ #import "CCLayer.h" #import "Cart.h" +#import #define GAME_SCENE 436 #define GAME_LAYER 437 @@ -28,6 +29,10 @@ void (^delayedAction)(void); BOOL isPaused; + + BOOL hasGyroscope; + double pitch; + CMMotionManager* motionManager; } @property (readonly) Cart* cart; @@ -43,5 +48,6 @@ - (void)mainmenu; - (void)scheduleDelayedAction:(void(^)(void))delayedAction delay:(float)delay; - (void)runDelayedAction; +- (void)setPitch:(double)m_pitch; @end diff --git a/Classes/GameMode.m b/Classes/GameMode.m index 1e80237..e45ddfe 100644 --- a/Classes/GameMode.m +++ b/Classes/GameMode.m @@ -33,8 +33,6 @@ if (nil != self) { - isAccelerometerEnabled_ = YES; - objects = [[NSMutableSet alloc] init]; cart = [[Cart alloc] initWithSprite:[CCSprite spriteWithFile:@"cart.png"]]; @@ -64,6 +62,26 @@ } isPaused = NO; + + Class cmClass = (NSClassFromString(@"CMMotionManager")); + if (cmClass) + { + motionManager = [[CMMotionManager alloc] init]; + + if (motionManager.gyroAvailable) + { + [motionManager setDeviceMotionUpdateInterval:1.0f/60.0f]; + isAccelerometerEnabled_ = NO; + hasGyroscope = YES; + } else { + isAccelerometerEnabled_ = YES; + motionManager = nil; + hasGyroscope = NO; + } + } else { + isAccelerometerEnabled_ = YES; + hasGyroscope = NO; + } } return self; @@ -71,19 +89,39 @@ - (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration { - [cart accelerometer:accelerometer didAccelerate:acceleration]; + self.pitch = acceleration.y; } - (void)onEnterTransitionDidFinish { [super onEnterTransitionDidFinish]; - [[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0 / 60)]; + if (hasGyroscope) + { + [motionManager startDeviceMotionUpdates]; + } else { + [[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0 / 60)]; + } + [self schedule:@selector(tick:) interval:1.0f/60.0f]; } +- (void)onExit +{ + if (hasGyroscope) + { + [motionManager stopDeviceMotionUpdates]; + } +} + - (void)tick:(ccTime)dt { + if (hasGyroscope) + { + CMDeviceMotion* motion = [motionManager deviceMotion]; + self.pitch = -motion.attitude.pitch; + } + [cart tick]; NSMutableSet* discardedObjects = [NSMutableSet set]; @@ -111,6 +149,11 @@ [self pauseSchedulerAndActions]; + if (hasGyroscope) + { + [motionManager stopDeviceMotionUpdates]; + } + shadedLayer = [CCLayerColor layerWithColor:ccc4(0, 0, 0, 127)]; [[[CCDirector sharedDirector] runningScene] addChild:shadedLayer]; @@ -143,6 +186,11 @@ shadedLayer = nil; pauseLayer = nil; + if (hasGyroscope) + { + [motionManager startDeviceMotionUpdates]; + } + [self resumeSchedulerAndActions]; isPaused = NO; @@ -211,6 +259,13 @@ } } +- (void)setPitch:(double)m_pitch +{ + pitch = m_pitch; + + [cart deviceDidRotate:pitch]; +} + - (void)dealloc { [objects release]; diff --git a/Classes/JumpGameMode.m b/Classes/JumpGameMode.m index b192058..eb552a2 100644 --- a/Classes/JumpGameMode.m +++ b/Classes/JumpGameMode.m @@ -288,13 +288,6 @@ isGesturing = NO; } -- (void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration -{ - [super accelerometer:accelerometer didAccelerate:acceleration]; - - expectedAngle = acceleration.y*M_PI_2; -} - - (int)cartShouldFall:(Cart *)m_cart { int bottom = 0-m_cart.sprite.boundingBox.size.height/2; @@ -500,6 +493,13 @@ } } +- (void)setPitch:(double)m_pitch +{ + [super setPitch:m_pitch]; + + expectedAngle = pitch*M_PI_2; +} + @end @implementation LedgeFactory -- cgit 1.4.1 From bcbb03d6abd1ac575f3d7a54f0b7d932a72dca48 Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Tue, 25 Dec 2012 18:21:31 -0500 Subject: Fixed rotation bug with iOS 6 and made highscores landscape --- Classes/Cart_CollectAppDelegate.m | 3 ++- Classes/HighscoreListController.m | 22 +++++++++++----------- Resources/Info.plist | 8 ++++++-- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Classes/Cart_CollectAppDelegate.m b/Classes/Cart_CollectAppDelegate.m index 25a2aa4..c92d231 100755 --- a/Classes/Cart_CollectAppDelegate.m +++ b/Classes/Cart_CollectAppDelegate.m @@ -114,7 +114,8 @@ [viewController setView:glView]; // make the View Controller a child of the main window - [window addSubview: viewController.view]; + [window setRootViewController:viewController]; + //[window addSubview: viewController.view]; [window makeKeyAndVisible]; diff --git a/Classes/HighscoreListController.m b/Classes/HighscoreListController.m index 7370da5..c746421 100755 --- a/Classes/HighscoreListController.m +++ b/Classes/HighscoreListController.m @@ -24,7 +24,7 @@ if (self) { localHighscores = [[Highscore localHighscoreListForGameMode:@"Collect"] retain]; - navigationBar = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 320, 44)]; + navigationBar = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 480, 44)]; myNavigationItem = [[UINavigationItem alloc] initWithTitle:@"Highscores"]; UIBarButtonItem* barButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(back)]; myNavigationItem.leftBarButtonItem = barButton; @@ -45,7 +45,7 @@ [modeControl addTarget:self action:@selector(switchGameMode:) forControlEvents:UIControlEventValueChanged]; UIBarButtonItem* barButton3 = [[UIBarButtonItem alloc] initWithCustomView:modeControl]; - toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 480-44, 320, 44)]; + toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 320-44, 480, 44)]; [toolbar setItems:[NSArray arrayWithObjects:barButton3, btnSpace, barButton2, nil] animated:NO]; [barButton2 release]; [btnSpace release]; @@ -55,8 +55,8 @@ loadingGlobal = NO; tableView = [(UITableView*)self.view retain]; - UIView* parentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 480)]; - [tableView setFrame:CGRectMake(0, 44, 320, 480-44-44)]; + UIView* parentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 480, 320)]; + [tableView setFrame:CGRectMake(0, 44, 480, 320-44-44)]; [parentView addSubview:navigationBar]; [parentView addSubview:tableView]; [parentView addSubview:toolbar]; @@ -101,9 +101,9 @@ */ /* // Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations. - return YES; +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation +{ + return ( interfaceOrientation == UIInterfaceOrientationLandscapeRight ); } */ @@ -183,7 +183,7 @@ UILabel* scoreLabel = [[UILabel alloc] init]; scoreLabel.text = [NSString stringWithFormat:@"%d", highscore.score]; CGSize labelSize = [scoreLabel.text sizeWithFont:scoreLabel.font constrainedToSize:CGSizeMake(160, 44) lineBreakMode:UILineBreakModeClip]; - scoreLabel.frame = CGRectMake(320-10-labelSize.width, 22-labelSize.height/2, labelSize.width, labelSize.height); + scoreLabel.frame = CGRectMake(480-10-labelSize.width, 22-labelSize.height/2, labelSize.width, labelSize.height); [cell addSubview:scoreLabel]; [scoreLabel release]; @@ -293,10 +293,10 @@ { loadingGlobal = YES; - loadingView = [[UIView alloc] initWithFrame:CGRectMake(0, 44, 320, 480-44-44)]; - activity = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(150, 228-44, 20, 20)]; + loadingView = [[UIView alloc] initWithFrame:CGRectMake(0, 44, 480, 320-44-44)]; + activity = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(230, 148-44, 20, 20)]; activity.activityIndicatorViewStyle = UIActivityIndicatorViewStyleGray; - statusText = [[UILabel alloc] initWithFrame:CGRectMake(0, 256-44, 320, 21)]; + statusText = [[UILabel alloc] initWithFrame:CGRectMake(80, 150, 320, 21)]; statusText.text = @"Downloading highscores..."; statusText.textAlignment = UITextAlignmentCenter; diff --git a/Resources/Info.plist b/Resources/Info.plist index 4a70f3c..7a4d9c5 100755 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -26,12 +26,14 @@ ${PRODUCT_NAME} CFBundlePackageType APPL + CFBundleShortVersionString + 0.4.9 CFBundleSignature ???? CFBundleURLTypes CFBundleVersion - BUILD_NUMBER + 61 LSRequiresIPhoneOS UIPrerenderedIcon @@ -46,7 +48,9 @@ UIStatusBarHidden UISupportedInterfaceOrientations - + + UIInterfaceOrientationLandscapeLeft + UTExportedTypeDeclarations UTImportedTypeDeclarations -- cgit 1.4.1 From f82fdb7134632c1a52902d44c0d555dac0225898 Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Tue, 25 Dec 2012 18:32:51 -0500 Subject: Fixed cart driving wrong direction and made all game modes available for testing purposes --- Classes/GameModeSelectionLayer.m | 11 ++++++----- Resources/Info.plist | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Classes/GameModeSelectionLayer.m b/Classes/GameModeSelectionLayer.m index e7b6966..03af89d 100644 --- a/Classes/GameModeSelectionLayer.m +++ b/Classes/GameModeSelectionLayer.m @@ -49,23 +49,24 @@ GameModeSelection* collectSelection; - if ([defaults boolForKey:@"hasDoneTutorial"]) + collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlocked:YES]; +/* if ([defaults boolForKey:@"hasDoneTutorial"]) { collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlocked:YES]; } else { collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlockCondition:@"Beat the tutorial!"]; - } + }*/ [gameModes addObject:collectSelection]; GameModeSelection* jumpSelection; - - if ([defaults boolForKey:@"unlockedJumpMode"]) + jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES]; +/* if ([defaults boolForKey:@"unlockedJumpMode"]) { jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES]; } else { jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlockCondition:@"Get 3000 points in Collect!"]; - } + }*/ [gameModes addObject:jumpSelection]; diff --git a/Resources/Info.plist b/Resources/Info.plist index 7a4d9c5..c280170 100755 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -33,7 +33,7 @@ CFBundleURLTypes CFBundleVersion - 61 + 62 LSRequiresIPhoneOS UIPrerenderedIcon @@ -49,7 +49,7 @@ UISupportedInterfaceOrientations - UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight UTExportedTypeDeclarations -- cgit 1.4.1