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

1 files changed, 29 insertions, 17 deletions

@@ -40,7 +40,6 @@
                 3F7D0F4F13D8F17C00B6CE14 /* newgame2.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F7D0F4B13D8F17C00B6CE14 /* newgame2.png */; };
                 3F8394F313D732330059AEE8 /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8394F213D732330059AEE8 /* pause.png */; };
                 3F8394F513D7328E0059AEE8 /* pause2.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8394F413D7328E0059AEE8 /* pause2.png */; };
-                3F8394F813D7336D0059AEE8 /* PauseLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F8394F713D7336D0059AEE8 /* PauseLayer.m */; };
                 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F83955213D739B10059AEE8 /* MainMenuLayer.m */; };
                 3F8395B813D744420059AEE8 /* cartdata.sqlite3 in Resources */ = {isa = PBXBuildFile; fileRef = 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */; };
                 3F8395D113D746200059AEE8 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */; };
@@ -85,6 +84,8 @@
                 50F4144910692EE7002A0D5E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144410692EE7002A0D5E /* Default.png */; };
                 50F4144A10692EE7002A0D5E /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144510692EE7002A0D5E /* fps_images.png */; };
                 50F4144B10692EE7002A0D5E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F4144610692EE7002A0D5E /* Icon.png */; };
+                6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; };
+                6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; };
                 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; };
                 DC6640030F83B3EA000B3E49 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */; };
                 DC6640050F83B3EA000B3E49 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640040F83B3EA000B3E49 /* OpenAL.framework */; };
