Merge pull request #7 from thelastflapjack/add_void_music

Added music created by void and updated credits.
This commit is contained in:
thelastflapjack 2022-09-17 12:08:07 +01:00 committed by GitHub
commit 69fb97feaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 124 additions and 115 deletions

Binary file not shown.

View file

@ -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

Binary file not shown.

View file

@ -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

View file

@ -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/

BIN
raw_assets/music/Menu.wav Normal file

Binary file not shown.

View file

@ -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

View file

@ -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.

View file

@ -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

View file

@ -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

View file

@ -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.

View file

@ -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

View file

@ -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.

View file

@ -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"

View file

@ -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