diff options
author | Starla Insigna <starla4444@gmail.com> | 2011-08-07 10:04:54 -0400 |
---|---|---|
committer | Starla Insigna <starla4444@gmail.com> | 2011-08-07 10:04:54 -0400 |
commit | 1d9ed882de4e2e3a53cdd5e90edc25e8ae10af1b (patch) | |
tree | 4a8f7445cf57b4de4295f81ff0a70c6b5f49c978 /Cart Collect.xcodeproj | |
parent | 0a8fed12704bf343ad9604f964b71b3f50495382 (diff) | |
download | cartcollect-1d9ed882de4e2e3a53cdd5e90edc25e8ae10af1b.tar.gz cartcollect-1d9ed882de4e2e3a53cdd5e90edc25e8ae10af1b.tar.bz2 cartcollect-1d9ed882de4e2e3a53cdd5e90edc25e8ae10af1b.zip |
Implemented tutorial bubbles
GameLayer now has support for pausing game flow and displaying a tutorial bubble that the user can tap to dismiss. No code has been written, however, to make use of this, because I think it may be simpler to abstract GameLayer out somewhat and create a separate game mode for the tutorial. Deliberation required. PauseLayer has also been removed and the behavior has been brought into GameLayer. Refs #193
Diffstat (limited to 'Cart Collect.xcodeproj')
-rwxr-xr-x | Cart Collect.xcodeproj/project.pbxproj | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/Cart Collect.xcodeproj/project.pbxproj b/Cart Collect.xcodeproj/project.pbxproj index 2ca790c..b3c5dfa 100755 --- a/Cart Collect.xcodeproj/project.pbxproj +++ b/Cart Collect.xcodeproj/project.pbxproj | |||
@@ -40,7 +40,6 @@ | |||
40 | 3F7D0F4F13D8F17C00B6CE14 /* newgame2.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F7D0F4B13D8F17C00B6CE14 /* newgame2.png */; }; | 40 | 3F7D0F4F13D8F17C00B6CE14 /* newgame2.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F7D0F4B13D8F17C00B6CE14 /* newgame2.png */; }; |
41 | 3F8394F313D732330059AEE8 /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8394F213D732330059AEE8 /* pause.png */; }; | 41 | 3F8394F313D732330059AEE8 /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8394F213D732330059AEE8 /* pause.png */; }; |
42 | 3F8394F513D7328E0059AEE8 /* pause2.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8394F413D7328E0059AEE8 /* pause2.png */; }; | 42 | 3F8394F513D7328E0059AEE8 /* pause2.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8394F413D7328E0059AEE8 /* pause2.png */; }; |
43 | 3F8394F813D7336D0059AEE8 /* PauseLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F8394F713D7336D0059AEE8 /* PauseLayer.m */; }; | ||
44 | 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F83955213D739B10059AEE8 /* MainMenuLayer.m */; }; | 43 | 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F83955213D739B10059AEE8 /* MainMenuLayer.m */; }; |
45 | 3F8395B813D744420059AEE8 /* cartdata.sqlite3 in Resources */ = {isa = PBXBuildFile; fileRef = 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */; }; | 44 | 3F8395B813D744420059AEE8 /* cartdata.sqlite3 in Resources */ = {isa = PBXBuildFile; fileRef = 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */; }; |
46 | 3F8395D113D746200059AEE8 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */; }; | 45 | 3F8395D113D746200059AEE8 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */; }; |
@@ -85,6 +84,8 @@ | |||
85 | 50F4144910692EE7002A0D5E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144410692EE7002A0D5E /* Default.png */; }; | 84 | 50F4144910692EE7002A0D5E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144410692EE7002A0D5E /* Default.png */; }; |
86 | 50F4144A10692EE7002A0D5E /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144510692EE7002A0D5E /* fps_images.png */; }; | 85 | 50F4144A10692EE7002A0D5E /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144510692EE7002A0D5E /* fps_images.png */; }; |
87 | 50F4144B10692EE7002A0D5E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144610692EE7002A0D5E /* Icon.png */; }; | 86 | 50F4144B10692EE7002A0D5E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144610692EE7002A0D5E /* Icon.png */; }; |
87 | 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; }; | ||
88 | 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; }; | ||
88 | 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; }; | 89 | 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; }; |
89 | DC6640030F83B3EA000B3E49 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */; }; | 90 | DC6640030F83B3EA000B3E49 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */; }; |
90 | DC6640050F83B3EA000B3E49 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640040F83B3EA000B3E49 /* OpenAL.framework */; }; | 91 | DC6640050F83B3EA000B3E49 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640040F83B3EA000B3E49 /* OpenAL.framework */; }; |
@@ -330,8 +331,6 @@ | |||
330 | 3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValuableObject.h; sourceTree = "<group>"; }; | 331 | 3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValuableObject.h; sourceTree = "<group>"; }; |
331 | 3F8394F213D732330059AEE8 /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause.png; sourceTree = "<group>"; }; | 332 | 3F8394F213D732330059AEE8 /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause.png; sourceTree = "<group>"; }; |
332 | 3F8394F413D7328E0059AEE8 /* pause2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause2.png; sourceTree = "<group>"; }; | 333 | 3F8394F413D7328E0059AEE8 /* pause2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause2.png; sourceTree = "<group>"; }; |
333 | 3F8394F613D7336D0059AEE8 /* PauseLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PauseLayer.h; sourceTree = "<group>"; }; | ||
334 | 3F8394F713D7336D0059AEE8 /* PauseLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PauseLayer.m; sourceTree = "<group>"; }; | ||
335 | 3F83955113D739B10059AEE8 /* MainMenuLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainMenuLayer.h; sourceTree = "<group>"; }; | 334 | 3F83955113D739B10059AEE8 /* MainMenuLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainMenuLayer.h; sourceTree = "<group>"; }; |
336 | 3F83955213D739B10059AEE8 /* MainMenuLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainMenuLayer.m; sourceTree = "<group>"; }; | 335 | 3F83955213D739B10059AEE8 /* MainMenuLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainMenuLayer.m; sourceTree = "<group>"; }; |
337 | 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = cartdata.sqlite3; sourceTree = "<group>"; }; | 336 | 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = cartdata.sqlite3; sourceTree = "<group>"; }; |
@@ -374,6 +373,9 @@ | |||
374 | 50F4144510692EE7002A0D5E /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; }; | 373 | 50F4144510692EE7002A0D5E /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; }; |
375 | 50F4144610692EE7002A0D5E /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; }; | 374 | 50F4144610692EE7002A0D5E /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; }; |
376 | 50F4144710692EE7002A0D5E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | 375 | 50F4144710692EE7002A0D5E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; |
376 | 6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = "<group>"; }; | ||
377 | 6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = "<group>"; }; | ||
378 | 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; }; | ||
377 | 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; }; | 379 | 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; }; |
378 | DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; | 380 | DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; |
379 | DC6640040F83B3EA000B3E49 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; | 381 | DC6640040F83B3EA000B3E49 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; |
@@ -654,6 +656,7 @@ | |||
654 | 2D500B1D0D5A766B00DBA0E3 /* Classes */ = { | 656 | 2D500B1D0D5A766B00DBA0E3 /* Classes */ = { |
655 | isa = PBXGroup; | 657 | isa = PBXGroup; |
656 | children = ( | 658 | children = ( |
659 | 6C5887E313EE3ED900B5A80A /* Items */, | ||
657 | E0F81035120A173C005866B8 /* GameConfig.h */, | 660 | E0F81035120A173C005866B8 /* GameConfig.h */, |
658 | E0F81036120A173C005866B8 /* RootViewController.h */, | 661 | E0F81036120A173C005866B8 /* RootViewController.h */, |
659 | E0F81037120A173C005866B8 /* RootViewController.m */, | 662 | E0F81037120A173C005866B8 /* RootViewController.m */, |
@@ -661,27 +664,16 @@ | |||
661 | 507022A2107672FA00393637 /* Cart_CollectAppDelegate.m */, | 664 | 507022A2107672FA00393637 /* Cart_CollectAppDelegate.m */, |
662 | 3FE79CD213D4DE37001A6B93 /* GameLayer.h */, | 665 | 3FE79CD213D4DE37001A6B93 /* GameLayer.h */, |
663 | 3FE79CD313D4DE37001A6B93 /* GameLayer.m */, | 666 | 3FE79CD313D4DE37001A6B93 /* GameLayer.m */, |
664 | 3F6C7C4D13D5E1B600C038FE /* FallingObject.h */, | ||
665 | 3F6C7C4E13D5E1B600C038FE /* FallingObject.m */, | ||
666 | 3F6C7C6B13D5E51800C038FE /* Cherry.h */, | ||
667 | 3F6C7C6C13D5E51800C038FE /* Cherry.m */, | ||
668 | 3F6C7C6E13D5E54E00C038FE /* Bottle.h */, | ||
669 | 3F6C7C6F13D5E54E00C038FE /* Bottle.m */, | ||
670 | 3F6C7C7113D5E57100C038FE /* OneUp.h */, | ||
671 | 3F6C7C7213D5E57100C038FE /* OneUp.m */, | ||
672 | 3F6C7EE213D636CF00C038FE /* Rock.h */, | ||
673 | 3F6C7EE313D636CF00C038FE /* Rock.m */, | ||
674 | 3F6C7EE713D6377D00C038FE /* GameOverLayer.h */, | 667 | 3F6C7EE713D6377D00C038FE /* GameOverLayer.h */, |
675 | 3F6C7EE813D6377D00C038FE /* GameOverLayer.m */, | 668 | 3F6C7EE813D6377D00C038FE /* GameOverLayer.m */, |
676 | 3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */, | ||
677 | 3F8394F613D7336D0059AEE8 /* PauseLayer.h */, | ||
678 | 3F8394F713D7336D0059AEE8 /* PauseLayer.m */, | ||
679 | 3F83955213D739B10059AEE8 /* MainMenuLayer.m */, | 669 | 3F83955213D739B10059AEE8 /* MainMenuLayer.m */, |
680 | 3F83955113D739B10059AEE8 /* MainMenuLayer.h */, | 670 | 3F83955113D739B10059AEE8 /* MainMenuLayer.h */, |
681 | 3F03221413D78F8C00E6A708 /* HighscoreListController.h */, | 671 | 3F03221413D78F8C00E6A708 /* HighscoreListController.h */, |
682 | 3F03221513D78F8C00E6A708 /* HighscoreListController.m */, | 672 | 3F03221513D78F8C00E6A708 /* HighscoreListController.m */, |
683 | 3F03221713D7904E00E6A708 /* Highscore.h */, | 673 | 3F03221713D7904E00E6A708 /* Highscore.h */, |
684 | 3F03221813D7904E00E6A708 /* Highscore.m */, | 674 | 3F03221813D7904E00E6A708 /* Highscore.m */, |
675 | 6C29040E13EAEB590032DA0F /* TutorialBubble.h */, | ||
676 | 6C29040F13EAEB590032DA0F /* TutorialBubble.m */, | ||
685 | ); | 677 | ); |
686 | path = Classes; | 678 | path = Classes; |
687 | sourceTree = "<group>"; | 679 | sourceTree = "<group>"; |
@@ -699,6 +691,7 @@ | |||
699 | 3F6C7F4D13D647B600C038FE /* Sprites */ = { | 691 | 3F6C7F4D13D647B600C038FE /* Sprites */ = { |
700 | isa = PBXGroup; | 692 | isa = PBXGroup; |
701 | children = ( | 693 | children = ( |
694 | 6C29041113EAEC8A0032DA0F /* framestuff.png */, | ||
702 | 3F6C7EE013D636BE00C038FE /* rock.png */, | 695 | 3F6C7EE013D636BE00C038FE /* rock.png */, |
703 | 3F63FA3E13D4EE53003B3D14 /* oneup.png */, | 696 | 3F63FA3E13D4EE53003B3D14 /* oneup.png */, |
704 | 3F63FA3C13D4EE4D003B3D14 /* cherry.png */, | 697 | 3F63FA3C13D4EE4D003B3D14 /* cherry.png */, |
@@ -828,6 +821,24 @@ | |||
828 | path = Resources; | 821 | path = Resources; |
829 | sourceTree = "<group>"; | 822 | sourceTree = "<group>"; |
830 | }; | 823 | }; |
824 | 6C5887E313EE3ED900B5A80A /* Items */ = { | ||
825 | isa = PBXGroup; | ||
826 | children = ( | ||
827 | 3F6C7C4D13D5E1B600C038FE /* FallingObject.h */, | ||
828 | 3F6C7C4E13D5E1B600C038FE /* FallingObject.m */, | ||
829 | 3F6C7C6B13D5E51800C038FE /* Cherry.h */, | ||
830 | 3F6C7C6C13D5E51800C038FE /* Cherry.m */, | ||
831 | 3F6C7C6E13D5E54E00C038FE /* Bottle.h */, | ||
832 | 3F6C7C6F13D5E54E00C038FE /* Bottle.m */, | ||
833 | 3F6C7C7113D5E57100C038FE /* OneUp.h */, | ||
834 | 3F6C7C7213D5E57100C038FE /* OneUp.m */, | ||
835 | 3F6C7EE213D636CF00C038FE /* Rock.h */, | ||
836 | 3F6C7EE313D636CF00C038FE /* Rock.m */, | ||
837 | 3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */, | ||
838 | ); | ||
839 | name = Items; | ||
840 | sourceTree = "<group>"; | ||
841 | }; | ||
831 | E02BBB19126CC2F5006E46A2 /* cocos2d */ = { | 842 | E02BBB19126CC2F5006E46A2 /* cocos2d */ = { |
832 | isa = PBXGroup; | 843 | isa = PBXGroup; |
833 | children = ( | 844 | children = ( |
@@ -1289,6 +1300,7 @@ | |||
1289 | 3F7D0F4E13D8F17C00B6CE14 /* newgame.png in Resources */, | 1300 | 3F7D0F4E13D8F17C00B6CE14 /* newgame.png in Resources */, |
1290 | 3F7D0F4F13D8F17C00B6CE14 /* newgame2.png in Resources */, | 1301 | 3F7D0F4F13D8F17C00B6CE14 /* newgame2.png in Resources */, |
1291 | 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */, | 1302 | 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */, |
1303 | 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */, | ||
1292 | ); | 1304 | ); |
1293 | runOnlyForDeploymentPostprocessing = 0; | 1305 | runOnlyForDeploymentPostprocessing = 0; |
1294 | }; | 1306 | }; |
@@ -1325,10 +1337,10 @@ | |||
1325 | 3F6C7C7313D5E57100C038FE /* OneUp.m in Sources */, | 1337 | 3F6C7C7313D5E57100C038FE /* OneUp.m in Sources */, |
1326 | 3F6C7EE413D636CF00C038FE /* Rock.m in Sources */, | 1338 | 3F6C7EE413D636CF00C038FE /* Rock.m in Sources */, |
1327 | 3F6C7EE913D6377D00C038FE /* GameOverLayer.m in Sources */, | 1339 | 3F6C7EE913D6377D00C038FE /* GameOverLayer.m in Sources */, |
1328 | 3F8394F813D7336D0059AEE8 /* PauseLayer.m in Sources */, | ||
1329 | 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */, | 1340 | 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */, |
1330 | 3F03221613D78F8C00E6A708 /* HighscoreListController.m in Sources */, | 1341 | 3F03221613D78F8C00E6A708 /* HighscoreListController.m in Sources */, |
1331 | 3F03221913D7904E00E6A708 /* Highscore.m in Sources */, | 1342 | 3F03221913D7904E00E6A708 /* Highscore.m in Sources */, |
1343 | 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */, | ||
1332 | ); | 1344 | ); |
1333 | runOnlyForDeploymentPostprocessing = 0; | 1345 | runOnlyForDeploymentPostprocessing = 0; |
1334 | }; | 1346 | }; |