Merge pull request #82 from synap5e/final

Final
synap5e · Jun 23, 2015 · f08d03c · f08d03c
2 parents 26d8003 + 3a6a20d
commit f08d03c
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 12 deletions.
diff --git a/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta b/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity
diff --git a/Assets/Scripts/MainMenu.meta → Assets/Scripts/Menu.meta b/Assets/Scripts/MainMenu.meta → Assets/Scripts/Menu.meta
diff --git a/Assets/Scripts/AudioController.cs → Assets/Scripts/Menu/AudioController.cs b/Assets/Scripts/AudioController.cs → Assets/Scripts/Menu/AudioController.cs
diff --git a/Assets/Scripts/AudioController.cs.meta → Assets/Scripts/Menu/AudioController.cs.meta b/Assets/Scripts/AudioController.cs.meta → Assets/Scripts/Menu/AudioController.cs.meta
diff --git a/...s/Scripts/MainMenu/MainMenu_Controller.cs → Assets/Scripts/Menu/MainMenu_Controller.cs b/...s/Scripts/MainMenu/MainMenu_Controller.cs → Assets/Scripts/Menu/MainMenu_Controller.cs
diff --git a/...ipts/MainMenu/MainMenu_Controller.cs.meta → .../Scripts/Menu/MainMenu_Controller.cs.meta b/...ipts/MainMenu/MainMenu_Controller.cs.meta → .../Scripts/Menu/MainMenu_Controller.cs.meta
diff --git a/Assets/Scripts/Pause.cs → Assets/Scripts/Menu/Pause.cs b/Assets/Scripts/Pause.cs → Assets/Scripts/Menu/Pause.cs
diff --git a/Assets/Scripts/Pause.cs.meta → Assets/Scripts/Menu/Pause.cs.meta b/Assets/Scripts/Pause.cs.meta → Assets/Scripts/Menu/Pause.cs.meta
diff --git a/Assets/Scripts/SettingsController.cs → Assets/Scripts/Menu/SettingsController.cs b/Assets/Scripts/SettingsController.cs → Assets/Scripts/Menu/SettingsController.cs
@@ -33,7 +33,7 @@ public class SettingsController : MonoBehaviour {
 	public float soundEffectsVolume = 10f;	
 
 	public bool motionBlur = false;
-	public bool bloom = false;
+	public bool bloom = true;
 
 	private string filename = "settings.json";
 

diff --git a/Assets/Scripts/SettingsController.cs.meta → ...s/Scripts/Menu/SettingsController.cs.meta b/Assets/Scripts/SettingsController.cs.meta → ...s/Scripts/Menu/SettingsController.cs.meta
diff --git a/settings.json b/settings.json
@@ -1,12 +1,12 @@
 { 
           "settings": { 
             "fov": 75, 
-            "sensitivity": 2.009276, 
+            "sensitivity": 3.732936, 
             "viewmodel": 1
             }, 
           "audio": { 
             "master": 10, 
-            "music": 0, 
+            "music": 4.196415, 
             "sound effects": 10
             }, 
           "video": {