@@ -330,8 +331,6 @@
                 3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValuableObject.h; sourceTree = "<group>"; };
                 3F8394F213D732330059AEE8 /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause.png; sourceTree = "<group>"; };
                 3F8394F413D7328E0059AEE8 /* pause2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause2.png; sourceTree = "<group>"; };
-                3F8394F613D7336D0059AEE8 /* PauseLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PauseLayer.h; sourceTree = "<group>"; };
-                3F8394F713D7336D0059AEE8 /* PauseLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PauseLayer.m; sourceTree = "<group>"; };
                 3F83955113D739B10059AEE8 /* MainMenuLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainMenuLayer.h; sourceTree = "<group>"; };
                 3F83955213D739B10059AEE8 /* MainMenuLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainMenuLayer.m; sourceTree = "<group>"; };
                 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = cartdata.sqlite3; sourceTree = "<group>"; };
@@ -374,6 +373,9 @@
                 50F4144510692EE7002A0D5E /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; };
                 50F4144610692EE7002A0D5E /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
                 50F4144710692EE7002A0D5E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+                6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = "<group>"; };
+                6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = "<group>"; };
+                6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; };
                 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; };
                 DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
                 DC6640040F83B3EA000B3E49 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
@@ -654,6 +656,7 @@
                 2D500B1D0D5A766B00DBA0E3 /* Classes */ = {
                         isa = PBXGroup;
                         children = (
+                                6C5887E313EE3ED900B5A80A /* Items */,
                                 E0F81035120A173C005866B8 /* GameConfig.h */,
                                 E0F81036120A173C005866B8 /* RootViewController.h */,
                                 E0F81037120A173C005866B8 /* RootViewController.m */,
@@ -661,27 +664,16 @@
                                 507022A2107672FA00393637 /* Cart_CollectAppDelegate.m */,
                                 3FE79CD213D4DE37001A6B93 /* GameLayer.h */,
                                 3FE79CD313D4DE37001A6B93 /* GameLayer.m */,
-                                3F6C7C4D13D5E1B600C038FE /* FallingObject.h */,
-                                3F6C7C4E13D5E1B600C038FE /* FallingObject.m */,
-                                3F6C7C6B13D5E51800C038FE /* Cherry.h */,
-                                3F6C7C6C13D5E51800C038FE /* Cherry.m */,
-                                3F6C7C6E13D5E54E00C038FE /* Bottle.h */,
-                                3F6C7C6F13D5E54E00C038FE /* Bottle.m */,
-                                3F6C7C7113D5E57100C038FE /* OneUp.h */,
-                                3F6C7C7213D5E57100C038FE /* OneUp.m */,
-                                3F6C7EE213D636CF00C038FE /* Rock.h */,
-                                3F6C7EE313D636CF00C038FE /* Rock.m */,
                                 3F6C7EE713D6377D00C038FE /* GameOverLayer.h */,
                                 3F6C7EE813D6377D00C038FE /* GameOverLayer.m */,
-                                3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */,
-                                3F8394F613D7336D0059AEE8 /* PauseLayer.h */,
-                                3F8394F713D7336D0059AEE8 /* PauseLayer.m */,
                                 3F83955213D739B10059AEE8 /* MainMenuLayer.m */,
                                 3F83955113D739B10059AEE8 /* MainMenuLayer.h */,
                                 3F03221413D78F8C00E6A708 /* HighscoreListController.h */,
                                 3F03221513D78F8C00E6A708 /* HighscoreListController.m */,
                                 3F03221713D7904E00E6A708 /* Highscore.h */,
                                 3F03221813D7904E00E6A708 /* Highscore.m */,
+                                6C29040E13EAEB590032DA0F /* TutorialBubble.h */,
+                                6C29040F13EAEB590032DA0F /* TutorialBubble.m */,
                         );
                         path = Classes;
                         sourceTree = "<group>";
@@ -699,6 +691,7 @@
                 3F6C7F4D13D647B600C038FE /* Sprites */ = {
                         isa = PBXGroup;
                         children = (
+                                6C29041113EAEC8A0032DA0F /* framestuff.png */,
                                 3F6C7EE013D636BE00C038FE /* rock.png */,
                                 3F63FA3E13D4EE53003B3D14 /* oneup.png */,
                                 3F63FA3C13D4EE4D003B3D14 /* cherry.png */,
@@ -828,6 +821,24 @@
                         path = Resources;
                         sourceTree = "<group>";
                 };
+                6C5887E313EE3ED900B5A80A /* Items */ = {
+                        isa = PBXGroup;
+                        children = (
+                                3F6C7C4D13D5E1B600C038FE /* FallingObject.h */,
+                                3F6C7C4E13D5E1B600C038FE /* FallingObject.m */,
+                                3F6C7C6B13D5E51800C038FE /* Cherry.h */,
+                                3F6C7C6C13D5E51800C038FE /* Cherry.m */,
+                                3F6C7C6E13D5E54E00C038FE /* Bottle.h */,
+                                3F6C7C6F13D5E54E00C038FE /* Bottle.m */,
+                                3F6C7C7113D5E57100C038FE /* OneUp.h */,
+                                3F6C7C7213D5E57100C038FE /* OneUp.m */,
+                                3F6C7EE213D636CF00C038FE /* Rock.h */,
+                                3F6C7EE313D636CF00C038FE /* Rock.m */,
+                                3F8394AC13D72E2C0059AEE8 /* ValuableObject.h */,
+                        );
+                        name = Items;
+                        sourceTree = "<group>";
+                };
                 E02BBB19126CC2F5006E46A2 /* cocos2d */ = {
                         isa = PBXGroup;
                         children = (
@@ -1289,6 +1300,7 @@
                                 3F7D0F4E13D8F17C00B6CE14 /* newgame.png in Resources */,
                                 3F7D0F4F13D8F17C00B6CE14 /* newgame2.png in Resources */,
                                 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */,
+                                6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -1325,10 +1337,10 @@
                                 3F6C7C7313D5E57100C038FE /* OneUp.m in Sources */,
                                 3F6C7EE413D636CF00C038FE /* Rock.m in Sources */,
                                 3F6C7EE913D6377D00C038FE /* GameOverLayer.m in Sources */,
-                                3F8394F813D7336D0059AEE8 /* PauseLayer.m in Sources */,
                                 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */,
                                 3F03221613D78F8C00E6A708 /* HighscoreListController.m in Sources */,
                                 3F03221913D7904E00E6A708 /* Highscore.m in Sources */,
+                                6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };