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 f9e3479..d16f45b 100644 Binary files a/Assets/Prefabs/Player.prefab and b/Assets/Prefabs/Player.prefab differ diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index c93540a..ba15dea 100644 Binary files a/Assets/Scenes/Main Menu.unity and b/Assets/Scenes/Main Menu.unity differ 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": {