From 99ba374f352de380f80890db6edff8a207e5680a Mon Sep 17 00:00:00 2001 From: unfa Date: Wed, 19 May 2021 21:29:09 +0200 Subject: [PATCH] Implemented an animated crosshair that'll play sounds and change color when hitting or killing enemies. --- .../Ardour/Liblast SFX2/Liblast SFX2.ardour | 7389 +++++++++-------- .../plugins/102849/state8/state.ttl | 3082 ------- .../plugins/104401/state4/state.ttl | 3077 ------- .../plugins/105953/state4/state.ttl | 3077 ------- .../plugins/107505/state4/state.ttl | 3077 ------- .../plugins/135645/state13/manifest.ttl | 13 - .../plugins/135645/state13/state.ttl | 3086 ------- .../plugins/22536/state16/manifest.ttl | 13 - .../plugins/22536/state16/state.ttl | 3464 -------- .../plugins/25640/state12/manifest.ttl | 13 - .../plugins/25640/state12/state.ttl | 4043 --------- .../plugins/27192/state10/manifest.ttl | 13 - .../plugins/27192/state10/state.ttl | 3078 ------- .../plugins/28744/state10/manifest.ttl | 13 - .../plugins/28744/state10/state.ttl | 3078 ------- .../plugins/30296/state11/manifest.ttl | 13 - .../plugins/30296/state11/state.ttl | 3082 ------- .../plugins/31848/state11/manifest.ttl | 13 - .../plugins/31848/state11/state.ttl | 3086 ------- .../plugins/37864/state14/manifest.ttl | 13 - .../plugins/37864/state14/state.ttl | 3464 -------- .../plugins/54678/state2/manifest.ttl | 13 + .../plugins/54678/state2/state.ttl | 20 + .../state8 => 85487/state2}/manifest.ttl | 2 +- .../plugins/85487/state2/state.ttl | 122 + .../plugins/85512/state1/state.ttl | 3 +- .../state4 => 85512/state3}/manifest.ttl | 2 +- .../plugins/85512/state3/state.ttl | 20 + .../state4 => 85696/state5}/manifest.ttl | 2 +- .../plugins/85696/state5/state.ttl | 125 + .../state4 => 85696/state6}/manifest.ttl | 2 +- .../plugins/85696/state6/state.ttl | 126 + .../plugins/85800/state1/state.ttl | 3 +- .../plugins/85800/state4/manifest.ttl | 13 + .../plugins/85800/state4/state.ttl | 20 + .../plugins/86029/state5/manifest.ttl | 13 + .../plugins/86029/state5/state.ttl | 122 + Asset Sources/HUD/Crosshair_01.svg | 142 + Asset Sources/HUD/Crosshair_02.svg | 145 + Asset Sources/HUD/Crosshair_03.svg | 153 + Game/{Classes => Assets/Characters}/Player.gd | 0 .../Characters}/Player.tscn | 2 +- Game/Assets/HUD/Crosshair.gd | 11 + Game/Assets/HUD/Crosshair.png | Bin 0 -> 1705 bytes Game/Assets/HUD/Crosshair.png.import | 34 + Game/Assets/SFX/UI_Accept.wav | Bin 0 -> 436668 bytes Game/Assets/SFX/UI_Accept.wav.import | 21 + Game/Assets/SFX/UI_Cancel.wav | Bin 0 -> 108480 bytes Game/Assets/SFX/UI_Cancel.wav.import | 21 + Game/Assets/SFX/UI_Click.wav | Bin 0 -> 14432 bytes Game/Assets/SFX/UI_Click.wav.import | 21 + Game/Assets/SFX/UI_Confirm_Hit.wav | Bin 0 -> 10712 bytes Game/Assets/SFX/UI_Confirm_Hit.wav.import | 21 + Game/Assets/SFX/UI_Confirm_Kill.wav | Bin 0 -> 34548 bytes Game/Assets/SFX/UI_Confirm_Kill.wav.import | 21 + Game/Assets/SFX/UI_Hover.wav | Bin 0 -> 23304 bytes Game/Assets/SFX/UI_Hover.wav.import | 21 + Game/Main.tscn | 226 +- Game/project.godot | 20 +- 59 files changed, 5249 insertions(+), 42405 deletions(-) delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/102849/state8/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/104401/state4/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/105953/state4/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/107505/state4/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/135645/state13/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/135645/state13/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/22536/state16/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/22536/state16/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/25640/state12/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/25640/state12/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/27192/state10/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/27192/state10/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/28744/state10/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/28744/state10/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/30296/state11/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/30296/state11/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/31848/state11/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/31848/state11/state.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/37864/state14/manifest.ttl delete mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/37864/state14/state.ttl create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/54678/state2/manifest.ttl create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/54678/state2/state.ttl rename Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/{102849/state8 => 85487/state2}/manifest.ttl (88%) create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/85487/state2/state.ttl rename Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/{105953/state4 => 85512/state3}/manifest.ttl (88%) create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/85512/state3/state.ttl rename Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/{104401/state4 => 85696/state5}/manifest.ttl (88%) create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/85696/state5/state.ttl rename Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/{107505/state4 => 85696/state6}/manifest.ttl (88%) create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/85696/state6/state.ttl create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/85800/state4/manifest.ttl create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/85800/state4/state.ttl create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/86029/state5/manifest.ttl create mode 100644 Asset Sources/Audio/SFX/Ardour/Liblast SFX2/plugins/86029/state5/state.ttl create mode 100644 Asset Sources/HUD/Crosshair_01.svg create mode 100644 Asset Sources/HUD/Crosshair_02.svg create mode 100644 Asset Sources/HUD/Crosshair_03.svg rename Game/{Classes => Assets/Characters}/Player.gd (100%) rename Game/{Classes => Assets/Characters}/Player.tscn (93%) create mode 100644 Game/Assets/HUD/Crosshair.gd create mode 100644 Game/Assets/HUD/Crosshair.png create mode 100644 Game/Assets/HUD/Crosshair.png.import create mode 100644 Game/Assets/SFX/UI_Accept.wav create mode 100644 Game/Assets/SFX/UI_Accept.wav.import create mode 100644 Game/Assets/SFX/UI_Cancel.wav create mode 100644 Game/Assets/SFX/UI_Cancel.wav.import create mode 100644 Game/Assets/SFX/UI_Click.wav create mode 100644 Game/Assets/SFX/UI_Click.wav.import create mode 100644 Game/Assets/SFX/UI_Confirm_Hit.wav create mode 100644 Game/Assets/SFX/UI_Confirm_Hit.wav.import create mode 100644 Game/Assets/SFX/UI_Confirm_Kill.wav create mode 100644 Game/Assets/SFX/UI_Confirm_Kill.wav.import create mode 100644 Game/Assets/SFX/UI_Hover.wav create mode 100644 Game/Assets/SFX/UI_Hover.wav.import diff --git a/Asset Sources/Audio/SFX/Ardour/Liblast SFX2/Liblast SFX2.ardour b/Asset Sources/Audio/SFX/Ardour/Liblast SFX2/Liblast SFX2.ardour index 395b64b..0691d02 100644 --- a/Asset Sources/Audio/SFX/Ardour/Liblast SFX2/Liblast SFX2.ardour +++ b/Asset Sources/Audio/SFX/Ardour/Liblast SFX2/Liblast SFX2.ardour @@ -1,6 +1,6 @@ - - + + @@ -8,9 +8,7 @@ - - - +