From 7ae6d02bcc935ad484003be4fe209d2370d76676 Mon Sep 17 00:00:00 2001
From: ChrisChin <chinchri1@myvuw.ac.nz>
Date: Tue, 23 Jun 2015 16:41:49 +1200
Subject: [PATCH 1/2] Fixed quit on endmenu, bloom on

Fixed quit on endmenu
bloom on by default
organised scripts
---
 .../Maya/Player Model/Hands_To_Unity.fbm.meta |   9 ---------
 Assets/Prefabs/Player.prefab                  | Bin 178292 -> 178292 bytes
 Assets/Scripts/{MainMenu.meta => Menu.meta}   |   0
 Assets/Scripts/{ => Menu}/AudioController.cs  |   0
 .../{ => Menu}/AudioController.cs.meta        |   0
 .../{MainMenu => Menu}/MainMenu_Controller.cs |   0
 .../MainMenu_Controller.cs.meta               |   0
 Assets/Scripts/{ => Menu}/Pause.cs            |   0
 Assets/Scripts/{ => Menu}/Pause.cs.meta       |   0
 .../Scripts/{ => Menu}/SettingsController.cs  |   2 +-
 .../{ => Menu}/SettingsController.cs.meta     |   0
 settings.json                                 |   4 ++--
 12 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 Assets/Maya/Player Model/Hands_To_Unity.fbm.meta
 rename Assets/Scripts/{MainMenu.meta => Menu.meta} (100%)
 rename Assets/Scripts/{ => Menu}/AudioController.cs (100%)
 rename Assets/Scripts/{ => Menu}/AudioController.cs.meta (100%)
 rename Assets/Scripts/{MainMenu => Menu}/MainMenu_Controller.cs (100%)
 rename Assets/Scripts/{MainMenu => Menu}/MainMenu_Controller.cs.meta (100%)
 rename Assets/Scripts/{ => Menu}/Pause.cs (100%)
 rename Assets/Scripts/{ => Menu}/Pause.cs.meta (100%)
 rename Assets/Scripts/{ => Menu}/SettingsController.cs (99%)
 rename Assets/Scripts/{ => Menu}/SettingsController.cs.meta (100%)

diff --git a/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta b/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta
deleted file mode 100644
index 37f5338..0000000
--- a/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta	
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 67f7274cc8ca55a4c9c63c2b4a535ff3
-folderAsset: yes
-timeCreated: 1431056462
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index f9e34797eb18a1dad3ae538c5f1b79e692d59ed5..d16f45b0dfb066d0e8f8c630dc57e03ccf73ea93 100644
GIT binary patch
delta 37
vcmV+=0NVfb@Cx+s3b4@E0YJ0S*Q3_AWW)g^0he%k0tknouK~B9uL9HviJlUa

delta 37
vcmV+=0NVfb@Cx+s3b4@E0X(zO*Q3_AoD>2i0he%k0tknouK~B9uL9HvfRqv$

diff --git a/Assets/Scripts/MainMenu.meta b/Assets/Scripts/Menu.meta
similarity index 100%
rename from Assets/Scripts/MainMenu.meta
rename to Assets/Scripts/Menu.meta
diff --git a/Assets/Scripts/AudioController.cs b/Assets/Scripts/Menu/AudioController.cs
similarity index 100%
rename from Assets/Scripts/AudioController.cs
rename to Assets/Scripts/Menu/AudioController.cs
diff --git a/Assets/Scripts/AudioController.cs.meta b/Assets/Scripts/Menu/AudioController.cs.meta
similarity index 100%
rename from Assets/Scripts/AudioController.cs.meta
rename to Assets/Scripts/Menu/AudioController.cs.meta
diff --git a/Assets/Scripts/MainMenu/MainMenu_Controller.cs b/Assets/Scripts/Menu/MainMenu_Controller.cs
similarity index 100%
rename from Assets/Scripts/MainMenu/MainMenu_Controller.cs
rename to Assets/Scripts/Menu/MainMenu_Controller.cs
diff --git a/Assets/Scripts/MainMenu/MainMenu_Controller.cs.meta b/Assets/Scripts/Menu/MainMenu_Controller.cs.meta
similarity index 100%
rename from Assets/Scripts/MainMenu/MainMenu_Controller.cs.meta
rename to Assets/Scripts/Menu/MainMenu_Controller.cs.meta
diff --git a/Assets/Scripts/Pause.cs b/Assets/Scripts/Menu/Pause.cs
similarity index 100%
rename from Assets/Scripts/Pause.cs
rename to Assets/Scripts/Menu/Pause.cs
diff --git a/Assets/Scripts/Pause.cs.meta b/Assets/Scripts/Menu/Pause.cs.meta
similarity index 100%
rename from Assets/Scripts/Pause.cs.meta
rename to Assets/Scripts/Menu/Pause.cs.meta
diff --git a/Assets/Scripts/SettingsController.cs b/Assets/Scripts/Menu/SettingsController.cs
similarity index 99%
rename from Assets/Scripts/SettingsController.cs
rename to Assets/Scripts/Menu/SettingsController.cs
index d09d0e7..d236222 100644
--- a/Assets/Scripts/SettingsController.cs
+++ b/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 b/Assets/Scripts/Menu/SettingsController.cs.meta
similarity index 100%
rename from Assets/Scripts/SettingsController.cs.meta
rename to Assets/Scripts/Menu/SettingsController.cs.meta
diff --git a/settings.json b/settings.json
index c65c982..3d06441 100644
--- 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": { 

From 3a6a20d9315194bc888edb74fb7d8a00e56f9514 Mon Sep 17 00:00:00 2001
From: ChrisChin <chinchri1@myvuw.ac.nz>
Date: Tue, 23 Jun 2015 16:42:39 +1200
Subject: [PATCH 2/2] prev commit

prev commit
---
 Assets/Scenes/Main Menu.unity | Bin 202072 -> 202096 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity
index c93540a56f900d68c8914eb5dfd1cff87725e19a..ba15dea30d6a1cd7aed371be4e12bfe61c4c5f2a 100644
GIT binary patch
delta 5993
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
W;{PhUz=`S}r|IO*(gKtD@c#hc5`4=5

delta 5959
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
NHx+NL9bq!>{~ta1bHxAv