diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 000000000..d1d007e5e Binary files /dev/null and b/.DS_Store differ diff --git a/Assets/.DS_Store b/Assets/.DS_Store new file mode 100644 index 000000000..b0aeabcd2 Binary files /dev/null and b/Assets/.DS_Store differ diff --git a/Assets/Plugins/.DS_Store b/Assets/Plugins/.DS_Store new file mode 100644 index 000000000..247bd0933 Binary files /dev/null and b/Assets/Plugins/.DS_Store differ diff --git a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta index bd41dce5c..5e236fa85 100644 --- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta +++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta @@ -11,6 +11,24 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude Win: 0 + Exclude Win64: 0 + Exclude iOS: 0 + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 - first: Any: second: @@ -19,10 +37,11 @@ PluginImporter: - first: Editor: Editor second: - enabled: 0 + enabled: 1 settings: CPU: x86_64 DefaultValueInitialized: true + OS: AnyOS - first: Standalone: Linux64 second: @@ -32,13 +51,13 @@ PluginImporter: - first: Standalone: OSXUniversal second: - enabled: 0 + enabled: 1 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: Win second: - enabled: 0 + enabled: 1 settings: CPU: None - first: @@ -47,6 +66,15 @@ PluginImporter: enabled: 1 settings: CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 1 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/JSL/.DS_Store b/Assets/Plugins/JSL/.DS_Store new file mode 100644 index 000000000..1b887eaf3 Binary files /dev/null and b/Assets/Plugins/JSL/.DS_Store differ diff --git a/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib new file mode 100755 index 000000000..1b1754375 Binary files /dev/null and b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib differ diff --git a/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib.meta b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib.meta new file mode 100644 index 000000000..5a7b8b719 --- /dev/null +++ b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib.meta @@ -0,0 +1,80 @@ +fileFormatVersion: 2 +guid: 53ce567e644ef4880b1db00e550aa797 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 1 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 0 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 0 + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + iPhone: iOS + second: + enabled: 1 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta index c7bdac63d..28ccd3843 100644 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta +++ b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta @@ -6,9 +6,30 @@ PluginImporter: serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 0 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 - first: Any: second: @@ -19,7 +40,15 @@ PluginImporter: second: enabled: 1 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None - first: Standalone: OSXIntel second: @@ -34,7 +63,29 @@ PluginImporter: Standalone: OSXUniversal second: enabled: 1 - settings: {} + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/.DS_Store b/Assets/Scripts/.DS_Store new file mode 100644 index 000000000..8243e0645 Binary files /dev/null and b/Assets/Scripts/.DS_Store differ diff --git a/Assets/Scripts/InputSystem/PlayerInput.cs b/Assets/Scripts/InputSystem/PlayerInput.cs index ec7ac6592..9b6159531 100644 --- a/Assets/Scripts/InputSystem/PlayerInput.cs +++ b/Assets/Scripts/InputSystem/PlayerInput.cs @@ -87,6 +87,17 @@ namespace HeavenStudio public static InputController GetInputController(int player) { + // Needed so Keyboard works on MacOS + #if UNITY_EDITOR_OSX + inputDevices = new List(); + if(inputDevices.Count < 1) + { + InputKeyboard keyboard = new InputKeyboard(); + keyboard.SetPlayer(1); + keyboard.InitializeController(); + inputDevices.Add(keyboard); + } + #endif //select input controller that has player field set to player //this will return the first controller that has that player number in the case of controller pairs (eg. Joy-Cons) //so such controllers should have a reference to the other controller in the pair @@ -106,6 +117,19 @@ namespace HeavenStudio //this will return the first controller that has that player number in the case of controller pairs (eg. Joy-Cons) //so such controllers should have a reference to the other controller in the pair //controller IDs are determined by connection order (the Keyboard is always first) + + + // Needed so Keyboard works on MacOS + #if UNITY_EDITOR_OSX + inputDevices = new List(); + if(inputDevices.Count < 1) + { + InputKeyboard keyboard = new InputKeyboard(); + keyboard.SetPlayer(1); + keyboard.InitializeController(); + inputDevices.Add(keyboard); + } + #endif for (int i = 0; i < inputDevices.Count; i++) { if (inputDevices[i].GetPlayer() == player) @@ -118,6 +142,17 @@ namespace HeavenStudio public static void UpdateInputControllers() { + // Needed so Keyboard works on MacOS + #if UNITY_EDITOR_OSX + inputDevices = new List(); + if(inputDevices.Count < 1) + { + InputKeyboard keyboard = new InputKeyboard(); + keyboard.SetPlayer(1); + keyboard.InitializeController(); + inputDevices.Add(keyboard); + } + #endif foreach (InputController i in inputDevices) { i.UpdateState(); @@ -244,4 +279,4 @@ namespace HeavenStudio return GetInputController(1).GetHatDirectionUp((InputController.InputDirection) direction) && playerHasControl(); } } -} \ No newline at end of file +}