Merged in changes from default branch

1 files changed, 18 insertions, 0 deletions

@@ -117,6 +117,10 @@
                 6C39CFF813FD7638002B21AF /* GameModeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFF713FD7637002B21AF /* GameModeSelectionLayer.m */; };
                 6C39D00813FD9037002B21AF /* florence.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39D00713FD9037002B21AF /* florence.png */; };
                 6C39D01213FD9945002B21AF /* paris.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39D01113FD9945002B21AF /* paris.png */; };
+                6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFE413FC4635002B21AF /* JumpGameMode.m */; };
+                6C39CFE713FC46CD002B21AF /* water.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE613FC46CD002B21AF /* water.png */; };
+                6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE813FC8AC4002B21AF /* jump2.png */; };
+                6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFEA13FC8ACA002B21AF /* jump.png */; };
                 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; };
                 6CC89DD913F2F4E6003704F7 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */; };
                 6CC89DDF13F31413003704F7 /* TutorialMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC89DDE13F31413003704F7 /* TutorialMode.m */; };
@@ -442,6 +446,11 @@
                 6C39CFF713FD7637002B21AF /* GameModeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameModeSelectionLayer.m; sourceTree = "<group>"; };
                 6C39D00713FD9037002B21AF /* florence.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = florence.png; sourceTree = "<group>"; };
                 6C39D01113FD9945002B21AF /* paris.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = paris.png; sourceTree = "<group>"; };
+                6C39CFE313FC4635002B21AF /* JumpGameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpGameMode.h; sourceTree = "<group>"; };
+                6C39CFE413FC4635002B21AF /* JumpGameMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JumpGameMode.m; sourceTree = "<group>"; };
+                6C39CFE613FC46CD002B21AF /* water.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = water.png; sourceTree = "<group>"; };
+                6C39CFE813FC8AC4002B21AF /* jump2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump2.png; sourceTree = "<group>"; };
+                6C39CFEA13FC8ACA002B21AF /* jump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump.png; sourceTree = "<group>"; };
                 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; };
                 6CB532581403BA4F00780A5E /* GameModeSelectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameModeSelectionDelegate.h; sourceTree = "<group>"; };
                 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
@@ -765,6 +774,7 @@
                 3F6C7F4D13D647B600C038FE /* Sprites */ = {
                         isa = PBXGroup;
                         children = (
+                                6C39CFE613FC46CD002B21AF /* water.png */,
                                 6C29041113EAEC8A0032DA0F /* framestuff.png */,
                                 3F6C7EE013D636BE00C038FE /* rock.png */,
                                 3F63FA3E13D4EE53003B3D14 /* oneup.png */,
@@ -803,6 +813,8 @@
                         children = (
                                 6C19F1641401917900F9CCD3 /* feedback2.png */,
                                 6C19F1621401917500F9CCD3 /* feedback.png */,
+                                6C39CFEA13FC8ACA002B21AF /* jump.png */,
+                                6C39CFE813FC8AC4002B21AF /* jump2.png */,
                                 6C39CFE113FC2713002B21AF /* tutorial2.png */,
                                 6C39CFDF13FC2708002B21AF /* tutorial.png */,
                                 3F7D0F4813D8F17C00B6CE14 /* highscores.png */,
@@ -911,6 +923,8 @@
                                 3FE79CD313D4DE37001A6B93 /* ClassicGameMode.m */,
                                 6CC89DDD13F31413003704F7 /* TutorialMode.h */,
                                 6CC89DDE13F31413003704F7 /* TutorialMode.m */,
+                                6C39CFE313FC4635002B21AF /* JumpGameMode.h */,
+                                6C39CFE413FC4635002B21AF /* JumpGameMode.m */,
                         );
                         name = "Game Modes";
                         sourceTree = "<group>";
@@ -1437,6 +1451,9 @@
                                 6C39D01213FD9945002B21AF /* paris.png in Resources */,
                                 6C19F1631401917500F9CCD3 /* feedback.png in Resources */,
                                 6C19F1651401917900F9CCD3 /* feedback2.png in Resources */,
+                                6C39CFE713FC46CD002B21AF /* water.png in Resources */,
+                                6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */,
+                                6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -1487,6 +1504,7 @@
                                 6C18C3D214033DC50005AA4C /* CocosOverlayScrollView.m in Sources */,
                                 6C18C3D314033DC60005AA4C /* NMPanelMenu.m in Sources */,
                                 6C18C3D414033DC60005AA4C /* TouchDelegatingView.m in Sources */,
+                                6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };