From b25a02c52150f05f82299ef95ca52bcf7f203f85 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Thu, 13 Aug 2020 22:00:49 +0300 Subject: [PATCH] Revert "Reorganize Assets/" This reverts commit 1f124d1b8f5f3440492e306ce34df29f43381ef1. --- Assets/{Maps.meta => Audio.meta} | 2 +- Assets/Audio/MainMixer.mixer | 209 +++++++++++ Assets/Audio/MainMixer.mixer.meta | 8 + Assets/{Player/SniperRifle => Audio}/Sfx.meta | 2 +- .../SniperRifle => Audio}/Sfx/LaserShot.ogg | Bin .../Sfx/LaserShot.ogg.meta | 0 .../Generic.meta => Audio/Sfx/ZapSplat.meta} | 2 +- .../Sfx/ZapSplat}/ChainLinkFenceImpact1.mp3 | Bin .../ZapSplat}/ChainLinkFenceImpact1.mp3.meta | 0 .../Sfx/ZapSplat}/ChainLinkFenceImpact2.mp3 | Bin .../ZapSplat}/ChainLinkFenceImpact2.mp3.meta | 0 .../Effects => Audio/Sfx/ZapSplat}/Hit.mp3 | Bin .../Sfx/ZapSplat}/Hit.mp3.meta | 0 .../Sfx => Audio/Sfx/ZapSplat}/LaserFast.mp3 | Bin .../Sfx/ZapSplat}/LaserFast.mp3.meta | 0 .../Sfx/ZapSplat}/LaserWithRecovery.mp3 | Bin .../Sfx/ZapSplat}/LaserWithRecovery.mp3.meta | 0 .../Sfx/ZapSplat}/LaserWithRecoveryEdited.ogg | Bin .../LaserWithRecoveryEdited.ogg.meta | 0 Assets/{Maps/Props.meta => GameObjects.meta} | 2 +- .../{Player.meta => GameObjects/Prefabs.meta} | 2 +- .../Prefabs}/LocalPlayer.prefab | 0 .../Prefabs}/LocalPlayer.prefab.meta | 0 .../GameObjects/Prefabs/NetChaperone.prefab | 46 +++ .../Prefabs/NetChaperone.prefab.meta} | 2 +- Assets/GameObjects/Prefabs/Particles.meta | 8 + .../Prefabs/Particles}/Laser.prefab | 0 .../Prefabs/Particles}/Laser.prefab.meta | 0 .../Prefabs}/Player.prefab | 0 .../Prefabs}/Player.prefab.meta | 0 .../Prefabs}/Splatter.prefab | 0 .../Prefabs}/Splatter.prefab.meta | 0 Assets/{ => GameObjects/Prefabs}/UI.meta | 0 .../Prefabs}/UI/DeadScreen.prefab | 0 .../Prefabs}/UI/DeadScreen.prefab.meta | 0 .../Prefabs}/UI/NetDebug.prefab | 0 .../Prefabs}/UI/NetDebug.prefab.meta | 0 .../Prefabs}/UI/StatRow.prefab | 0 .../Prefabs}/UI/StatRow.prefab.meta | 0 .../Prefabs}/UI/StatScreenRoot.prefab | 0 .../Prefabs}/UI/StatScreenRoot.prefab.meta | 0 .../Prefabs}/UI/TerminalRoot.prefab | 0 .../Prefabs}/UI/TerminalRoot.prefab.meta | 0 Assets/GameObjects/Scenes.meta | 8 + .../Scenes/PrefabEnvironments.meta} | 0 .../RegularPrefabEnvironment.unity | 0 .../RegularPrefabEnvironment.unity.meta | 0 .../UIPrefabEnvironment.unity | 0 .../UIPrefabEnvironment.unity.meta | 0 .../Scenes}/TestScene.meta | 0 .../Scenes}/TestScene.unity | 0 .../Scenes}/TestScene.unity.meta | 0 .../Scenes}/TestScene/LightingData.asset | Bin .../Scenes}/TestScene/LightingData.asset.meta | 0 .../Scenes}/TestScene/Lightmap-0_comp_dir.png | Bin .../TestScene/Lightmap-0_comp_dir.png.meta | 0 .../TestScene/Lightmap-0_comp_light.exr | Bin .../TestScene/Lightmap-0_comp_light.exr.meta | 0 .../Scenes}/TestScene/ReflectionProbe-0.exr | Bin .../TestScene/ReflectionProbe-0.exr.meta | 0 Assets/GameObjects/ScriptableObjects.meta | 8 + .../ScriptableObjects}/MoveStyles.meta | 0 .../MoveStyles/Crouching.asset | 0 .../MoveStyles/Crouching.asset.meta | 0 .../MoveStyles/Running.asset | 0 .../MoveStyles/Running.asset.meta | 0 .../SniperRifle => Graphics}/Animation.meta | 2 +- Assets/Graphics/Animation/Gun.meta | 8 + .../Gun}/GunAnimatorController.controller | 0 .../GunAnimatorController.controller.meta | 0 .../Animation/Gun}/GunIdle.anim | 0 .../Animation/Gun}/GunIdle.anim.meta | 0 .../Animation/Gun}/GunShot.anim | 0 .../Animation/Gun}/GunShot.anim.meta | 0 .../Animation/Gun}/GunWalk.anim | 0 .../Animation/Gun}/GunWalk.anim.meta | 0 Assets/{Player => Graphics}/Materials.meta | 2 +- .../Materials/BloodMaterial.mat | 0 .../Materials/BloodMaterial.mat.meta | 0 .../Generic => Graphics/Materials}/Emoji.mat | 0 .../Materials}/Emoji.mat.meta | 0 .../Materials}/LitVertexColored.shadergraph | 0 .../LitVertexColored.shadergraph.meta | 0 .../Materials}/ProBuilderURP.mat | 0 .../Materials}/ProBuilderURP.mat.meta | 0 .../Materials/ShootLaserTrail.mat | 0 .../Materials/ShootLaserTrail.mat.meta | 0 Assets/{Player => Graphics}/Models.meta | 2 +- Assets/Graphics/Models/Guns.meta | 8 + .../Models/Guns}/RifleMetal.mat | 0 .../Models/Guns}/RifleMetal.mat.meta | 0 .../Models/Guns}/Scope.mat | 0 .../Models/Guns}/Scope.mat.meta | 0 .../Guns}/ScopeRenderTexture.renderTexture | 0 .../ScopeRenderTexture.renderTexture.meta | 0 .../Models/Guns}/ScopeShader.shadergraph | 0 .../Models/Guns}/ScopeShader.shadergraph.meta | 0 .../Models/Guns}/SniperRifle.fbx | Bin .../Models/Guns}/SniperRifle.fbx.meta | 0 Assets/Graphics/Models/Levels.meta | 8 + .../Models/Levels}/Stardust.meta | 0 .../Models/Levels}/Stardust/Stardust.fbx | Bin .../Models/Levels}/Stardust/Stardust.fbx.meta | 0 .../Models/Levels}/Stardust/StardustBlue.mat | 0 .../Levels}/Stardust/StardustBlue.mat.meta | 0 .../Levels}/Stardust/StardustNeutral.mat | 0 .../Levels}/Stardust/StardustNeutral.mat.meta | 0 .../Levels}/Stardust/StardustOrange.mat | 0 .../Levels}/Stardust/StardustOrange.mat.meta | 0 .../Levels}/Stardust/StardustWallbang.mat | 0 .../Stardust/StardustWallbang.mat.meta | 0 Assets/Graphics/Models/Soldier.meta | 8 + .../Soldier}/SoldierAnimator.controller | 0 .../Soldier}/SoldierAnimator.controller.meta | 0 .../Models/Soldier}/SoldierF.fbx | Bin .../Models/Soldier}/SoldierF.fbx.meta | 0 .../Models/Soldier}/SoldierM.fbx | Bin .../Models/Soldier}/SoldierM.fbx.meta | 0 .../Models/Soldier}/SoldierMat.mat | 0 .../Models/Soldier}/SoldierMat.mat.meta | 0 Assets/Graphics/Splashes.meta | 8 + .../{Sprites => Splashes}/NeonTea.png | Bin .../{Sprites => Splashes}/NeonTea.png.meta | 0 Assets/Graphics/Textures.meta | 8 + .../Props => Graphics/Textures}/Grate.meta | 2 +- .../Textures}/Grate/GrateAlbedo.png | Bin .../Textures}/Grate/GrateAlbedo.png.meta | 0 .../Textures}/Grate/GrateNormal.png | Bin .../Textures}/Grate/GrateNormal.png.meta | 0 .../Textures}/Grate/GrateSmoothness.png | Bin .../Textures}/Grate/GrateSmoothness.png.meta | 0 Assets/Graphics/Textures/Soldier.meta | 8 + .../Textures/Soldier}/Gear.png | Bin .../Textures/Soldier}/Gear.png.meta | 0 .../Textures/Soldier}/Soldier.png | Bin .../Textures/Soldier}/Soldier.png.meta | 0 Assets/{Unity/Lib => }/InputSystem.meta | 0 .../InputSystem.inputsettings.asset | 0 .../InputSystem.inputsettings.asset.meta | 0 Assets/{Unity => }/Lib.meta | 0 Assets/{Unity => }/Lib/ProBuilder Data.meta | 0 .../Default Color Palette.asset | 0 .../Default Color Palette.asset.meta | 0 Assets/{Unity => }/Lib/TextMesh Pro.meta | 0 .../{Unity => }/Lib/TextMesh Pro/Fonts.meta | 0 .../Fonts/LiberationSans - OFL.txt | 0 .../Fonts/LiberationSans - OFL.txt.meta | 0 .../Lib/TextMesh Pro/Fonts/LiberationSans.ttf | Bin .../Fonts/LiberationSans.ttf.meta | 0 .../Lib/TextMesh Pro/Resources.meta | 0 .../Resources/Fonts & Materials.meta | 0 .../LiberationSans SDF - Drop Shadow.mat | 0 .../LiberationSans SDF - Drop Shadow.mat.meta | 0 .../LiberationSans SDF - Fallback.asset | 0 .../LiberationSans SDF - Fallback.asset.meta | 0 .../LiberationSans SDF - Outline.mat | 0 .../LiberationSans SDF - Outline.mat.meta | 0 .../LiberationSans SDF.asset | 0 .../LiberationSans SDF.asset.meta | 0 .../LineBreaking Following Characters.txt | 0 ...LineBreaking Following Characters.txt.meta | 0 .../LineBreaking Leading Characters.txt | 0 .../LineBreaking Leading Characters.txt.meta | 0 .../TextMesh Pro/Resources/Sprite Assets.meta | 0 .../Resources/Sprite Assets/EmojiOne.asset | 0 .../Sprite Assets/EmojiOne.asset.meta | 0 .../TextMesh Pro/Resources/Style Sheets.meta | 0 .../Style Sheets/Default Style Sheet.asset | 0 .../Default Style Sheet.asset.meta | 0 .../TextMesh Pro/Resources/TMP Settings.asset | 0 .../Resources/TMP Settings.asset.meta | 0 .../{Unity => }/Lib/TextMesh Pro/Shaders.meta | 0 .../Shaders/TMP_Bitmap-Custom-Atlas.shader | 0 .../TMP_Bitmap-Custom-Atlas.shader.meta | 0 .../Shaders/TMP_Bitmap-Mobile.shader | 0 .../Shaders/TMP_Bitmap-Mobile.shader.meta | 0 .../TextMesh Pro/Shaders/TMP_Bitmap.shader | 0 .../Shaders/TMP_Bitmap.shader.meta | 0 .../Shaders/TMP_SDF Overlay.shader | 0 .../Shaders/TMP_SDF Overlay.shader.meta | 0 .../TextMesh Pro/Shaders/TMP_SDF SSD.shader | 0 .../Shaders/TMP_SDF SSD.shader.meta | 0 .../Shaders/TMP_SDF-Mobile Masking.shader | 0 .../TMP_SDF-Mobile Masking.shader.meta | 0 .../Shaders/TMP_SDF-Mobile Overlay.shader | 0 .../TMP_SDF-Mobile Overlay.shader.meta | 0 .../Shaders/TMP_SDF-Mobile SSD.shader | 0 .../Shaders/TMP_SDF-Mobile SSD.shader.meta | 0 .../Shaders/TMP_SDF-Mobile.shader | 0 .../Shaders/TMP_SDF-Mobile.shader.meta | 0 .../Shaders/TMP_SDF-Surface-Mobile.shader | 0 .../TMP_SDF-Surface-Mobile.shader.meta | 0 .../Shaders/TMP_SDF-Surface.shader | 0 .../Shaders/TMP_SDF-Surface.shader.meta | 0 .../Lib/TextMesh Pro/Shaders/TMP_SDF.shader | 0 .../TextMesh Pro/Shaders/TMP_SDF.shader.meta | 0 .../TextMesh Pro/Shaders/TMP_Sprite.shader | 0 .../Shaders/TMP_Sprite.shader.meta | 0 .../Lib/TextMesh Pro/Shaders/TMPro.cginc | 0 .../Lib/TextMesh Pro/Shaders/TMPro.cginc.meta | 0 .../TextMesh Pro/Shaders/TMPro_Mobile.cginc | 0 .../Shaders/TMPro_Mobile.cginc.meta | 0 .../Shaders/TMPro_Properties.cginc | 0 .../Shaders/TMPro_Properties.cginc.meta | 0 .../TextMesh Pro/Shaders/TMPro_Surface.cginc | 0 .../Shaders/TMPro_Surface.cginc.meta | 0 .../{Unity => }/Lib/TextMesh Pro/Sprites.meta | 0 .../Sprites/EmojiOne Attribution.txt | 0 .../Sprites/EmojiOne Attribution.txt.meta | 0 .../Lib/TextMesh Pro/Sprites/EmojiOne.json | 0 .../TextMesh Pro/Sprites/EmojiOne.json.meta | 0 Assets/Maps/Props/Grate/Grate.prefab | 324 ------------------ Assets/Player/Effects.meta | 8 - Assets/Player/SniperRifle.meta | 8 - Assets/Player/SniperRifle/Materials.meta | 8 - CREDITS.md | 5 +- 216 files changed, 354 insertions(+), 362 deletions(-) rename Assets/{Maps.meta => Audio.meta} (77%) create mode 100644 Assets/Audio/MainMixer.mixer create mode 100644 Assets/Audio/MainMixer.mixer.meta rename Assets/{Player/SniperRifle => Audio}/Sfx.meta (77%) rename Assets/{Player/SniperRifle => Audio}/Sfx/LaserShot.ogg (100%) rename Assets/{Player/SniperRifle => Audio}/Sfx/LaserShot.ogg.meta (100%) rename Assets/{Maps/Generic.meta => Audio/Sfx/ZapSplat.meta} (77%) rename Assets/{Maps/Props/Grate => Audio/Sfx/ZapSplat}/ChainLinkFenceImpact1.mp3 (100%) rename Assets/{Maps/Props/Grate => Audio/Sfx/ZapSplat}/ChainLinkFenceImpact1.mp3.meta (100%) rename Assets/{Maps/Props/Grate => Audio/Sfx/ZapSplat}/ChainLinkFenceImpact2.mp3 (100%) rename Assets/{Maps/Props/Grate => Audio/Sfx/ZapSplat}/ChainLinkFenceImpact2.mp3.meta (100%) rename Assets/{Player/Effects => Audio/Sfx/ZapSplat}/Hit.mp3 (100%) rename Assets/{Player/Effects => Audio/Sfx/ZapSplat}/Hit.mp3.meta (100%) rename Assets/{Player/SniperRifle/Sfx => Audio/Sfx/ZapSplat}/LaserFast.mp3 (100%) rename Assets/{Player/SniperRifle/Sfx => Audio/Sfx/ZapSplat}/LaserFast.mp3.meta (100%) rename Assets/{Player/SniperRifle/Sfx => Audio/Sfx/ZapSplat}/LaserWithRecovery.mp3 (100%) rename Assets/{Player/SniperRifle/Sfx => Audio/Sfx/ZapSplat}/LaserWithRecovery.mp3.meta (100%) rename Assets/{Player/SniperRifle/Sfx => Audio/Sfx/ZapSplat}/LaserWithRecoveryEdited.ogg (100%) rename Assets/{Player/SniperRifle/Sfx => Audio/Sfx/ZapSplat}/LaserWithRecoveryEdited.ogg.meta (100%) rename Assets/{Maps/Props.meta => GameObjects.meta} (77%) rename Assets/{Player.meta => GameObjects/Prefabs.meta} (77%) rename Assets/{Player => GameObjects/Prefabs}/LocalPlayer.prefab (100%) rename Assets/{Player => GameObjects/Prefabs}/LocalPlayer.prefab.meta (100%) create mode 100644 Assets/GameObjects/Prefabs/NetChaperone.prefab rename Assets/{Maps/Props/Grate/Grate.prefab.meta => GameObjects/Prefabs/NetChaperone.prefab.meta} (74%) create mode 100644 Assets/GameObjects/Prefabs/Particles.meta rename Assets/{Player/SniperRifle => GameObjects/Prefabs/Particles}/Laser.prefab (100%) rename Assets/{Player/SniperRifle => GameObjects/Prefabs/Particles}/Laser.prefab.meta (100%) rename Assets/{Player => GameObjects/Prefabs}/Player.prefab (100%) rename Assets/{Player => GameObjects/Prefabs}/Player.prefab.meta (100%) rename Assets/{Player/Effects => GameObjects/Prefabs}/Splatter.prefab (100%) rename Assets/{Player/Effects => GameObjects/Prefabs}/Splatter.prefab.meta (100%) rename Assets/{ => GameObjects/Prefabs}/UI.meta (100%) rename Assets/{ => GameObjects/Prefabs}/UI/DeadScreen.prefab (100%) rename Assets/{ => GameObjects/Prefabs}/UI/DeadScreen.prefab.meta (100%) rename Assets/{ => GameObjects/Prefabs}/UI/NetDebug.prefab (100%) rename Assets/{ => GameObjects/Prefabs}/UI/NetDebug.prefab.meta (100%) rename Assets/{ => GameObjects/Prefabs}/UI/StatRow.prefab (100%) rename Assets/{ => GameObjects/Prefabs}/UI/StatRow.prefab.meta (100%) rename Assets/{ => GameObjects/Prefabs}/UI/StatScreenRoot.prefab (100%) rename Assets/{ => GameObjects/Prefabs}/UI/StatScreenRoot.prefab.meta (100%) rename Assets/{ => GameObjects/Prefabs}/UI/TerminalRoot.prefab (100%) rename Assets/{ => GameObjects/Prefabs}/UI/TerminalRoot.prefab.meta (100%) create mode 100644 Assets/GameObjects/Scenes.meta rename Assets/{Unity.meta => GameObjects/Scenes/PrefabEnvironments.meta} (100%) rename Assets/{Unity => GameObjects/Scenes/PrefabEnvironments}/RegularPrefabEnvironment.unity (100%) rename Assets/{Unity => GameObjects/Scenes/PrefabEnvironments}/RegularPrefabEnvironment.unity.meta (100%) rename Assets/{Unity => GameObjects/Scenes/PrefabEnvironments}/UIPrefabEnvironment.unity (100%) rename Assets/{Unity => GameObjects/Scenes/PrefabEnvironments}/UIPrefabEnvironment.unity.meta (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene.meta (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene.unity (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene.unity.meta (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/LightingData.asset (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/LightingData.asset.meta (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/Lightmap-0_comp_dir.png (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/Lightmap-0_comp_dir.png.meta (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/Lightmap-0_comp_light.exr (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/Lightmap-0_comp_light.exr.meta (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/ReflectionProbe-0.exr (100%) rename Assets/{Maps/Stardust => GameObjects/Scenes}/TestScene/ReflectionProbe-0.exr.meta (100%) create mode 100644 Assets/GameObjects/ScriptableObjects.meta rename Assets/{Player => GameObjects/ScriptableObjects}/MoveStyles.meta (100%) rename Assets/{Player => GameObjects/ScriptableObjects}/MoveStyles/Crouching.asset (100%) rename Assets/{Player => GameObjects/ScriptableObjects}/MoveStyles/Crouching.asset.meta (100%) rename Assets/{Player => GameObjects/ScriptableObjects}/MoveStyles/Running.asset (100%) rename Assets/{Player => GameObjects/ScriptableObjects}/MoveStyles/Running.asset.meta (100%) rename Assets/{Player/SniperRifle => Graphics}/Animation.meta (77%) create mode 100644 Assets/Graphics/Animation/Gun.meta rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunAnimatorController.controller (100%) rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunAnimatorController.controller.meta (100%) rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunIdle.anim (100%) rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunIdle.anim.meta (100%) rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunShot.anim (100%) rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunShot.anim.meta (100%) rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunWalk.anim (100%) rename Assets/{Player/SniperRifle/Animation => Graphics/Animation/Gun}/GunWalk.anim.meta (100%) rename Assets/{Player => Graphics}/Materials.meta (77%) rename Assets/{Player => Graphics}/Materials/BloodMaterial.mat (100%) rename Assets/{Player => Graphics}/Materials/BloodMaterial.mat.meta (100%) rename Assets/{Maps/Generic => Graphics/Materials}/Emoji.mat (100%) rename Assets/{Maps/Generic => Graphics/Materials}/Emoji.mat.meta (100%) rename Assets/{Maps/Generic => Graphics/Materials}/LitVertexColored.shadergraph (100%) rename Assets/{Maps/Generic => Graphics/Materials}/LitVertexColored.shadergraph.meta (100%) rename Assets/{Maps/Generic => Graphics/Materials}/ProBuilderURP.mat (100%) rename Assets/{Maps/Generic => Graphics/Materials}/ProBuilderURP.mat.meta (100%) rename Assets/{Player/SniperRifle => Graphics}/Materials/ShootLaserTrail.mat (100%) rename Assets/{Player/SniperRifle => Graphics}/Materials/ShootLaserTrail.mat.meta (100%) rename Assets/{Player => Graphics}/Models.meta (77%) create mode 100644 Assets/Graphics/Models/Guns.meta rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/RifleMetal.mat (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/RifleMetal.mat.meta (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/Scope.mat (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/Scope.mat.meta (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/ScopeRenderTexture.renderTexture (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/ScopeRenderTexture.renderTexture.meta (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/ScopeShader.shadergraph (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Models/Guns}/ScopeShader.shadergraph.meta (100%) rename Assets/{Player/SniperRifle => Graphics/Models/Guns}/SniperRifle.fbx (100%) rename Assets/{Player/SniperRifle => Graphics/Models/Guns}/SniperRifle.fbx.meta (100%) create mode 100644 Assets/Graphics/Models/Levels.meta rename Assets/{Maps => Graphics/Models/Levels}/Stardust.meta (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/Stardust.fbx (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/Stardust.fbx.meta (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustBlue.mat (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustBlue.mat.meta (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustNeutral.mat (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustNeutral.mat.meta (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustOrange.mat (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustOrange.mat.meta (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustWallbang.mat (100%) rename Assets/{Maps => Graphics/Models/Levels}/Stardust/StardustWallbang.mat.meta (100%) create mode 100644 Assets/Graphics/Models/Soldier.meta rename Assets/{Player/Models => Graphics/Models/Soldier}/SoldierAnimator.controller (100%) rename Assets/{Player/Models => Graphics/Models/Soldier}/SoldierAnimator.controller.meta (100%) rename Assets/{Player/Models => Graphics/Models/Soldier}/SoldierF.fbx (100%) rename Assets/{Player/Models => Graphics/Models/Soldier}/SoldierF.fbx.meta (100%) rename Assets/{Player/Models => Graphics/Models/Soldier}/SoldierM.fbx (100%) rename Assets/{Player/Models => Graphics/Models/Soldier}/SoldierM.fbx.meta (100%) rename Assets/{Player/Materials => Graphics/Models/Soldier}/SoldierMat.mat (100%) rename Assets/{Player/Materials => Graphics/Models/Soldier}/SoldierMat.mat.meta (100%) create mode 100644 Assets/Graphics/Splashes.meta rename Assets/Graphics/{Sprites => Splashes}/NeonTea.png (100%) rename Assets/Graphics/{Sprites => Splashes}/NeonTea.png.meta (100%) create mode 100644 Assets/Graphics/Textures.meta rename Assets/{Maps/Props => Graphics/Textures}/Grate.meta (77%) rename Assets/{Maps/Props => Graphics/Textures}/Grate/GrateAlbedo.png (100%) rename Assets/{Maps/Props => Graphics/Textures}/Grate/GrateAlbedo.png.meta (100%) rename Assets/{Maps/Props => Graphics/Textures}/Grate/GrateNormal.png (100%) rename Assets/{Maps/Props => Graphics/Textures}/Grate/GrateNormal.png.meta (100%) rename Assets/{Maps/Props => Graphics/Textures}/Grate/GrateSmoothness.png (100%) rename Assets/{Maps/Props => Graphics/Textures}/Grate/GrateSmoothness.png.meta (100%) create mode 100644 Assets/Graphics/Textures/Soldier.meta rename Assets/{Player/SniperRifle/Materials => Graphics/Textures/Soldier}/Gear.png (100%) rename Assets/{Player/SniperRifle/Materials => Graphics/Textures/Soldier}/Gear.png.meta (100%) rename Assets/{Player/Materials => Graphics/Textures/Soldier}/Soldier.png (100%) rename Assets/{Player/Materials => Graphics/Textures/Soldier}/Soldier.png.meta (100%) rename Assets/{Unity/Lib => }/InputSystem.meta (100%) rename Assets/{Unity/Lib => }/InputSystem/InputSystem.inputsettings.asset (100%) rename Assets/{Unity/Lib => }/InputSystem/InputSystem.inputsettings.asset.meta (100%) rename Assets/{Unity => }/Lib.meta (100%) rename Assets/{Unity => }/Lib/ProBuilder Data.meta (100%) rename Assets/{Unity => }/Lib/ProBuilder Data/Default Color Palette.asset (100%) rename Assets/{Unity => }/Lib/ProBuilder Data/Default Color Palette.asset.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Fonts.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Fonts/LiberationSans.ttf (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Fonts/LiberationSans.ttf.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Sprite Assets.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Style Sheets.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/TMP Settings.asset (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Resources/TMP Settings.asset.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_SDF.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro.cginc (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro.cginc.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Sprites.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Sprites/EmojiOne.json (100%) rename Assets/{Unity => }/Lib/TextMesh Pro/Sprites/EmojiOne.json.meta (100%) delete mode 100644 Assets/Maps/Props/Grate/Grate.prefab delete mode 100644 Assets/Player/Effects.meta delete mode 100644 Assets/Player/SniperRifle.meta delete mode 100644 Assets/Player/SniperRifle/Materials.meta diff --git a/Assets/Maps.meta b/Assets/Audio.meta similarity index 77% rename from Assets/Maps.meta rename to Assets/Audio.meta index 5409bf1..cd04024 100644 --- a/Assets/Maps.meta +++ b/Assets/Audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 79db09d2ffc88c343821646de667acb7 +guid: 44e0cc6c3dbd8a04b89d2400185bf17c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Audio/MainMixer.mixer b/Assets/Audio/MainMixer.mixer new file mode 100644 index 0000000..9dac38e --- /dev/null +++ b/Assets/Audio/MainMixer.mixer @@ -0,0 +1,209 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!243 &-8030293084440089681 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EnvHits + m_AudioMixer: {fileID: 24100000} + m_GroupID: f58915c82845f9b47a322aeefeaf0116 + m_Children: [] + m_Volume: 8bee47ecf1719a34c9a4509adc3d7f50 + m_Pitch: 3d4dde8cdd48f044b9280d72a780b260 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 4401202656874143845} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &-3601797963847308308 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 7032a42d6a82a1847b2390082d6e806e + m_EffectName: Attenuation + m_MixLevel: 7dbfe66d31191674496b12611bd9cf3a + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &-1410552352759146441 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gunshots + m_AudioMixer: {fileID: 24100000} + m_GroupID: c95b70575255b7444a07837f795dda0c + m_Children: [] + m_Volume: fbbe05ab527a8f54fa7799b791870a5f + m_Pitch: e6cca40645f05b64ea609c7286016c3f + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 325086644955213233} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!241 &24100000 +AudioMixerController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MainMixer + m_OutputGroup: {fileID: 0} + m_MasterGroup: {fileID: 24300002} + m_Snapshots: + - {fileID: 24500006} + m_StartSnapshot: {fileID: 24500006} + m_SuspendThreshold: -80 + m_EnableSuspend: 1 + m_UpdateMode: 0 + m_ExposedParameters: [] + m_AudioMixerGroupViews: + - guids: + - 3c6873f980b9fa3409038f22239e8ba7 + - a1145e9de5e1d9d4980fbfb98ac09640 + - c95b70575255b7444a07837f795dda0c + - 3a0a85f42d9d34f45a8e1b38e73db35a + - f58915c82845f9b47a322aeefeaf0116 + name: View + m_CurrentViewIndex: 0 + m_TargetSnapshot: {fileID: 24500006} +--- !u!243 &24300002 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Master + m_AudioMixer: {fileID: 24100000} + m_GroupID: 3c6873f980b9fa3409038f22239e8ba7 + m_Children: + - {fileID: 7918404018752352143} + m_Volume: 6a1ab3785e1fcad47970244d3a3b0619 + m_Pitch: 203c487d8fa9c444094ebbe20077f8bb + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 24400004} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &24400004 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: d763565010ffcaa489c920bb24325aa8 + m_EffectName: Attenuation + m_MixLevel: e8f7008b896d1084c80aaf8028ae657e + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!245 &24500006 +AudioMixerSnapshotController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snapshot + m_AudioMixer: {fileID: 24100000} + m_SnapshotID: cd9ab92c44164a4469887ec968e924d7 + m_FloatValues: + 6a1ab3785e1fcad47970244d3a3b0619: -19.928478 + m_TransitionOverrides: {} +--- !u!244 &325086644955213233 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 173cfebdcaf2a0d4eaf91aa99bd70a15 + m_EffectName: Attenuation + m_MixLevel: feebefd139878d643b8909891a08c145 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!244 &4401202656874143845 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 723bb9b90d69394469bde81e0fff9a9f + m_EffectName: Attenuation + m_MixLevel: 00c73b77a6f0a9d4584f2133fcbfa019 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &6277318630853483794 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hits + m_AudioMixer: {fileID: 24100000} + m_GroupID: 3a0a85f42d9d34f45a8e1b38e73db35a + m_Children: [] + m_Volume: 7418b82d7af9f19489c2a2ab41fbd325 + m_Pitch: e655b4382fdf35945a6282ac03cd8f66 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -3601797963847308308} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &7015759513254906842 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: f1627356b166c11439092d80981a0e32 + m_EffectName: Attenuation + m_MixLevel: 6deb0052677f3774c9b58b9a7a2c8739 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &7918404018752352143 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sfx + m_AudioMixer: {fileID: 24100000} + m_GroupID: a1145e9de5e1d9d4980fbfb98ac09640 + m_Children: + - {fileID: -1410552352759146441} + - {fileID: 6277318630853483794} + - {fileID: -8030293084440089681} + m_Volume: 1a91e250aa8fec749b1861a5c8e7ff48 + m_Pitch: c21e265de00bfe64eba2868212c34fa2 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 7015759513254906842} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 diff --git a/Assets/Audio/MainMixer.mixer.meta b/Assets/Audio/MainMixer.mixer.meta new file mode 100644 index 0000000..3c186b1 --- /dev/null +++ b/Assets/Audio/MainMixer.mixer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff7bf5284859d9f45a64971a67bb173a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/SniperRifle/Sfx.meta b/Assets/Audio/Sfx.meta similarity index 77% rename from Assets/Player/SniperRifle/Sfx.meta rename to Assets/Audio/Sfx.meta index 17c1b36..9d69369 100644 --- a/Assets/Player/SniperRifle/Sfx.meta +++ b/Assets/Audio/Sfx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 442dad9db0920a946bba96a06d8660e0 +guid: 374ce5d2c1f043244bc5d1753ee3ec8f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Player/SniperRifle/Sfx/LaserShot.ogg b/Assets/Audio/Sfx/LaserShot.ogg similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserShot.ogg rename to Assets/Audio/Sfx/LaserShot.ogg diff --git a/Assets/Player/SniperRifle/Sfx/LaserShot.ogg.meta b/Assets/Audio/Sfx/LaserShot.ogg.meta similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserShot.ogg.meta rename to Assets/Audio/Sfx/LaserShot.ogg.meta diff --git a/Assets/Maps/Generic.meta b/Assets/Audio/Sfx/ZapSplat.meta similarity index 77% rename from Assets/Maps/Generic.meta rename to Assets/Audio/Sfx/ZapSplat.meta index ae66cdf..f87c34a 100644 --- a/Assets/Maps/Generic.meta +++ b/Assets/Audio/Sfx/ZapSplat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2ea8067fc50da7643928873623589245 +guid: 92f50ea223ae4584d94d857571656599 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Maps/Props/Grate/ChainLinkFenceImpact1.mp3 b/Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact1.mp3 similarity index 100% rename from Assets/Maps/Props/Grate/ChainLinkFenceImpact1.mp3 rename to Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact1.mp3 diff --git a/Assets/Maps/Props/Grate/ChainLinkFenceImpact1.mp3.meta b/Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact1.mp3.meta similarity index 100% rename from Assets/Maps/Props/Grate/ChainLinkFenceImpact1.mp3.meta rename to Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact1.mp3.meta diff --git a/Assets/Maps/Props/Grate/ChainLinkFenceImpact2.mp3 b/Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact2.mp3 similarity index 100% rename from Assets/Maps/Props/Grate/ChainLinkFenceImpact2.mp3 rename to Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact2.mp3 diff --git a/Assets/Maps/Props/Grate/ChainLinkFenceImpact2.mp3.meta b/Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact2.mp3.meta similarity index 100% rename from Assets/Maps/Props/Grate/ChainLinkFenceImpact2.mp3.meta rename to Assets/Audio/Sfx/ZapSplat/ChainLinkFenceImpact2.mp3.meta diff --git a/Assets/Player/Effects/Hit.mp3 b/Assets/Audio/Sfx/ZapSplat/Hit.mp3 similarity index 100% rename from Assets/Player/Effects/Hit.mp3 rename to Assets/Audio/Sfx/ZapSplat/Hit.mp3 diff --git a/Assets/Player/Effects/Hit.mp3.meta b/Assets/Audio/Sfx/ZapSplat/Hit.mp3.meta similarity index 100% rename from Assets/Player/Effects/Hit.mp3.meta rename to Assets/Audio/Sfx/ZapSplat/Hit.mp3.meta diff --git a/Assets/Player/SniperRifle/Sfx/LaserFast.mp3 b/Assets/Audio/Sfx/ZapSplat/LaserFast.mp3 similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserFast.mp3 rename to Assets/Audio/Sfx/ZapSplat/LaserFast.mp3 diff --git a/Assets/Player/SniperRifle/Sfx/LaserFast.mp3.meta b/Assets/Audio/Sfx/ZapSplat/LaserFast.mp3.meta similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserFast.mp3.meta rename to Assets/Audio/Sfx/ZapSplat/LaserFast.mp3.meta diff --git a/Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3 b/Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3 similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3 rename to Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3 diff --git a/Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3.meta b/Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3.meta similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3.meta rename to Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3.meta diff --git a/Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg b/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg rename to Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg diff --git a/Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg.meta b/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg.meta similarity index 100% rename from Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg.meta rename to Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg.meta diff --git a/Assets/Maps/Props.meta b/Assets/GameObjects.meta similarity index 77% rename from Assets/Maps/Props.meta rename to Assets/GameObjects.meta index c6486fa..418d255 100644 --- a/Assets/Maps/Props.meta +++ b/Assets/GameObjects.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78eefc0ef72807d428a825ae528dcea9 +guid: 843ce77a9285304428883a190239fd00 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Player.meta b/Assets/GameObjects/Prefabs.meta similarity index 77% rename from Assets/Player.meta rename to Assets/GameObjects/Prefabs.meta index f30de9f..c48b84b 100644 --- a/Assets/Player.meta +++ b/Assets/GameObjects/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a409fe48838e78e4b9724525499fb64d +guid: d2523358c32e65547b516a7c26b7290e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Player/LocalPlayer.prefab b/Assets/GameObjects/Prefabs/LocalPlayer.prefab similarity index 100% rename from Assets/Player/LocalPlayer.prefab rename to Assets/GameObjects/Prefabs/LocalPlayer.prefab diff --git a/Assets/Player/LocalPlayer.prefab.meta b/Assets/GameObjects/Prefabs/LocalPlayer.prefab.meta similarity index 100% rename from Assets/Player/LocalPlayer.prefab.meta rename to Assets/GameObjects/Prefabs/LocalPlayer.prefab.meta diff --git a/Assets/GameObjects/Prefabs/NetChaperone.prefab b/Assets/GameObjects/Prefabs/NetChaperone.prefab new file mode 100644 index 0000000..20c7d8b --- /dev/null +++ b/Assets/GameObjects/Prefabs/NetChaperone.prefab @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8225376946869818923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1599217288880773178} + - component: {fileID: 8631085319058959107} + m_Layer: 0 + m_Name: NetChaperone + m_TagString: Net + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1599217288880773178 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8225376946869818923} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 28.784727, y: -94.90361, z: 121.21231} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8631085319058959107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8225376946869818923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74110215548fa9145b867baf649d14b0, type: 3} + m_Name: + m_EditorClassIdentifier: + SpawnedRemotePlayer: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3} diff --git a/Assets/Maps/Props/Grate/Grate.prefab.meta b/Assets/GameObjects/Prefabs/NetChaperone.prefab.meta similarity index 74% rename from Assets/Maps/Props/Grate/Grate.prefab.meta rename to Assets/GameObjects/Prefabs/NetChaperone.prefab.meta index af2ebd9..8c2ed81 100644 --- a/Assets/Maps/Props/Grate/Grate.prefab.meta +++ b/Assets/GameObjects/Prefabs/NetChaperone.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b376c1b45d7ef8a4d82aa491744576ff +guid: 1a03b85f19189674187c9966f5f557e3 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/GameObjects/Prefabs/Particles.meta b/Assets/GameObjects/Prefabs/Particles.meta new file mode 100644 index 0000000..519af8e --- /dev/null +++ b/Assets/GameObjects/Prefabs/Particles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5afe7f73c0751644af28475fa9657db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/SniperRifle/Laser.prefab b/Assets/GameObjects/Prefabs/Particles/Laser.prefab similarity index 100% rename from Assets/Player/SniperRifle/Laser.prefab rename to Assets/GameObjects/Prefabs/Particles/Laser.prefab diff --git a/Assets/Player/SniperRifle/Laser.prefab.meta b/Assets/GameObjects/Prefabs/Particles/Laser.prefab.meta similarity index 100% rename from Assets/Player/SniperRifle/Laser.prefab.meta rename to Assets/GameObjects/Prefabs/Particles/Laser.prefab.meta diff --git a/Assets/Player/Player.prefab b/Assets/GameObjects/Prefabs/Player.prefab similarity index 100% rename from Assets/Player/Player.prefab rename to Assets/GameObjects/Prefabs/Player.prefab diff --git a/Assets/Player/Player.prefab.meta b/Assets/GameObjects/Prefabs/Player.prefab.meta similarity index 100% rename from Assets/Player/Player.prefab.meta rename to Assets/GameObjects/Prefabs/Player.prefab.meta diff --git a/Assets/Player/Effects/Splatter.prefab b/Assets/GameObjects/Prefabs/Splatter.prefab similarity index 100% rename from Assets/Player/Effects/Splatter.prefab rename to Assets/GameObjects/Prefabs/Splatter.prefab diff --git a/Assets/Player/Effects/Splatter.prefab.meta b/Assets/GameObjects/Prefabs/Splatter.prefab.meta similarity index 100% rename from Assets/Player/Effects/Splatter.prefab.meta rename to Assets/GameObjects/Prefabs/Splatter.prefab.meta diff --git a/Assets/UI.meta b/Assets/GameObjects/Prefabs/UI.meta similarity index 100% rename from Assets/UI.meta rename to Assets/GameObjects/Prefabs/UI.meta diff --git a/Assets/UI/DeadScreen.prefab b/Assets/GameObjects/Prefabs/UI/DeadScreen.prefab similarity index 100% rename from Assets/UI/DeadScreen.prefab rename to Assets/GameObjects/Prefabs/UI/DeadScreen.prefab diff --git a/Assets/UI/DeadScreen.prefab.meta b/Assets/GameObjects/Prefabs/UI/DeadScreen.prefab.meta similarity index 100% rename from Assets/UI/DeadScreen.prefab.meta rename to Assets/GameObjects/Prefabs/UI/DeadScreen.prefab.meta diff --git a/Assets/UI/NetDebug.prefab b/Assets/GameObjects/Prefabs/UI/NetDebug.prefab similarity index 100% rename from Assets/UI/NetDebug.prefab rename to Assets/GameObjects/Prefabs/UI/NetDebug.prefab diff --git a/Assets/UI/NetDebug.prefab.meta b/Assets/GameObjects/Prefabs/UI/NetDebug.prefab.meta similarity index 100% rename from Assets/UI/NetDebug.prefab.meta rename to Assets/GameObjects/Prefabs/UI/NetDebug.prefab.meta diff --git a/Assets/UI/StatRow.prefab b/Assets/GameObjects/Prefabs/UI/StatRow.prefab similarity index 100% rename from Assets/UI/StatRow.prefab rename to Assets/GameObjects/Prefabs/UI/StatRow.prefab diff --git a/Assets/UI/StatRow.prefab.meta b/Assets/GameObjects/Prefabs/UI/StatRow.prefab.meta similarity index 100% rename from Assets/UI/StatRow.prefab.meta rename to Assets/GameObjects/Prefabs/UI/StatRow.prefab.meta diff --git a/Assets/UI/StatScreenRoot.prefab b/Assets/GameObjects/Prefabs/UI/StatScreenRoot.prefab similarity index 100% rename from Assets/UI/StatScreenRoot.prefab rename to Assets/GameObjects/Prefabs/UI/StatScreenRoot.prefab diff --git a/Assets/UI/StatScreenRoot.prefab.meta b/Assets/GameObjects/Prefabs/UI/StatScreenRoot.prefab.meta similarity index 100% rename from Assets/UI/StatScreenRoot.prefab.meta rename to Assets/GameObjects/Prefabs/UI/StatScreenRoot.prefab.meta diff --git a/Assets/UI/TerminalRoot.prefab b/Assets/GameObjects/Prefabs/UI/TerminalRoot.prefab similarity index 100% rename from Assets/UI/TerminalRoot.prefab rename to Assets/GameObjects/Prefabs/UI/TerminalRoot.prefab diff --git a/Assets/UI/TerminalRoot.prefab.meta b/Assets/GameObjects/Prefabs/UI/TerminalRoot.prefab.meta similarity index 100% rename from Assets/UI/TerminalRoot.prefab.meta rename to Assets/GameObjects/Prefabs/UI/TerminalRoot.prefab.meta diff --git a/Assets/GameObjects/Scenes.meta b/Assets/GameObjects/Scenes.meta new file mode 100644 index 0000000..fd5b134 --- /dev/null +++ b/Assets/GameObjects/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4893794e242c0a428d190db4df945d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unity.meta b/Assets/GameObjects/Scenes/PrefabEnvironments.meta similarity index 100% rename from Assets/Unity.meta rename to Assets/GameObjects/Scenes/PrefabEnvironments.meta diff --git a/Assets/Unity/RegularPrefabEnvironment.unity b/Assets/GameObjects/Scenes/PrefabEnvironments/RegularPrefabEnvironment.unity similarity index 100% rename from Assets/Unity/RegularPrefabEnvironment.unity rename to Assets/GameObjects/Scenes/PrefabEnvironments/RegularPrefabEnvironment.unity diff --git a/Assets/Unity/RegularPrefabEnvironment.unity.meta b/Assets/GameObjects/Scenes/PrefabEnvironments/RegularPrefabEnvironment.unity.meta similarity index 100% rename from Assets/Unity/RegularPrefabEnvironment.unity.meta rename to Assets/GameObjects/Scenes/PrefabEnvironments/RegularPrefabEnvironment.unity.meta diff --git a/Assets/Unity/UIPrefabEnvironment.unity b/Assets/GameObjects/Scenes/PrefabEnvironments/UIPrefabEnvironment.unity similarity index 100% rename from Assets/Unity/UIPrefabEnvironment.unity rename to Assets/GameObjects/Scenes/PrefabEnvironments/UIPrefabEnvironment.unity diff --git a/Assets/Unity/UIPrefabEnvironment.unity.meta b/Assets/GameObjects/Scenes/PrefabEnvironments/UIPrefabEnvironment.unity.meta similarity index 100% rename from Assets/Unity/UIPrefabEnvironment.unity.meta rename to Assets/GameObjects/Scenes/PrefabEnvironments/UIPrefabEnvironment.unity.meta diff --git a/Assets/Maps/Stardust/TestScene.meta b/Assets/GameObjects/Scenes/TestScene.meta similarity index 100% rename from Assets/Maps/Stardust/TestScene.meta rename to Assets/GameObjects/Scenes/TestScene.meta diff --git a/Assets/Maps/Stardust/TestScene.unity b/Assets/GameObjects/Scenes/TestScene.unity similarity index 100% rename from Assets/Maps/Stardust/TestScene.unity rename to Assets/GameObjects/Scenes/TestScene.unity diff --git a/Assets/Maps/Stardust/TestScene.unity.meta b/Assets/GameObjects/Scenes/TestScene.unity.meta similarity index 100% rename from Assets/Maps/Stardust/TestScene.unity.meta rename to Assets/GameObjects/Scenes/TestScene.unity.meta diff --git a/Assets/Maps/Stardust/TestScene/LightingData.asset b/Assets/GameObjects/Scenes/TestScene/LightingData.asset similarity index 100% rename from Assets/Maps/Stardust/TestScene/LightingData.asset rename to Assets/GameObjects/Scenes/TestScene/LightingData.asset diff --git a/Assets/Maps/Stardust/TestScene/LightingData.asset.meta b/Assets/GameObjects/Scenes/TestScene/LightingData.asset.meta similarity index 100% rename from Assets/Maps/Stardust/TestScene/LightingData.asset.meta rename to Assets/GameObjects/Scenes/TestScene/LightingData.asset.meta diff --git a/Assets/Maps/Stardust/TestScene/Lightmap-0_comp_dir.png b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png similarity index 100% rename from Assets/Maps/Stardust/TestScene/Lightmap-0_comp_dir.png rename to Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png diff --git a/Assets/Maps/Stardust/TestScene/Lightmap-0_comp_dir.png.meta b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png.meta similarity index 100% rename from Assets/Maps/Stardust/TestScene/Lightmap-0_comp_dir.png.meta rename to Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_dir.png.meta diff --git a/Assets/Maps/Stardust/TestScene/Lightmap-0_comp_light.exr b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr similarity index 100% rename from Assets/Maps/Stardust/TestScene/Lightmap-0_comp_light.exr rename to Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr diff --git a/Assets/Maps/Stardust/TestScene/Lightmap-0_comp_light.exr.meta b/Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr.meta similarity index 100% rename from Assets/Maps/Stardust/TestScene/Lightmap-0_comp_light.exr.meta rename to Assets/GameObjects/Scenes/TestScene/Lightmap-0_comp_light.exr.meta diff --git a/Assets/Maps/Stardust/TestScene/ReflectionProbe-0.exr b/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr similarity index 100% rename from Assets/Maps/Stardust/TestScene/ReflectionProbe-0.exr rename to Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr diff --git a/Assets/Maps/Stardust/TestScene/ReflectionProbe-0.exr.meta b/Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr.meta similarity index 100% rename from Assets/Maps/Stardust/TestScene/ReflectionProbe-0.exr.meta rename to Assets/GameObjects/Scenes/TestScene/ReflectionProbe-0.exr.meta diff --git a/Assets/GameObjects/ScriptableObjects.meta b/Assets/GameObjects/ScriptableObjects.meta new file mode 100644 index 0000000..9102701 --- /dev/null +++ b/Assets/GameObjects/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e5509da920e35841a6845fa3d020421 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/MoveStyles.meta b/Assets/GameObjects/ScriptableObjects/MoveStyles.meta similarity index 100% rename from Assets/Player/MoveStyles.meta rename to Assets/GameObjects/ScriptableObjects/MoveStyles.meta diff --git a/Assets/Player/MoveStyles/Crouching.asset b/Assets/GameObjects/ScriptableObjects/MoveStyles/Crouching.asset similarity index 100% rename from Assets/Player/MoveStyles/Crouching.asset rename to Assets/GameObjects/ScriptableObjects/MoveStyles/Crouching.asset diff --git a/Assets/Player/MoveStyles/Crouching.asset.meta b/Assets/GameObjects/ScriptableObjects/MoveStyles/Crouching.asset.meta similarity index 100% rename from Assets/Player/MoveStyles/Crouching.asset.meta rename to Assets/GameObjects/ScriptableObjects/MoveStyles/Crouching.asset.meta diff --git a/Assets/Player/MoveStyles/Running.asset b/Assets/GameObjects/ScriptableObjects/MoveStyles/Running.asset similarity index 100% rename from Assets/Player/MoveStyles/Running.asset rename to Assets/GameObjects/ScriptableObjects/MoveStyles/Running.asset diff --git a/Assets/Player/MoveStyles/Running.asset.meta b/Assets/GameObjects/ScriptableObjects/MoveStyles/Running.asset.meta similarity index 100% rename from Assets/Player/MoveStyles/Running.asset.meta rename to Assets/GameObjects/ScriptableObjects/MoveStyles/Running.asset.meta diff --git a/Assets/Player/SniperRifle/Animation.meta b/Assets/Graphics/Animation.meta similarity index 77% rename from Assets/Player/SniperRifle/Animation.meta rename to Assets/Graphics/Animation.meta index a4eea46..e988f48 100644 --- a/Assets/Player/SniperRifle/Animation.meta +++ b/Assets/Graphics/Animation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d93bc4ed675fd70409982651deaec686 +guid: b2f72300026c3cc4a8cec283b11bc0d1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Graphics/Animation/Gun.meta b/Assets/Graphics/Animation/Gun.meta new file mode 100644 index 0000000..32da062 --- /dev/null +++ b/Assets/Graphics/Animation/Gun.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d90db1be400d0fe46a2d50d6f4b6d184 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/SniperRifle/Animation/GunAnimatorController.controller b/Assets/Graphics/Animation/Gun/GunAnimatorController.controller similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunAnimatorController.controller rename to Assets/Graphics/Animation/Gun/GunAnimatorController.controller diff --git a/Assets/Player/SniperRifle/Animation/GunAnimatorController.controller.meta b/Assets/Graphics/Animation/Gun/GunAnimatorController.controller.meta similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunAnimatorController.controller.meta rename to Assets/Graphics/Animation/Gun/GunAnimatorController.controller.meta diff --git a/Assets/Player/SniperRifle/Animation/GunIdle.anim b/Assets/Graphics/Animation/Gun/GunIdle.anim similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunIdle.anim rename to Assets/Graphics/Animation/Gun/GunIdle.anim diff --git a/Assets/Player/SniperRifle/Animation/GunIdle.anim.meta b/Assets/Graphics/Animation/Gun/GunIdle.anim.meta similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunIdle.anim.meta rename to Assets/Graphics/Animation/Gun/GunIdle.anim.meta diff --git a/Assets/Player/SniperRifle/Animation/GunShot.anim b/Assets/Graphics/Animation/Gun/GunShot.anim similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunShot.anim rename to Assets/Graphics/Animation/Gun/GunShot.anim diff --git a/Assets/Player/SniperRifle/Animation/GunShot.anim.meta b/Assets/Graphics/Animation/Gun/GunShot.anim.meta similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunShot.anim.meta rename to Assets/Graphics/Animation/Gun/GunShot.anim.meta diff --git a/Assets/Player/SniperRifle/Animation/GunWalk.anim b/Assets/Graphics/Animation/Gun/GunWalk.anim similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunWalk.anim rename to Assets/Graphics/Animation/Gun/GunWalk.anim diff --git a/Assets/Player/SniperRifle/Animation/GunWalk.anim.meta b/Assets/Graphics/Animation/Gun/GunWalk.anim.meta similarity index 100% rename from Assets/Player/SniperRifle/Animation/GunWalk.anim.meta rename to Assets/Graphics/Animation/Gun/GunWalk.anim.meta diff --git a/Assets/Player/Materials.meta b/Assets/Graphics/Materials.meta similarity index 77% rename from Assets/Player/Materials.meta rename to Assets/Graphics/Materials.meta index 7422d73..6c89851 100644 --- a/Assets/Player/Materials.meta +++ b/Assets/Graphics/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 29938b0d53e57e243a43b1941b0a82b5 +guid: 109cd8129903d2f43b4add93e82e3ad6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Player/Materials/BloodMaterial.mat b/Assets/Graphics/Materials/BloodMaterial.mat similarity index 100% rename from Assets/Player/Materials/BloodMaterial.mat rename to Assets/Graphics/Materials/BloodMaterial.mat diff --git a/Assets/Player/Materials/BloodMaterial.mat.meta b/Assets/Graphics/Materials/BloodMaterial.mat.meta similarity index 100% rename from Assets/Player/Materials/BloodMaterial.mat.meta rename to Assets/Graphics/Materials/BloodMaterial.mat.meta diff --git a/Assets/Maps/Generic/Emoji.mat b/Assets/Graphics/Materials/Emoji.mat similarity index 100% rename from Assets/Maps/Generic/Emoji.mat rename to Assets/Graphics/Materials/Emoji.mat diff --git a/Assets/Maps/Generic/Emoji.mat.meta b/Assets/Graphics/Materials/Emoji.mat.meta similarity index 100% rename from Assets/Maps/Generic/Emoji.mat.meta rename to Assets/Graphics/Materials/Emoji.mat.meta diff --git a/Assets/Maps/Generic/LitVertexColored.shadergraph b/Assets/Graphics/Materials/LitVertexColored.shadergraph similarity index 100% rename from Assets/Maps/Generic/LitVertexColored.shadergraph rename to Assets/Graphics/Materials/LitVertexColored.shadergraph diff --git a/Assets/Maps/Generic/LitVertexColored.shadergraph.meta b/Assets/Graphics/Materials/LitVertexColored.shadergraph.meta similarity index 100% rename from Assets/Maps/Generic/LitVertexColored.shadergraph.meta rename to Assets/Graphics/Materials/LitVertexColored.shadergraph.meta diff --git a/Assets/Maps/Generic/ProBuilderURP.mat b/Assets/Graphics/Materials/ProBuilderURP.mat similarity index 100% rename from Assets/Maps/Generic/ProBuilderURP.mat rename to Assets/Graphics/Materials/ProBuilderURP.mat diff --git a/Assets/Maps/Generic/ProBuilderURP.mat.meta b/Assets/Graphics/Materials/ProBuilderURP.mat.meta similarity index 100% rename from Assets/Maps/Generic/ProBuilderURP.mat.meta rename to Assets/Graphics/Materials/ProBuilderURP.mat.meta diff --git a/Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat b/Assets/Graphics/Materials/ShootLaserTrail.mat similarity index 100% rename from Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat rename to Assets/Graphics/Materials/ShootLaserTrail.mat diff --git a/Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat.meta b/Assets/Graphics/Materials/ShootLaserTrail.mat.meta similarity index 100% rename from Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat.meta rename to Assets/Graphics/Materials/ShootLaserTrail.mat.meta diff --git a/Assets/Player/Models.meta b/Assets/Graphics/Models.meta similarity index 77% rename from Assets/Player/Models.meta rename to Assets/Graphics/Models.meta index 833d9f5..4bb076e 100644 --- a/Assets/Player/Models.meta +++ b/Assets/Graphics/Models.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 976dc02f7888c94449309501628662ee +guid: 7e53bc1470bac1b4790284a894601278 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Graphics/Models/Guns.meta b/Assets/Graphics/Models/Guns.meta new file mode 100644 index 0000000..15db03e --- /dev/null +++ b/Assets/Graphics/Models/Guns.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9d11a2cdeea0374f82a3b498812aed1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/SniperRifle/Materials/RifleMetal.mat b/Assets/Graphics/Models/Guns/RifleMetal.mat similarity index 100% rename from Assets/Player/SniperRifle/Materials/RifleMetal.mat rename to Assets/Graphics/Models/Guns/RifleMetal.mat diff --git a/Assets/Player/SniperRifle/Materials/RifleMetal.mat.meta b/Assets/Graphics/Models/Guns/RifleMetal.mat.meta similarity index 100% rename from Assets/Player/SniperRifle/Materials/RifleMetal.mat.meta rename to Assets/Graphics/Models/Guns/RifleMetal.mat.meta diff --git a/Assets/Player/SniperRifle/Materials/Scope.mat b/Assets/Graphics/Models/Guns/Scope.mat similarity index 100% rename from Assets/Player/SniperRifle/Materials/Scope.mat rename to Assets/Graphics/Models/Guns/Scope.mat diff --git a/Assets/Player/SniperRifle/Materials/Scope.mat.meta b/Assets/Graphics/Models/Guns/Scope.mat.meta similarity index 100% rename from Assets/Player/SniperRifle/Materials/Scope.mat.meta rename to Assets/Graphics/Models/Guns/Scope.mat.meta diff --git a/Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture b/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture similarity index 100% rename from Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture rename to Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture diff --git a/Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture.meta b/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture.meta similarity index 100% rename from Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture.meta rename to Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture.meta diff --git a/Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph b/Assets/Graphics/Models/Guns/ScopeShader.shadergraph similarity index 100% rename from Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph rename to Assets/Graphics/Models/Guns/ScopeShader.shadergraph diff --git a/Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph.meta b/Assets/Graphics/Models/Guns/ScopeShader.shadergraph.meta similarity index 100% rename from Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph.meta rename to Assets/Graphics/Models/Guns/ScopeShader.shadergraph.meta diff --git a/Assets/Player/SniperRifle/SniperRifle.fbx b/Assets/Graphics/Models/Guns/SniperRifle.fbx similarity index 100% rename from Assets/Player/SniperRifle/SniperRifle.fbx rename to Assets/Graphics/Models/Guns/SniperRifle.fbx diff --git a/Assets/Player/SniperRifle/SniperRifle.fbx.meta b/Assets/Graphics/Models/Guns/SniperRifle.fbx.meta similarity index 100% rename from Assets/Player/SniperRifle/SniperRifle.fbx.meta rename to Assets/Graphics/Models/Guns/SniperRifle.fbx.meta diff --git a/Assets/Graphics/Models/Levels.meta b/Assets/Graphics/Models/Levels.meta new file mode 100644 index 0000000..701fe6d --- /dev/null +++ b/Assets/Graphics/Models/Levels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17d8d8bda65ee424ab60ef59190d1ecd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Maps/Stardust.meta b/Assets/Graphics/Models/Levels/Stardust.meta similarity index 100% rename from Assets/Maps/Stardust.meta rename to Assets/Graphics/Models/Levels/Stardust.meta diff --git a/Assets/Maps/Stardust/Stardust.fbx b/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx similarity index 100% rename from Assets/Maps/Stardust/Stardust.fbx rename to Assets/Graphics/Models/Levels/Stardust/Stardust.fbx diff --git a/Assets/Maps/Stardust/Stardust.fbx.meta b/Assets/Graphics/Models/Levels/Stardust/Stardust.fbx.meta similarity index 100% rename from Assets/Maps/Stardust/Stardust.fbx.meta rename to Assets/Graphics/Models/Levels/Stardust/Stardust.fbx.meta diff --git a/Assets/Maps/Stardust/StardustBlue.mat b/Assets/Graphics/Models/Levels/Stardust/StardustBlue.mat similarity index 100% rename from Assets/Maps/Stardust/StardustBlue.mat rename to Assets/Graphics/Models/Levels/Stardust/StardustBlue.mat diff --git a/Assets/Maps/Stardust/StardustBlue.mat.meta b/Assets/Graphics/Models/Levels/Stardust/StardustBlue.mat.meta similarity index 100% rename from Assets/Maps/Stardust/StardustBlue.mat.meta rename to Assets/Graphics/Models/Levels/Stardust/StardustBlue.mat.meta diff --git a/Assets/Maps/Stardust/StardustNeutral.mat b/Assets/Graphics/Models/Levels/Stardust/StardustNeutral.mat similarity index 100% rename from Assets/Maps/Stardust/StardustNeutral.mat rename to Assets/Graphics/Models/Levels/Stardust/StardustNeutral.mat diff --git a/Assets/Maps/Stardust/StardustNeutral.mat.meta b/Assets/Graphics/Models/Levels/Stardust/StardustNeutral.mat.meta similarity index 100% rename from Assets/Maps/Stardust/StardustNeutral.mat.meta rename to Assets/Graphics/Models/Levels/Stardust/StardustNeutral.mat.meta diff --git a/Assets/Maps/Stardust/StardustOrange.mat b/Assets/Graphics/Models/Levels/Stardust/StardustOrange.mat similarity index 100% rename from Assets/Maps/Stardust/StardustOrange.mat rename to Assets/Graphics/Models/Levels/Stardust/StardustOrange.mat diff --git a/Assets/Maps/Stardust/StardustOrange.mat.meta b/Assets/Graphics/Models/Levels/Stardust/StardustOrange.mat.meta similarity index 100% rename from Assets/Maps/Stardust/StardustOrange.mat.meta rename to Assets/Graphics/Models/Levels/Stardust/StardustOrange.mat.meta diff --git a/Assets/Maps/Stardust/StardustWallbang.mat b/Assets/Graphics/Models/Levels/Stardust/StardustWallbang.mat similarity index 100% rename from Assets/Maps/Stardust/StardustWallbang.mat rename to Assets/Graphics/Models/Levels/Stardust/StardustWallbang.mat diff --git a/Assets/Maps/Stardust/StardustWallbang.mat.meta b/Assets/Graphics/Models/Levels/Stardust/StardustWallbang.mat.meta similarity index 100% rename from Assets/Maps/Stardust/StardustWallbang.mat.meta rename to Assets/Graphics/Models/Levels/Stardust/StardustWallbang.mat.meta diff --git a/Assets/Graphics/Models/Soldier.meta b/Assets/Graphics/Models/Soldier.meta new file mode 100644 index 0000000..cd035a1 --- /dev/null +++ b/Assets/Graphics/Models/Soldier.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ee894af57b1e9f4594009cee299e71a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/Models/SoldierAnimator.controller b/Assets/Graphics/Models/Soldier/SoldierAnimator.controller similarity index 100% rename from Assets/Player/Models/SoldierAnimator.controller rename to Assets/Graphics/Models/Soldier/SoldierAnimator.controller diff --git a/Assets/Player/Models/SoldierAnimator.controller.meta b/Assets/Graphics/Models/Soldier/SoldierAnimator.controller.meta similarity index 100% rename from Assets/Player/Models/SoldierAnimator.controller.meta rename to Assets/Graphics/Models/Soldier/SoldierAnimator.controller.meta diff --git a/Assets/Player/Models/SoldierF.fbx b/Assets/Graphics/Models/Soldier/SoldierF.fbx similarity index 100% rename from Assets/Player/Models/SoldierF.fbx rename to Assets/Graphics/Models/Soldier/SoldierF.fbx diff --git a/Assets/Player/Models/SoldierF.fbx.meta b/Assets/Graphics/Models/Soldier/SoldierF.fbx.meta similarity index 100% rename from Assets/Player/Models/SoldierF.fbx.meta rename to Assets/Graphics/Models/Soldier/SoldierF.fbx.meta diff --git a/Assets/Player/Models/SoldierM.fbx b/Assets/Graphics/Models/Soldier/SoldierM.fbx similarity index 100% rename from Assets/Player/Models/SoldierM.fbx rename to Assets/Graphics/Models/Soldier/SoldierM.fbx diff --git a/Assets/Player/Models/SoldierM.fbx.meta b/Assets/Graphics/Models/Soldier/SoldierM.fbx.meta similarity index 100% rename from Assets/Player/Models/SoldierM.fbx.meta rename to Assets/Graphics/Models/Soldier/SoldierM.fbx.meta diff --git a/Assets/Player/Materials/SoldierMat.mat b/Assets/Graphics/Models/Soldier/SoldierMat.mat similarity index 100% rename from Assets/Player/Materials/SoldierMat.mat rename to Assets/Graphics/Models/Soldier/SoldierMat.mat diff --git a/Assets/Player/Materials/SoldierMat.mat.meta b/Assets/Graphics/Models/Soldier/SoldierMat.mat.meta similarity index 100% rename from Assets/Player/Materials/SoldierMat.mat.meta rename to Assets/Graphics/Models/Soldier/SoldierMat.mat.meta diff --git a/Assets/Graphics/Splashes.meta b/Assets/Graphics/Splashes.meta new file mode 100644 index 0000000..a11aa27 --- /dev/null +++ b/Assets/Graphics/Splashes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9bc528afd10e5684b8dbd8e82b1d0328 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Sprites/NeonTea.png b/Assets/Graphics/Splashes/NeonTea.png similarity index 100% rename from Assets/Graphics/Sprites/NeonTea.png rename to Assets/Graphics/Splashes/NeonTea.png diff --git a/Assets/Graphics/Sprites/NeonTea.png.meta b/Assets/Graphics/Splashes/NeonTea.png.meta similarity index 100% rename from Assets/Graphics/Sprites/NeonTea.png.meta rename to Assets/Graphics/Splashes/NeonTea.png.meta diff --git a/Assets/Graphics/Textures.meta b/Assets/Graphics/Textures.meta new file mode 100644 index 0000000..2719c56 --- /dev/null +++ b/Assets/Graphics/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e12d898d696c3ce49a4a69c74402b5d4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Maps/Props/Grate.meta b/Assets/Graphics/Textures/Grate.meta similarity index 77% rename from Assets/Maps/Props/Grate.meta rename to Assets/Graphics/Textures/Grate.meta index 7b88019..0105077 100644 --- a/Assets/Maps/Props/Grate.meta +++ b/Assets/Graphics/Textures/Grate.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cfddee72423f81b479103c90a1c77a45 +guid: 29c1cfaf9641d9c4f8f4a622ba8565d4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Maps/Props/Grate/GrateAlbedo.png b/Assets/Graphics/Textures/Grate/GrateAlbedo.png similarity index 100% rename from Assets/Maps/Props/Grate/GrateAlbedo.png rename to Assets/Graphics/Textures/Grate/GrateAlbedo.png diff --git a/Assets/Maps/Props/Grate/GrateAlbedo.png.meta b/Assets/Graphics/Textures/Grate/GrateAlbedo.png.meta similarity index 100% rename from Assets/Maps/Props/Grate/GrateAlbedo.png.meta rename to Assets/Graphics/Textures/Grate/GrateAlbedo.png.meta diff --git a/Assets/Maps/Props/Grate/GrateNormal.png b/Assets/Graphics/Textures/Grate/GrateNormal.png similarity index 100% rename from Assets/Maps/Props/Grate/GrateNormal.png rename to Assets/Graphics/Textures/Grate/GrateNormal.png diff --git a/Assets/Maps/Props/Grate/GrateNormal.png.meta b/Assets/Graphics/Textures/Grate/GrateNormal.png.meta similarity index 100% rename from Assets/Maps/Props/Grate/GrateNormal.png.meta rename to Assets/Graphics/Textures/Grate/GrateNormal.png.meta diff --git a/Assets/Maps/Props/Grate/GrateSmoothness.png b/Assets/Graphics/Textures/Grate/GrateSmoothness.png similarity index 100% rename from Assets/Maps/Props/Grate/GrateSmoothness.png rename to Assets/Graphics/Textures/Grate/GrateSmoothness.png diff --git a/Assets/Maps/Props/Grate/GrateSmoothness.png.meta b/Assets/Graphics/Textures/Grate/GrateSmoothness.png.meta similarity index 100% rename from Assets/Maps/Props/Grate/GrateSmoothness.png.meta rename to Assets/Graphics/Textures/Grate/GrateSmoothness.png.meta diff --git a/Assets/Graphics/Textures/Soldier.meta b/Assets/Graphics/Textures/Soldier.meta new file mode 100644 index 0000000..37f2692 --- /dev/null +++ b/Assets/Graphics/Textures/Soldier.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da5fe32f7d1fbee42aa8abf8eb94cb13 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/SniperRifle/Materials/Gear.png b/Assets/Graphics/Textures/Soldier/Gear.png similarity index 100% rename from Assets/Player/SniperRifle/Materials/Gear.png rename to Assets/Graphics/Textures/Soldier/Gear.png diff --git a/Assets/Player/SniperRifle/Materials/Gear.png.meta b/Assets/Graphics/Textures/Soldier/Gear.png.meta similarity index 100% rename from Assets/Player/SniperRifle/Materials/Gear.png.meta rename to Assets/Graphics/Textures/Soldier/Gear.png.meta diff --git a/Assets/Player/Materials/Soldier.png b/Assets/Graphics/Textures/Soldier/Soldier.png similarity index 100% rename from Assets/Player/Materials/Soldier.png rename to Assets/Graphics/Textures/Soldier/Soldier.png diff --git a/Assets/Player/Materials/Soldier.png.meta b/Assets/Graphics/Textures/Soldier/Soldier.png.meta similarity index 100% rename from Assets/Player/Materials/Soldier.png.meta rename to Assets/Graphics/Textures/Soldier/Soldier.png.meta diff --git a/Assets/Unity/Lib/InputSystem.meta b/Assets/InputSystem.meta similarity index 100% rename from Assets/Unity/Lib/InputSystem.meta rename to Assets/InputSystem.meta diff --git a/Assets/Unity/Lib/InputSystem/InputSystem.inputsettings.asset b/Assets/InputSystem/InputSystem.inputsettings.asset similarity index 100% rename from Assets/Unity/Lib/InputSystem/InputSystem.inputsettings.asset rename to Assets/InputSystem/InputSystem.inputsettings.asset diff --git a/Assets/Unity/Lib/InputSystem/InputSystem.inputsettings.asset.meta b/Assets/InputSystem/InputSystem.inputsettings.asset.meta similarity index 100% rename from Assets/Unity/Lib/InputSystem/InputSystem.inputsettings.asset.meta rename to Assets/InputSystem/InputSystem.inputsettings.asset.meta diff --git a/Assets/Unity/Lib.meta b/Assets/Lib.meta similarity index 100% rename from Assets/Unity/Lib.meta rename to Assets/Lib.meta diff --git a/Assets/Unity/Lib/ProBuilder Data.meta b/Assets/Lib/ProBuilder Data.meta similarity index 100% rename from Assets/Unity/Lib/ProBuilder Data.meta rename to Assets/Lib/ProBuilder Data.meta diff --git a/Assets/Unity/Lib/ProBuilder Data/Default Color Palette.asset b/Assets/Lib/ProBuilder Data/Default Color Palette.asset similarity index 100% rename from Assets/Unity/Lib/ProBuilder Data/Default Color Palette.asset rename to Assets/Lib/ProBuilder Data/Default Color Palette.asset diff --git a/Assets/Unity/Lib/ProBuilder Data/Default Color Palette.asset.meta b/Assets/Lib/ProBuilder Data/Default Color Palette.asset.meta similarity index 100% rename from Assets/Unity/Lib/ProBuilder Data/Default Color Palette.asset.meta rename to Assets/Lib/ProBuilder Data/Default Color Palette.asset.meta diff --git a/Assets/Unity/Lib/TextMesh Pro.meta b/Assets/Lib/TextMesh Pro.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro.meta rename to Assets/Lib/TextMesh Pro.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Fonts.meta b/Assets/Lib/TextMesh Pro/Fonts.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Fonts.meta rename to Assets/Lib/TextMesh Pro/Fonts.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt b/Assets/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt rename to Assets/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt diff --git a/Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta b/Assets/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta rename to Assets/Lib/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans.ttf b/Assets/Lib/TextMesh Pro/Fonts/LiberationSans.ttf similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans.ttf rename to Assets/Lib/TextMesh Pro/Fonts/LiberationSans.ttf diff --git a/Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans.ttf.meta b/Assets/Lib/TextMesh Pro/Fonts/LiberationSans.ttf.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Fonts/LiberationSans.ttf.meta rename to Assets/Lib/TextMesh Pro/Fonts/LiberationSans.ttf.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources.meta b/Assets/Lib/TextMesh Pro/Resources.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources.meta rename to Assets/Lib/TextMesh Pro/Resources.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials.meta rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta b/Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta rename to Assets/Lib/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt b/Assets/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt rename to Assets/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta b/Assets/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta rename to Assets/Lib/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt b/Assets/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt rename to Assets/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta b/Assets/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta rename to Assets/Lib/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Sprite Assets.meta b/Assets/Lib/TextMesh Pro/Resources/Sprite Assets.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Sprite Assets.meta rename to Assets/Lib/TextMesh Pro/Resources/Sprite Assets.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset b/Assets/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset rename to Assets/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta b/Assets/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta rename to Assets/Lib/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Style Sheets.meta b/Assets/Lib/TextMesh Pro/Resources/Style Sheets.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Style Sheets.meta rename to Assets/Lib/TextMesh Pro/Resources/Style Sheets.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset b/Assets/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset rename to Assets/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta b/Assets/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta rename to Assets/Lib/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/TMP Settings.asset b/Assets/Lib/TextMesh Pro/Resources/TMP Settings.asset similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/TMP Settings.asset rename to Assets/Lib/TextMesh Pro/Resources/TMP Settings.asset diff --git a/Assets/Unity/Lib/TextMesh Pro/Resources/TMP Settings.asset.meta b/Assets/Lib/TextMesh Pro/Resources/TMP Settings.asset.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Resources/TMP Settings.asset.meta rename to Assets/Lib/TextMesh Pro/Resources/TMP Settings.asset.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders.meta b/Assets/Lib/TextMesh Pro/Shaders.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders.meta rename to Assets/Lib/TextMesh Pro/Shaders.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_SDF.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_SDF.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_SDF.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader b/Assets/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader.meta b/Assets/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMP_Sprite.shader.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro.cginc b/Assets/Lib/TextMesh Pro/Shaders/TMPro.cginc similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro.cginc rename to Assets/Lib/TextMesh Pro/Shaders/TMPro.cginc diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro.cginc.meta b/Assets/Lib/TextMesh Pro/Shaders/TMPro.cginc.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro.cginc.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMPro.cginc.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc b/Assets/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc rename to Assets/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta b/Assets/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc b/Assets/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc rename to Assets/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta b/Assets/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc b/Assets/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc rename to Assets/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc diff --git a/Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta b/Assets/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta rename to Assets/Lib/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Sprites.meta b/Assets/Lib/TextMesh Pro/Sprites.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Sprites.meta rename to Assets/Lib/TextMesh Pro/Sprites.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt b/Assets/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt rename to Assets/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt diff --git a/Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta b/Assets/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta rename to Assets/Lib/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta diff --git a/Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne.json b/Assets/Lib/TextMesh Pro/Sprites/EmojiOne.json similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne.json rename to Assets/Lib/TextMesh Pro/Sprites/EmojiOne.json diff --git a/Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne.json.meta b/Assets/Lib/TextMesh Pro/Sprites/EmojiOne.json.meta similarity index 100% rename from Assets/Unity/Lib/TextMesh Pro/Sprites/EmojiOne.json.meta rename to Assets/Lib/TextMesh Pro/Sprites/EmojiOne.json.meta diff --git a/Assets/Maps/Props/Grate/Grate.prefab b/Assets/Maps/Props/Grate/Grate.prefab deleted file mode 100644 index 9f1b18e..0000000 --- a/Assets/Maps/Props/Grate/Grate.prefab +++ /dev/null @@ -1,324 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &9211864943684023031 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9211864943684023028} - - component: {fileID: 9211864943684023029} - m_Layer: 13 - m_Name: Audio Source - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9211864943684023028 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864943684023031} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 9211864944975775706} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &9211864943684023029 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864943684023031} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -8030293084440089681, guid: ff7bf5284859d9f45a64971a67bb173a, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!1 &9211864944975775701 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9211864944975775706} - - component: {fileID: 9211864944975775705} - - component: {fileID: 9211864944975775704} - - component: {fileID: 9211864944975775707} - - component: {fileID: 9211864944975775710} - m_Layer: 13 - m_Name: Grate - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &9211864944975775706 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864944975775701} - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000029653306} - m_LocalPosition: {x: -28, y: 3, z: 0} - m_LocalScale: {x: 2, y: 2, z: 1} - m_Children: - - {fileID: 9211864945430895927} - - {fileID: 9211864943684023028} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!33 &9211864944975775705 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864944975775701} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &9211864944975775704 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864944975775701} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f2eefd308cb0b82438a72b5535436e0d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 0.4 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &9211864944975775707 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864944975775701} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 6.1232336e-17} - m_Center: {x: 0, y: 0, z: -0.00000023841858} ---- !u!114 &9211864944975775710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864944975775701} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03f421a8b121f76468bdf7a1961dcbda, type: 3} - m_Name: - m_EditorClassIdentifier: - Source: {fileID: 9211864943684023029} - Clips: - - {fileID: 8300000, guid: 21a10f39053eed742bc40e3d3a79d3b0, type: 3} - - {fileID: 8300000, guid: 730cd0a8b458ea549b2f23af563b7b36, type: 3} ---- !u!1 &9211864945430895926 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9211864945430895927} - - component: {fileID: 9211864945430895930} - - component: {fileID: 9211864945430895925} - m_Layer: 13 - m_Name: WindowSideB - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &9211864945430895927 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864945430895926} - m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.0000029653306} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 9211864944975775706} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &9211864945430895930 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864945430895926} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &9211864945430895925 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211864945430895926} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f2eefd308cb0b82438a72b5535436e0d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 0.4 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Player/Effects.meta b/Assets/Player/Effects.meta deleted file mode 100644 index f83f213..0000000 --- a/Assets/Player/Effects.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1cc0d8d22868553468e6c109a6e260bb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Player/SniperRifle.meta b/Assets/Player/SniperRifle.meta deleted file mode 100644 index 54dcb7a..0000000 --- a/Assets/Player/SniperRifle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 13ec8677188a4954398c382d280a79c1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Player/SniperRifle/Materials.meta b/Assets/Player/SniperRifle/Materials.meta deleted file mode 100644 index 7992465..0000000 --- a/Assets/Player/SniperRifle/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e44402443bb8af245b6ecc1b1ab79094 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/CREDITS.md b/CREDITS.md index 1c472b4..4e24254 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,6 +1,3 @@ - [Crosshair](Assets/Graphics/Sprites/Crosshair.png) by MarkieAnn Packer from the Noun Project -- Sound effects from [zapsplat.com](https://www.zapsplat.com/) - - [ChainLinkFenceImpact](Assets/Maps/Props/Grate/) - - [LaserWithRecovery and LaserFast](Assets/Player/SniperRifle/Sfx/) - - [Hit](Assets/Player/Effects/) +- [Sound effects](Assets/Audio/Sfx/ZapSplat) from [zapsplat.com](https://www.zapsplat.com/) - [Soldier model and rig](RawAssets/Soldier) by [Casti_131](https://opengameart.org/content/low-poly-soldier-with-weapons)