diff --git a/raw_assets/music/GameInside.wav b/raw_assets/music/GameInside.wav new file mode 100644 index 0000000..5d44cc0 Binary files /dev/null and b/raw_assets/music/GameInside.wav differ diff --git a/raw_assets/music/GameInside.wav.import b/raw_assets/music/GameInside.wav.import new file mode 100644 index 0000000..f0ba66a --- /dev/null +++ b/raw_assets/music/GameInside.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/GameInside.wav-682ab916c322a890be845aa06fa242aa.sample" + +[deps] + +source_file="res://raw_assets/music/GameInside.wav" +dest_files=[ "res://.import/GameInside.wav-682ab916c322a890be845aa06fa242aa.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/raw_assets/music/GameOutside.wav b/raw_assets/music/GameOutside.wav new file mode 100644 index 0000000..7806107 Binary files /dev/null and b/raw_assets/music/GameOutside.wav differ diff --git a/raw_assets/music/GameOutside.wav.import b/raw_assets/music/GameOutside.wav.import new file mode 100644 index 0000000..2f277f7 --- /dev/null +++ b/raw_assets/music/GameOutside.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/GameOutside.wav-e3ec1d1e451ec105cb28eeb2a0ad4686.sample" + +[deps] + +source_file="res://raw_assets/music/GameOutside.wav" +dest_files=[ "res://.import/GameOutside.wav-e3ec1d1e451ec105cb28eeb2a0ad4686.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/raw_assets/music/LICENSE.txt b/raw_assets/music/LICENSE.txt new file mode 100644 index 0000000..5e8f5db --- /dev/null +++ b/raw_assets/music/LICENSE.txt @@ -0,0 +1,6 @@ +Created by: xX-Void-Xx (https://github.com/xX-Void-Xx) + +--------------------------- + +Licensed under Creative Commons: By Attribution 4.0 License +http://creativecommons.org/licenses/by/4.0/ \ No newline at end of file diff --git a/raw_assets/music/Menu.wav b/raw_assets/music/Menu.wav new file mode 100644 index 0000000..c2305d1 Binary files /dev/null and b/raw_assets/music/Menu.wav differ diff --git a/raw_assets/music/Menu.wav.import b/raw_assets/music/Menu.wav.import new file mode 100644 index 0000000..ba48df4 --- /dev/null +++ b/raw_assets/music/Menu.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Menu.wav-419ae3ece36784438ce3a9f38c3658a8.sample" + +[deps] + +source_file="res://raw_assets/music/Menu.wav" +dest_files=[ "res://.import/Menu.wav-419ae3ece36784438ce3a9f38c3658a8.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/raw_assets/music/menu/LICENSE.txt b/raw_assets/music/menu/LICENSE.txt deleted file mode 100644 index 5748cac..0000000 --- a/raw_assets/music/menu/LICENSE.txt +++ /dev/null @@ -1,12 +0,0 @@ -Late Night Radio -Created by: Kevin MacLeod (incompetech.com) -Available at: https://incompetech.com/music/royalty-free/music.html - ---------------------------- - -Licensed under Creative Commons: By Attribution 4.0 License -http://creativecommons.org/licenses/by/4.0/ - ---------------------------- - -This is not the original file. The original is stereo but this version has been mixed down to mono. \ No newline at end of file diff --git a/raw_assets/music/menu/Late Night Radio.mp3 b/raw_assets/music/menu/Late Night Radio.mp3 deleted file mode 100644 index 4da3a29..0000000 Binary files a/raw_assets/music/menu/Late Night Radio.mp3 and /dev/null differ diff --git a/raw_assets/music/menu/Late Night Radio.mp3.import b/raw_assets/music/menu/Late Night Radio.mp3.import deleted file mode 100644 index d57ff3e..0000000 --- a/raw_assets/music/menu/Late Night Radio.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/Late Night Radio.mp3-c68095933942029e5a2c5ad928b65fb0.mp3str" - -[deps] - -source_file="res://raw_assets/music/menu/Late Night Radio.mp3" -dest_files=[ "res://.import/Late Night Radio.mp3-c68095933942029e5a2c5ad928b65fb0.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/raw_assets/music/off_range/Electro Sketch.mp3 b/raw_assets/music/off_range/Electro Sketch.mp3 deleted file mode 100644 index 19d64ce..0000000 Binary files a/raw_assets/music/off_range/Electro Sketch.mp3 and /dev/null differ diff --git a/raw_assets/music/off_range/Electro Sketch.mp3.import b/raw_assets/music/off_range/Electro Sketch.mp3.import deleted file mode 100644 index b72102c..0000000 --- a/raw_assets/music/off_range/Electro Sketch.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/Electro Sketch.mp3-2c37310d0e0a68d9b3dd1e3569a05816.mp3str" - -[deps] - -source_file="res://raw_assets/music/off_range/Electro Sketch.mp3" -dest_files=[ "res://.import/Electro Sketch.mp3-2c37310d0e0a68d9b3dd1e3569a05816.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/raw_assets/music/off_range/LICENSE.txt b/raw_assets/music/off_range/LICENSE.txt deleted file mode 100644 index 767621b..0000000 --- a/raw_assets/music/off_range/LICENSE.txt +++ /dev/null @@ -1,14 +0,0 @@ -Electro (Sketch) -Created by: Kevin MacLeod (incompetech.com) -Available at: https://incompetech.com/music/royalty-free/music.html - ---------------------------- - -Licensed under Creative Commons: By Attribution 4.0 License -http://creativecommons.org/licenses/by/4.0/ - ---------------------------- - -This is not the original file. -The original is stereo but this version has been mixed down to mono. -This version is roughly only the first half of the original audio. \ No newline at end of file diff --git a/raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3 b/raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3 deleted file mode 100644 index c69060d..0000000 Binary files a/raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3 and /dev/null differ diff --git a/raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3.import b/raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3.import deleted file mode 100644 index 9310fe4..0000000 --- a/raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/Cybermatic pulse (LOOP).mp3-e314213aa43639f1c17194102fca4df1.mp3str" - -[deps] - -source_file="res://raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3" -dest_files=[ "res://.import/Cybermatic pulse (LOOP).mp3-e314213aa43639f1c17194102fca4df1.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/raw_assets/music/on_range/LICENSE.txt b/raw_assets/music/on_range/LICENSE.txt deleted file mode 100644 index 1decddc..0000000 --- a/raw_assets/music/on_range/LICENSE.txt +++ /dev/null @@ -1,12 +0,0 @@ -Cybermatic pulse (LOOP) -Created by: Alexandr Zhelanov (https://opengameart.org/users/alexandr-zhelanov) -Available at: https://opengameart.org/content/cybermatic-pulse - ---------------------------- - -Licensed under Creative Commons: By Attribution 4.0 License -http://creativecommons.org/licenses/by/4.0/ - ---------------------------- - -This is not the original file. The original is stereo but this version has been mixed down to mono. \ No newline at end of file diff --git a/src/autoloads/music/music_manager.tscn b/src/autoloads/music/music_manager.tscn index 28ef778..f469fa9 100644 --- a/src/autoloads/music/music_manager.tscn +++ b/src/autoloads/music/music_manager.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://src/autoloads/music/music_manager.gd" type="Script" id=1] -[ext_resource path="res://raw_assets/music/menu/Late Night Radio.mp3" type="AudioStream" id=2] -[ext_resource path="res://raw_assets/music/off_range/Electro Sketch.mp3" type="AudioStream" id=3] -[ext_resource path="res://raw_assets/music/on_range/Cybermatic pulse (LOOP).mp3" type="AudioStream" id=4] +[ext_resource path="res://raw_assets/music/GameOutside.wav" type="AudioStream" id=2] +[ext_resource path="res://raw_assets/music/Menu.wav" type="AudioStream" id=3] +[ext_resource path="res://raw_assets/music/GameInside.wav" type="AudioStream" id=4] [node name="MusicManager" type="Node"] pause_mode = 2 @@ -11,7 +11,7 @@ script = ExtResource( 1 ) [node name="TrackMainMenu" type="AudioStreamPlayer" parent="."] pause_mode = 2 -stream = ExtResource( 2 ) +stream = ExtResource( 3 ) volume_db = -80.0 bus = "Music" @@ -23,6 +23,6 @@ bus = "Music" [node name="TrackOffRange" type="AudioStreamPlayer" parent="."] pause_mode = 2 -stream = ExtResource( 3 ) +stream = ExtResource( 2 ) volume_db = -80.0 bus = "Music" diff --git a/src/ui/main_menu/credits_page/credits_page.tscn b/src/ui/main_menu/credits_page/credits_page.tscn index eac822d..d111a3d 100644 --- a/src/ui/main_menu/credits_page/credits_page.tscn +++ b/src/ui/main_menu/credits_page/credits_page.tscn @@ -67,7 +67,23 @@ __meta__ = { "_edit_use_anchors_": true } +[node name="GithubCredits" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer"] +margin_right = 1124.0 +margin_bottom = 105.0 +text = "Github contributors: +#1 | thelastflapjack | 21,837++, 396-- +#2 | xX-Void-Xx | 106++, 156--" +align = 1 +valign = 1 +autowrap = true + +[node name="HSeparator2" type="HSeparator" parent="VBoxContainer/PanelContainer/VBoxContainer"] +margin_top = 125.0 +margin_right = 1124.0 +margin_bottom = 129.0 + [node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer/PanelContainer/VBoxContainer"] +margin_top = 149.0 margin_right = 1124.0 margin_bottom = 769.0 size_flags_vertical = 3 @@ -75,14 +91,25 @@ scroll_horizontal_enabled = false [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer"] margin_right = 1112.0 -margin_bottom = 1397.0 +margin_bottom = 1433.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 25 -[node name="LabelCredit1" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] +[node name="LabelCredit5" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] margin_right = 1112.0 -margin_bottom = 141.0 +margin_bottom = 105.0 +text = "Music +By: xX-Void-Xx +License: CC BY 4.0" +align = 1 +valign = 1 +autowrap = true + +[node name="LabelCredit1" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] +margin_top = 130.0 +margin_right = 1112.0 +margin_bottom = 271.0 text = "Font: Orbitron By: Matt McInerney Avaliable at: https://fonts.google.com/specimen/Orbitron @@ -92,9 +119,9 @@ valign = 1 autowrap = true [node name="LabelCredit2" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 166.0 +margin_top = 296.0 margin_right = 1112.0 -margin_bottom = 307.0 +margin_bottom = 437.0 text = "Interface Sounds By: Kenney Avaliable at: https://www.kenney.nl/assets/interface-sounds @@ -104,9 +131,9 @@ valign = 1 autowrap = true [node name="LabelCredit3" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 332.0 +margin_top = 462.0 margin_right = 1112.0 -margin_bottom = 473.0 +margin_bottom = 603.0 text = "Footstep sound effect By: ruberduck Avaliable at: https://opengameart.org/content/100-cc0-sfx-2 @@ -116,9 +143,9 @@ valign = 1 autowrap = true [node name="LabelCredit4" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 498.0 +margin_top = 628.0 margin_right = 1112.0 -margin_bottom = 639.0 +margin_bottom = 769.0 text = "Gunshot sound effect By: ShawnyBoy Avaliable at: https://freesound.org/people/ShawnyBoy/sounds/166191 @@ -128,9 +155,9 @@ valign = 1 autowrap = true [node name="LabelCredit8" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 664.0 +margin_top = 794.0 margin_right = 1112.0 -margin_bottom = 805.0 +margin_bottom = 935.0 text = "Pistol reload sounds By: oneshotofficial Avaliable at: https://freesound.org/people/oneshotofficial/sounds/616758/ @@ -140,9 +167,9 @@ valign = 1 autowrap = true [node name="LabelCredit9" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 830.0 +margin_top = 960.0 margin_right = 1112.0 -margin_bottom = 971.0 +margin_bottom = 1101.0 text = "Rifle reload sounds By: oneshotofficial Avaliable at: https://freesound.org/people/oneshotofficial/sounds/616757/ @@ -152,9 +179,9 @@ valign = 1 autowrap = true [node name="LabelCredit10" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 996.0 +margin_top = 1126.0 margin_right = 1112.0 -margin_bottom = 1137.0 +margin_bottom = 1267.0 text = "Enemy target hit sound By: cupido-1 Avaliable at: https://freesound.org/people/cupido-1/sounds/560724/ @@ -164,9 +191,9 @@ valign = 1 autowrap = true [node name="LabelCredit11" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 1162.0 +margin_top = 1292.0 margin_right = 1112.0 -margin_bottom = 1303.0 +margin_bottom = 1433.0 text = "Friendly target hit sound By: RICHERlandTV Avaliable at: https://freesound.org/people/RICHERlandTV/sounds/216090/ @@ -175,16 +202,6 @@ align = 1 valign = 1 autowrap = true -[node name="LabelCredit13" type="Label" parent="VBoxContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"] -margin_top = 1328.0 -margin_right = 1112.0 -margin_bottom = 1397.0 -text = "Everything else -By: thelastflapjack" -align = 1 -valign = 1 -autowrap = true - [node name="HSeparator" type="HSeparator" parent="VBoxContainer/PanelContainer/VBoxContainer"] margin_top = 789.0 margin_right = 1124.0