Merge branch 'master' of https://github.com/estineali/BountyHunter

estineali · Jun 30, 2020 · 1244d64 · 1244d64
2 parents 0a025ae + 55dc580
commit 1244d64
Show file tree

Hide file tree

Showing 32 changed files with 107 additions and 613 deletions.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -70,11 +70,13 @@
     <Compile Include="Assets\Scripts\GamePlayScreen Scripts\GameController.cs" />
     <Compile Include="Assets\Scripts\GamePlayScreen Scripts\Mover.cs" />
     <Compile Include="Assets\Scripts\GamePlayScreen Scripts\PlayerController.cs" />
+    <Compile Include="Assets\Scripts\GamePlayScreen Scripts\PlayerShoot.cs" />
     <Compile Include="Assets\Scripts\GamePlayScreen Scripts\RandomRotator.cs" />
     <Compile Include="Assets\Scripts\MainMenuScreen Scripts\LoadLevel.cs" />
     <Compile Include="Assets\Scripts\MainMenuScreen Scripts\MainMenuController.cs" />
     <None Include="Assets\Space Shooter SpaceShip\Info.txt" />
     <None Include="Assets\Fonts\kenney-space\License.txt" />
+    <None Include="Assets\Audio\bg_music_credits.txt" />
     <Reference Include="com.unity.multiplayer-hlapi.Editor">
       <HintPath>D:/Documents/GitHub/BountyHunter/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll</HintPath>
     </Reference>

diff --git a/Assets/Audio/AudioMixer.mixer b/Assets/Audio/AudioMixer.mixer
diff --git a/Assets/Audio/SHDY - Trick Or Treat (mp3cut.net).mp3 b/Assets/Audio/SHDY - Trick Or Treat (mp3cut.net).mp3
diff --git a/Assets/Audio/bg_music_credits.txt b/Assets/Audio/bg_music_credits.txt
diff --git a/Assets/Buttons/Muted.mat.meta → Assets/Audio/bg_music_credits.txt.meta b/Assets/Buttons/Muted.mat.meta → Assets/Audio/bg_music_credits.txt.meta
diff --git a/Assets/Audio/bg_music_loop.mp3 b/Assets/Audio/bg_music_loop.mp3
diff --git a/...DY - Trick Or Treat (mp3cut.net).mp3.meta → Assets/Audio/bg_music_loop.mp3.meta b/...DY - Trick Or Treat (mp3cut.net).mp3.meta → Assets/Audio/bg_music_loop.mp3.meta
diff --git a/Assets/Audio/music_background.wav b/Assets/Audio/music_background.wav
diff --git a/Assets/Audio/music_background.wav.meta b/Assets/Audio/music_background.wav.meta
diff --git a/Assets/Buttons/ButtonPrototype.png b/Assets/Buttons/ButtonPrototype.png
diff --git a/Assets/Buttons/ButtonPrototype.png.meta b/Assets/Buttons/ButtonPrototype.png.meta
diff --git a/Assets/Buttons/ButtonPrototype.tif b/Assets/Buttons/ButtonPrototype.tif
diff --git a/Assets/Buttons/ButtonPrototype.tif.meta b/Assets/Buttons/ButtonPrototype.tif.meta
diff --git a/Assets/Buttons/Muted.mat b/Assets/Buttons/Muted.mat
diff --git a/Assets/Buttons/NewPrototype.psd b/Assets/Buttons/NewPrototype.psd
diff --git a/Assets/Buttons/NewPrototype.psd.meta b/Assets/Buttons/NewPrototype.psd.meta
diff --git a/Assets/Buttons/Sound_on.mat b/Assets/Buttons/Sound_on.mat
diff --git a/Assets/Buttons/Sound_on.mat.meta b/Assets/Buttons/Sound_on.mat.meta
diff --git a/Assets/Buttons/button - Copy.tif b/Assets/Buttons/button - Copy.tif