The Great UI Sound Update

ElDewrito · Jul 13, 2015 · 0fa55b7 · 0fa55b7
1 parent 38e940e
commit 0fa55b7
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 10 deletions.
diff --git a/audio/halo3/a_button.wav b/audio/halo3/a_button.wav
diff --git a/audio/halo3/back1.wav b/audio/halo3/back1.wav
diff --git a/audio/halo3/countdown_for_respawn.wav b/audio/halo3/countdown_for_respawn.wav
diff --git a/audio/halo3/cursor_horzontal.wav b/audio/halo3/cursor_horzontal.wav
diff --git a/audio/halo3/loop.wav b/audio/halo3/loop.wav
diff --git a/audio/halo3/player_respawn.wav b/audio/halo3/player_respawn.wav
diff --git a/audio/halo3/start_button.wav b/audio/halo3/start_button.wav
diff --git a/css/dewrito.css b/css/dewrito.css
@@ -1,6 +1,6 @@
 #donation {
     font-family: "Conduit ITC";
-    font-size: 16px;
+    font-size: 18px;
     color: #fff;
     text-decoration: none;
     cursor: pointer;

diff --git a/css/reach.css b/css/reach.css
@@ -377,7 +377,7 @@ audio {
     width: 680px;
     position: absolute;
     left: 300px;
-    top: 280px;
+    top: 200px;
 }
 #credits table td.label {
     width: 540px;

diff --git a/index.html b/index.html
@@ -133,6 +133,10 @@
 					<td class="label">Flags, Locks, &amp; Bug Fixes</td>
 					<td class="name">Limited</td>
 				</tr>
+				<tr class="credit">
+					<td class="label">UI Sound Effects</td>
+					<td class="name">Shad0wshayd3</td>
+				</tr>
 				<tr class="credit">
 					<td class="label">Loading Screens</td>
 					<td class="name">Personality</td>
@@ -212,9 +216,11 @@
 		<div id="bg-cover" class="animated"></div>
 		<audio id="music" autoplay></audio>
 		<div id="videos"></div>
-		<audio id="beep" src="audio/beep.ogg" type="audio/ogg"></audio>
-		<audio id="click" src="audio/click.ogg" type="audio/ogg"></audio>
-		<audio id="slide" src="audio/slide.ogg" type="audio/ogg"></audio>
+		<audio id="connectgamepad" src="audio/halo3/loop.wav" type="audio/wav"></audio>
+		<audio id="beeep" src="audio/halo3/player_respawn.wav" type="audio/wav"></audio>
+		<audio id="beep" src="audio/halo3/countdown_for_respawn.wav" type="audio/wav"></audio>
+		<audio id="click" src="audio/halo3/cursor_horzontal.wav" type="audio/wav"></audio>
+		<audio id="slide" src="audio/halo3/a_button.wav" type="audio/wav"></audio>
 	</div>
 </body>
 <script src="js/dewMenu.js"></script>

diff --git a/js/dewGamepad.js b/js/dewGamepad.js
@@ -46,6 +46,7 @@ function gamepadBind() {
 		gamepadSelect("main1");
 		usingGamepad = true;
 		popup("Controller connected! Use the left thumbstick to navigate the menu. Use the A and B buttons to go forwards and back.");
+		$('#connectgamepad')[0].play();
 	});
 
 	gamepad.bind(Gamepad.Event.DISCONNECTED, function(device) {

diff --git a/js/dewSettings.js b/js/dewSettings.js
@@ -126,14 +126,14 @@ var user = {
 			"typeof": "select",
 			"category": "menu",
 			"name": "EFFECTS VOLUME",
-			"current": isset($.cookie('sfxvolume', Number), 0.05),
+			"current": isset($.cookie('sfxvolume', Number), 0.25),
 			"min": 0,
 			"max": 1,
 			"increment": 0.05,
 			"update": function() {
 				var c = settings.sfxvolume.current;
 				$('#click')[0].volume = c;
-				$('#slide')[0].volume = (c * 10 >= 1) ? 1 : c * 10;
+				$('#slide')[0].volume = c;
 				$("[data-option='sfxvolume']").children('.value').text(Math.round(c * 100));
 			}
 		},

diff --git a/js/dewrito.js b/js/dewrito.js
@@ -904,7 +904,7 @@ function changeMenu(menu, details) {
 			"top": "720px"
 		});
 		$('#dewrito').css({
-			"top": "50px",
+			"top": "-30px",
 			"left": "265px",
 			"-webkit-transition-timing-function": "200ms",
 			"-webkit-transition-delay": "0ms"
@@ -1169,10 +1169,20 @@ function playerInfo(name) {
 }
 
 function startgame(ip, mode) {
+    loopPlayers = false;
 	var password;
 	if (mode[0] === "JOIN")
 		password = servers[selectedserver].password == true ? prompt(servers[selectedserver].name + " has a password, enter the password to join", "") : "";
 	$('#beep')[0].play();
+    setTimeout(function() {
+        $('#beep')[0].play();
+    },1000);
+    setTimeout(function() {
+        $('#beep')[0].play();
+    },2000);
+    setTimeout(function() {
+        $('#beeep')[0].play();
+    },3000);
 	$('#music')[0].pause();
 	$('#black').fadeIn(3000);
 	delay(function() {
@@ -1194,8 +1204,6 @@ function startgame(ip, mode) {
 		} else if (mode[0] === "START" && mode[1] === "GAME") {
 			dewRcon.send('start');
 		}
-		loopPlayers = true;
-		lobbyLoop(ip);
 	}, 3700);
 }