Skip to content
Snippets Groups Projects
Commit 564320bb authored by Allison Wolfheart's avatar Allison Wolfheart
Browse files

Finally un-corrupted the files :3

 Changes to be committed:
	deleted:    Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
	deleted:    Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/ardebugmenu_BundledAssetGroupSchema.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/ardebugmenu_BundledAssetGroupSchema.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/ardebugmenu_ContentUpdateGroupSchema.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/Schemas/ardebugmenu_ContentUpdateGroupSchema.asset.meta
	deleted:    Assets/AddressableAssetsData/AssetGroups/ardebugmenu.asset
	deleted:    Assets/AddressableAssetsData/AssetGroups/ardebugmenu.asset.meta
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset
	deleted:    Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta
	deleted:    Assets/Editor/RemoteConfig/Data/RemoteConfigDataStoreAsset.asset
	deleted:    Assets/Editor/RemoteConfig/Data/RemoteConfigDataStoreAsset.asset.meta
	renamed:    Assets/Screenshot_20240630_212342.png -> Assets/Models/Screenshot_20240630_212342.png
	renamed:    Assets/Screenshot_20240630_212342.png.meta -> Assets/Models/Screenshot_20240630_212342.png.meta
	deleted:    Assets/Networking Related Stuff/DefaultNetworkPrefabs.asset
	deleted:    Assets/Networking Related Stuff/DefaultNetworkPrefabs.asset.meta
	deleted:    Assets/Oculus/Voice/Features/Dictation/Scripts/Runtime/Utilities.meta
	deleted:    Assets/Oculus/Voice/Lib/Wit.ai/Lib/Conduit/Editor/Data.meta
	deleted:    Assets/Oculus/Voice/Lib/Wit.ai/Scripts/Runtime/Data/Traits.meta
	renamed:    Assets/Resources.meta -> Assets/Pkgs.meta
	renamed:    Pkgs/com.playeveryware.eos-3.0.3.tgz -> Assets/Pkgs/com.playeveryware.eos-3.0.3.tgz
	renamed:    Pkgs/com.playeveryware.eos-3.0.3.tgz.meta -> Assets/Pkgs/com.playeveryware.eos-3.0.3.tgz.meta
	renamed:    Pkgs/com.playeveryware.eos-3.3.0.tgz -> Assets/Pkgs/com.playeveryware.eos-3.3.0.tgz
	renamed:    Assets/XR.meta -> Assets/Pkgs/com.playeveryware.eos-3.3.0.tgz.meta
	deleted:    Assets/Resources/BillingMode.json
	deleted:    Assets/Resources/BillingMode.json.meta
	deleted:    Assets/Resources/OVRPlatformToolSettings.asset
	deleted:    Assets/Resources/OVRPlatformToolSettings.asset.meta
	deleted:    Assets/Resources/OculusPlatformSettings.asset
	deleted:    Assets/Resources/OculusPlatformSettings.asset.meta
	deleted:    Assets/Resources/OculusRuntimeSettings.asset
	deleted:    Assets/Resources/OculusRuntimeSettings.asset.meta
	deleted:    Assets/Resources/UnityPlayerAccountSettings.asset
	deleted:    Assets/Resources/UnityPlayerAccountSettings.asset.meta
	new file:   Assets/StreamingAssets/EOS/log_level_config.json
	renamed:    Assets/UI Toolkit.meta -> Assets/StreamingAssets/EOS/log_level_config.json.meta
	modified:   Assets/StreamingAssets/Master.bank
	modified:   Assets/StreamingAssets/Master.strings.bank
	modified:   Assets/StreamingAssets/Sigil 2.bank
	modified:   Assets/StreamingAssets/Sigil.bank
	deleted:    Assets/UI Toolkit/PanelSettings.asset
	deleted:    Assets/UI Toolkit/PanelSettings.asset.meta
	deleted:    Assets/UI Toolkit/UnityThemes.meta
	deleted:    Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
	deleted:    Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta
	deleted:    Assets/XR/Loaders.meta
	deleted:    Assets/XR/Loaders/MockHMDLoader.asset
	deleted:    Assets/XR/Loaders/MockHMDLoader.asset.meta
	deleted:    Assets/XR/Settings.meta
	deleted:    Assets/XR/Settings/MockHMDBuildSettings.asset
	deleted:    Assets/XR/Settings/MockHMDBuildSettings.asset.meta
	deleted:    Assets/XRI.meta
	deleted:    Assets/XRI/Settings.meta
	deleted:    Assets/XRI/Settings/Resources.meta
	deleted:    Assets/XRI/Settings/Resources/InteractionLayerSettings.asset
	deleted:    Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta
	deleted:    Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset
	deleted:    Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta
	deleted:    Assets/XRI/Settings/XRInteractionEditorSettings.asset
	deleted:    Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta
	modified:   Packages/manifest.json
	modified:   Packages/packages-lock.json
	modified:   ProjectSettings/ProjectSettings.asset
	modified:   etc/config/eos_plugin_android_build_config.json
	modified:   etc/config/eos_plugin_library_build_config.json
	modified:   etc/config/eos_plugin_packaging_config.json
	modified:   fmod_editor.log
	new file:   mono_crash.mem.183593.1.blob
parent 46584d1d
No related merge requests found
Showing
with 0 additions and 110 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment