Merge branch 'master' of 10.45.18.157:drugs

Conflicts: GGJ13/Drugs&Rock.xcodeproj/project.pbxproj GGJ13/GGJ13/WHGameScene.mm
biou · Jan 27, 2013 · 266ee07 · 266ee07
2 parents 7d8c170 + 1abaa4a
commit 266ee07
Show file tree

Hide file tree

Showing 13 changed files with 344 additions and 130 deletions.
diff --git a/GGJ13/Drugs&Rock.xcodeproj/project.pbxproj b/GGJ13/Drugs&Rock.xcodeproj/project.pbxproj
@@ -50,6 +50,9 @@
 		3294D82E16B4508200E8A2DC /* ElectroDev-128bpm.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 3294D82C16B4508200E8A2DC /* ElectroDev-128bpm.aifc */; };
 		3294D82F16B4508200E8A2DC /* ElectroIntro-128bpm.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 3294D82D16B4508200E8A2DC /* ElectroIntro-128bpm.aifc */; };
 		3294D83116B453CE00E8A2DC /* HipHop-90bpm.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 3294D83016B453CE00E8A2DC /* HipHop-90bpm.aifc */; };
+		329D369216B56936001BDACA /* OrchestreFBI.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 329D369116B56936001BDACA /* OrchestreFBI.aifc */; };
+		329D369516B56D55001BDACA /* ECGFast.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 329D369316B56D55001BDACA /* ECGFast.aifc */; };
+		329D369616B56D55001BDACA /* ECGSlow.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 329D369416B56D55001BDACA /* ECGSlow.aifc */; };
 		32A1C0E216B424D600B4DEF3 /* bouton-off.png in Resources */ = {isa = PBXBuildFile; fileRef = 32A1C0DD16B424D600B4DEF3 /* bouton-off.png */; };
 		32A1C0E316B424D600B4DEF3 /* bouton-on-no.png in Resources */ = {isa = PBXBuildFile; fileRef = 32A1C0DE16B424D600B4DEF3 /* bouton-on-no.png */; };
 		32A1C0E416B424D600B4DEF3 /* bouton-on-yes.png in Resources */ = {isa = PBXBuildFile; fileRef = 32A1C0DF16B424D600B4DEF3 /* bouton-on-yes.png */; };
@@ -400,6 +403,9 @@
 		3294D82C16B4508200E8A2DC /* ElectroDev-128bpm.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ElectroDev-128bpm.aifc"; path = "Resources/ElectroDev-128bpm.aifc"; sourceTree = "<group>"; };
 		3294D82D16B4508200E8A2DC /* ElectroIntro-128bpm.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ElectroIntro-128bpm.aifc"; path = "Resources/ElectroIntro-128bpm.aifc"; sourceTree = "<group>"; };
 		3294D83016B453CE00E8A2DC /* HipHop-90bpm.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = "HipHop-90bpm.aifc"; path = "Resources/HipHop-90bpm.aifc"; sourceTree = "<group>"; };
+		329D369116B56936001BDACA /* OrchestreFBI.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = OrchestreFBI.aifc; path = Resources/OrchestreFBI.aifc; sourceTree = "<group>"; };
+		329D369316B56D55001BDACA /* ECGFast.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = ECGFast.aifc; path = Resources/ECGFast.aifc; sourceTree = "<group>"; };
+		329D369416B56D55001BDACA /* ECGSlow.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = ECGSlow.aifc; path = Resources/ECGSlow.aifc; sourceTree = "<group>"; };
 		32A1C0DD16B424D600B4DEF3 /* bouton-off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bouton-off.png"; path = "Resources/bouton-off.png"; sourceTree = "<group>"; };
 		32A1C0DE16B424D600B4DEF3 /* bouton-on-no.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bouton-on-no.png"; path = "Resources/bouton-on-no.png"; sourceTree = "<group>"; };
 		32A1C0DF16B424D600B4DEF3 /* bouton-on-yes.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bouton-on-yes.png"; path = "Resources/bouton-on-yes.png"; sourceTree = "<group>"; };
@@ -638,6 +644,9 @@
 			isa = PBXGroup;
 			children = (
 				B5CEAE1C16B573FB006AFA22 /* blank.png */,
+				329D369316B56D55001BDACA /* ECGFast.aifc */,
+				329D369416B56D55001BDACA /* ECGSlow.aifc */,
+				329D369116B56936001BDACA /* OrchestreFBI.aifc */,
 				32FB553716B5538900F1CB4E /* buzz.caf */,
 				32FB553816B5538900F1CB4E /* Click.caf */,
 				32FB553916B5538A00F1CB4E /* ECGFast.caf */,
@@ -1342,6 +1351,9 @@
 				32FB554616B5538C00F1CB4E /* Swoosh4.caf in Resources */,
 				B5CEAE1B16B570C5006AFA22 /* win.png in Resources */,
 				B5CEAE1D16B573FB006AFA22 /* blank.png in Resources */,
+				329D369216B56936001BDACA /* OrchestreFBI.aifc in Resources */,
+				329D369516B56D55001BDACA /* ECGFast.aifc in Resources */,
+				329D369616B56D55001BDACA /* ECGSlow.aifc in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/GGJ13/Drugs&Rock.xcodeproj/project.pbxproj.orig b/GGJ13/Drugs&Rock.xcodeproj/project.pbxproj.orig
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/noliv.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/noliv.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/GGJ13/GGJ13/BBAudioManager.mm b/GGJ13/GGJ13/BBAudioManager.mm
@@ -70,7 +70,10 @@ -(void) playBGMWithIntro:(NSString *)introName andLoop:(NSString *)loopName {
         [self.mainTrack preloadFile:loopName];
         self.mainTrack.numberOfLoops = -1;
         [self.mainTrack play];
-    } else {
+    } else if ([loopName length] ==0) {
+		[self.introTrack preloadFile:introName];
+		[self.introTrack play];
+	} else {
         [self.introTrack preloadFile:introName];
         [self.mainTrack preloadFile:loopName];
 

diff --git a/GGJ13/GGJ13/Resources/ECGFast.aifc b/GGJ13/GGJ13/Resources/ECGFast.aifc
diff --git a/GGJ13/GGJ13/Resources/ECGSlow.aifc b/GGJ13/GGJ13/Resources/ECGSlow.aifc
diff --git a/GGJ13/GGJ13/Resources/OrchestreFBI.aifc b/GGJ13/GGJ13/Resources/OrchestreFBI.aifc
diff --git a/GGJ13/GGJ13/WHBasicLayer.mm b/GGJ13/GGJ13/WHBasicLayer.mm
@@ -38,7 +38,7 @@ - (id)init {
 		switch (mode) {
 			case whGameover:
 				image = @"gameover.png";
-				son = @"";
+				son = @"ECGFast.aifc";
 				break;
 			case whCredits:
 				image = @"credits.png";

diff --git a/GGJ13/GGJ13/WHGameLayer.mm b/GGJ13/GGJ13/WHGameLayer.mm
@@ -248,7 +248,9 @@ -(void)touchBoutonX: (float)bx withNumber: (int)n
 		// NSLog(@"%@", self.boutons);
     } else {
 		[[self.boutons objectAtIndex:n] setDisplayFrame:[[CCSpriteFrameCache sharedSpriteFrameCache] spriteFrameByName:@"bouton-on-no.png"]];
-        [self itemMissed:YES];
+		BBAudioManager * am = [BBAudioManager sharedAM];
+		[am playSFX:@"buzz.caf"];
+		[self itemMissed:YES];
     }
 }
 

diff --git a/GGJ13/GGJ13/WHGameScene.mm b/GGJ13/GGJ13/WHGameScene.mm
@@ -403,20 +403,19 @@ -(void) displayMessage:(int)m {
 	switch (m) {
 		case 0:
 			image = @"slowdown.png";
-			son = @"";
+			son = @"Swoosh4.caf";
 		break;
 		case 1:
 			image = @"speedup.png";
-			son = @"";
+			son = @"Swoosh3.caf";
 		break;
 		case 2:
 			image = @"lsd.png";
-			son = @"";
-            // [self scheduleOnce:@selector(lsdGlowingEffect) delay:0.3f];
+			son = @"Swoosh1.caf";
 		break;
 		case 3:
 			image = @"ghb.png";
-			son = @"";
+			son = @"Swoosh2.caf";
 		break;
 		default:
 		break;