Skip to content

Commit

Permalink
All New Audio added and mixed
Browse files Browse the repository at this point in the history
  • Loading branch information
QuietGeckoAudio committed Dec 18, 2018
1 parent eb42f33 commit 6d156f2
Show file tree
Hide file tree
Showing 111 changed files with 149 additions and 43 deletions.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Cart_Pull.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Cart_Put.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Cas_Erase.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Cas_Rec.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Caset_Eject.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Caset_Grab.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Caset_Insert.ogg
Binary file not shown.
Binary file added AudioDeviceSystem/AudioAssets/SFX_ChanSel.ogg
Binary file not shown.
15 changes: 15 additions & 0 deletions AudioDeviceSystem/AudioAssets/SFX_ChanSel.ogg.import
@@ -0,0 +1,15 @@
[remap]

importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/SFX_ChanSel.ogg-d998444e8de18f01e63dee5664fb0feb.oggstr"

[deps]

source_file="res://AudioDeviceSystem/AudioAssets/SFX_ChanSel.ogg"
dest_files=[ "res://.import/SFX_ChanSel.ogg-d998444e8de18f01e63dee5664fb0feb.oggstr" ]

[params]

loop=false
loop_offset=0
Binary file added AudioDeviceSystem/AudioAssets/SFX_Glitch_01.ogg
Binary file not shown.
15 changes: 15 additions & 0 deletions AudioDeviceSystem/AudioAssets/SFX_Glitch_01.ogg.import
@@ -0,0 +1,15 @@
[remap]

importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/SFX_Glitch_01.ogg-80b29f85422d35f2cfdf281aa42627d2.oggstr"

[deps]

source_file="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_01.ogg"
dest_files=[ "res://.import/SFX_Glitch_01.ogg-80b29f85422d35f2cfdf281aa42627d2.oggstr" ]

[params]

loop=false
loop_offset=0
Binary file added AudioDeviceSystem/AudioAssets/SFX_Glitch_02.ogg
Binary file not shown.
15 changes: 15 additions & 0 deletions AudioDeviceSystem/AudioAssets/SFX_Glitch_02.ogg.import
@@ -0,0 +1,15 @@
[remap]

importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/SFX_Glitch_02.ogg-2fcc58c5c931c69835edb9556dc10114.oggstr"

[deps]

source_file="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_02.ogg"
dest_files=[ "res://.import/SFX_Glitch_02.ogg-2fcc58c5c931c69835edb9556dc10114.oggstr" ]

[params]

loop=false
loop_offset=0
Binary file added AudioDeviceSystem/AudioAssets/SFX_Glitch_03.ogg
Binary file not shown.
15 changes: 15 additions & 0 deletions AudioDeviceSystem/AudioAssets/SFX_Glitch_03.ogg.import
@@ -0,0 +1,15 @@
[remap]

importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/SFX_Glitch_03.ogg-2de1d7eca78c5bdf6ec40907a894e1a8.oggstr"

[deps]

source_file="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_03.ogg"
dest_files=[ "res://.import/SFX_Glitch_03.ogg-2de1d7eca78c5bdf6ec40907a894e1a8.oggstr" ]

[params]

loop=false
loop_offset=0
Binary file added AudioDeviceSystem/AudioAssets/SFX_Glitch_04.ogg
Binary file not shown.
15 changes: 15 additions & 0 deletions AudioDeviceSystem/AudioAssets/SFX_Glitch_04.ogg.import
@@ -0,0 +1,15 @@
[remap]

importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/SFX_Glitch_04.ogg-e5d7dce0264178ad24383d8cc56bb2d0.oggstr"

[deps]

source_file="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_04.ogg"
dest_files=[ "res://.import/SFX_Glitch_04.ogg-e5d7dce0264178ad24383d8cc56bb2d0.oggstr" ]

[params]

loop=false
loop_offset=0
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Knob.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_LedOn.ogg
Binary file not shown.
Binary file removed AudioDeviceSystem/AudioAssets/SFX_Print-old1.ogg
Binary file not shown.
15 changes: 0 additions & 15 deletions AudioDeviceSystem/AudioAssets/SFX_Print-old1.ogg.import

This file was deleted.

Binary file modified AudioDeviceSystem/AudioAssets/SFX_Print.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Rack_Close.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_Rack_Open.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_SendBtn_Down.ogg
Binary file not shown.
Binary file modified AudioDeviceSystem/AudioAssets/SFX_SendBtn_Up.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mg_reporter_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_borderClosed_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_childrenPoor_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_childrenWar_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_countryWar_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_familyHappy_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_familyHunger_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_familyPoor_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_motherCrying_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_peopleCafe_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_peopleErect_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_peopleHappy_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_periphery_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_prostitutes_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_suburb_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_topSecret_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_trafficJam_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_whiteHouse_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/mp_womenWorking_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/ms_elegantWoman_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/ms_fanClub_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/ms_playerEscort_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/ms_stadium_SFX.ogg
Binary file not shown.
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/ms_tennisFans_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/ms_tennisMatch_SFX.ogg
Binary file not shown.
Binary file modified Game_Modes/Imagine/Assets/AudioMaterial/ms_tennisPlayer_SFX.ogg
Binary file not shown.
48 changes: 44 additions & 4 deletions Interlude/Machinaria_Intro.tscn
@@ -1,9 +1,14 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=11 format=2]

[ext_resource path="res://Interlude/Interlude.tscn" type="PackedScene" id=1]
[ext_resource path="res://Machinaria_Intro.gd" type="Script" id=2]
[ext_resource path="res://Interlude/Assets/machinaria_1.png" type="Texture" id=3]
[ext_resource path="res://Interlude/Assets/machinaria_2.png" type="Texture" id=4]
[ext_resource path="res://AudioDeviceSystem/RandomDevice/RandomDevice.tscn" type="PackedScene" id=5]
[ext_resource path="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_01.ogg" type="AudioStream" id=6]
[ext_resource path="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_02.ogg" type="AudioStream" id=7]
[ext_resource path="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_03.ogg" type="AudioStream" id=8]
[ext_resource path="res://AudioDeviceSystem/AudioAssets/SFX_Glitch_04.ogg" type="AudioStream" id=9]

[sub_resource type="Animation" id=1]

Expand Down Expand Up @@ -35,8 +40,37 @@ tracks/1/keys = {
"update": 1,
"values": [ true, false, true, false, true, false, true, false, true, false, true, false, true ]
}
tracks/2/type = "method"
tracks/2/path = NodePath("SFX")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0.12, 0.21, 0.55, 0.59, 0.81, 2.04 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
"values": [ {
"args": [ ],
"method": ""
}, {
"args": [ ],
"method": ""
}, {
"args": [ ],
"method": "playsound"
}, {
"args": [ ],
"method": "playsound"
}, {
"args": [ ],
"method": "playsound"
}, {
"args": [ ],
"method": "playsound"
} ]
}

[node name="Machinaria_Intro" instance=ExtResource( 1 )]
[node name="Machinaria_Intro" index="0" instance=ExtResource( 1 )]

script = ExtResource( 2 )

Expand All @@ -50,18 +84,24 @@ visible = false

[node name="machinaria_1" type="Sprite" parent="." index="5"]

visible = false
position = Vector2( 1280, 720 )
texture = ExtResource( 3 )
_sections_unfolded = [ "Transform", "Visibility" ]

[node name="machinaria_2" type="Sprite" parent="." index="6"]

visible = false
position = Vector2( 1247.82, 719.968 )
texture = ExtResource( 4 )
_sections_unfolded = [ "Visibility" ]

[node name="logoAnim" type="AnimationPlayer" parent="." index="7"]
[node name="SFX" parent="." index="7" instance=ExtResource( 5 )]

Sounds = [ ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ) ]
minPitch = -4.0
maxPitch = 2.0

[node name="logoAnim" type="AnimationPlayer" parent="." index="8"]

root_node = NodePath("..")
autoplay = ""
Expand Down
2 changes: 1 addition & 1 deletion MiMo/Common/Button/Button.tscn
Expand Up @@ -29,7 +29,7 @@ script = ExtResource( 1 )
[node name="SFX" parent="." index="0" instance=ExtResource( 2 )]

Sounds = [ ExtResource( 3 ), ExtResource( 4 ) ]
Volume = -4.0
Volume = -7.0
minVolume = -2.0
maxVolume = 1.0
minPitch = -3.0
Expand Down
3 changes: 2 additions & 1 deletion MiMo/Common/Cartridge/Cartridge.tscn
Expand Up @@ -35,8 +35,9 @@ on_drag_texture = ExtResource( 2 )
[node name="SFX" parent="." index="1" instance=ExtResource( 4 )]

Sounds = [ ExtResource( 5 ), ExtResource( 6 ) ]
Volume = 1.0
Volume = -6.0
minVolume = -1.0
maxVolume = 1.0

[node name="Label" type="Label" parent="." index="2"]

Expand Down
1 change: 1 addition & 0 deletions MiMo/Common/Cassette/Cassette.tscn
Expand Up @@ -48,6 +48,7 @@ Sounds = [ ExtResource( 8 ) ]
[node name="SFX" parent="." index="5" instance=ExtResource( 6 )]

Sounds = [ ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ) ]
Volume = -6.0
minVolume = -1.0


4 changes: 2 additions & 2 deletions MiMo/Common/LCD_Segment/LCD_Segment_Large.tscn
Expand Up @@ -12,7 +12,7 @@ use_filter = false
font_data = ExtResource( 3 )
_sections_unfolded = [ "Font", "Settings" ]

[node name="BG1" type="Sprite" index="0"]
[node name="BG1" type="Sprite"]

texture = ExtResource( 1 )
centered = false
Expand All @@ -36,7 +36,7 @@ size_flags_horizontal = 1
size_flags_vertical = 4
custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0.360784, 0.768627, 0.886275, 1 )
text = "a"
text = " "
align = 1
valign = 1
uppercase = true
Expand Down
2 changes: 1 addition & 1 deletion MiMo/Common/LCD_Segment/LCD_Segment_Medium.tscn
Expand Up @@ -12,7 +12,7 @@ use_filter = false
font_data = ExtResource( 3 )
_sections_unfolded = [ "Font", "Settings" ]

[node name="BG1" type="Sprite" index="0"]
[node name="BG1" type="Sprite"]

texture = ExtResource( 1 )
centered = false
Expand Down
2 changes: 1 addition & 1 deletion MiMo/Common/LCD_Segment/LCD_Segment_Small.tscn
Expand Up @@ -12,7 +12,7 @@ use_filter = false
font_data = ExtResource( 3 )
_sections_unfolded = [ "Font", "Settings" ]

[node name="BG1" type="Sprite" index="0"]
[node name="BG1" type="Sprite"]

texture = ExtResource( 1 )
centered = false
Expand Down
2 changes: 2 additions & 0 deletions MiMo/Editor/Editor.tscn
Expand Up @@ -174,6 +174,7 @@ __meta__ = {

[node name="Area2D" type="Area2D" parent="Container" index="0"]

editor/display_folded = true
position = Vector2( 126.102, 116.799 )
input_pickable = true
gravity_vec = Vector2( 0, 1 )
Expand Down Expand Up @@ -233,6 +234,7 @@ texture = ExtResource( 16 )

[node name="Radio" type="Container" parent="." index="11"]

editor/display_folded = true
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
Expand Down
1 change: 1 addition & 0 deletions MiMo/Editor/Preview_Section/Preview_Section.gd
Expand Up @@ -19,6 +19,7 @@ func on_previous():
$Monitor/Channels.get_child(current_channel).previous()

func change_channel():
$SFX.playsound()
current_channel += 1
if current_channel >= total_channels:
current_channel = 0
Expand Down
10 changes: 8 additions & 2 deletions MiMo/Editor/Preview_Section/Preview_Section.tscn
@@ -1,4 +1,4 @@
[gd_scene load_steps=18 format=2]
[gd_scene load_steps=20 format=2]

[ext_resource path="res://MiMo/Editor/Preview_Section/Preview_Section.gd" type="Script" id=1]
[ext_resource path="res://MiMo/Common/Button/Button.tscn" type="PackedScene" id=2]
Expand All @@ -17,6 +17,8 @@
[ext_resource path="res://MiMo/Editor/Preview_Section/display_channel.gd" type="Script" id=15]
[ext_resource path="res://MiMo/Common/LCD_Segment/LCD_Segment_Small.tscn" type="PackedScene" id=16]
[ext_resource path="res://Assets/Fonts/VCR_24.tres" type="DynamicFont" id=17]
[ext_resource path="res://AudioDeviceSystem/RandomDevice/RandomDevice.tscn" type="PackedScene" id=18]
[ext_resource path="res://AudioDeviceSystem/AudioAssets/SFX_ChanSel.ogg" type="AudioStream" id=19]

[node name="Preview_Section" type="Container"]

Expand Down Expand Up @@ -106,7 +108,6 @@ title_name = "politics"

[node name="display_channel" type="Sprite" parent="." index="3"]

editor/display_folded = true
position = Vector2( 426.028, 968.291 )
texture = ExtResource( 14 )
script = ExtResource( 15 )
Expand Down Expand Up @@ -172,4 +173,9 @@ lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "custom_colors", "custom_constants", "custom_fonts" ]

[node name="SFX" parent="." index="5" instance=ExtResource( 18 )]

Sounds = [ ExtResource( 19 ) ]
Volume = -8.0


3 changes: 2 additions & 1 deletion MiMo/IO/Cartridge_Rack/Cartridge_Rack.tscn
Expand Up @@ -8,7 +8,7 @@
[ext_resource path="res://AudioDeviceSystem/AudioAssets/SFX_Rack_Open.ogg" type="AudioStream" id=6]
[ext_resource path="res://AudioDeviceSystem/AudioAssets/SFX_Rack_Close.ogg" type="AudioStream" id=7]

[node name="Cartridge_Rack" type="Container"]
[node name="Cartridge_Rack" type="Container" index="0"]

anchor_left = 0.0
anchor_top = 0.0
Expand Down Expand Up @@ -84,6 +84,7 @@ _sections_unfolded = [ "Offset" ]
[node name="doorSFX" parent="." index="5" instance=ExtResource( 5 )]

Sounds = [ ExtResource( 6 ), ExtResource( 7 ) ]
Volume = 2.0
minVolume = 2.0
maxVolume = -1.0
minPitch = -2.0
Expand Down
4 changes: 2 additions & 2 deletions MiMo/Info/Info.tscn
Expand Up @@ -11,7 +11,7 @@
[ext_resource path="res://Assets/Fonts/VCR_OSD_MONO_1.001.ttf" type="DynamicFontData" id=9]
[ext_resource path="res://MiMo/Info/Assets/good_morning@2x.png" type="Texture" id=10]

[sub_resource type="DynamicFont" id=2]
[sub_resource type="DynamicFont" id=1]

size = 32
use_mipmaps = false
Expand Down Expand Up @@ -144,7 +144,7 @@ mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
custom_fonts/font = SubResource( 2 )
custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0.777029, 0.498428, 0.917969, 1 )
text = "Good morning!"
align = 1
Expand Down
6 changes: 5 additions & 1 deletion MiMo/MiMo.tscn
Expand Up @@ -50,7 +50,7 @@ tracks/0/keys = {
offsets = PoolRealArray( 0, 0.25, 0.5, 0.75, 1 )
colors = PoolColorArray( 0.160784, 0.152941, 0.560784, 0.756902, 0.160784, 0.152941, 0.560784, 1, 0.160784, 0.152941, 0.560784, 1, 0.160784, 0.152941, 0.560784, 1, 0.160784, 0.152941, 0.560784, 0.745843 )

[node name="MiMo" type="Node2D" index="0"]
[node name="MiMo" type="Node2D"]

light_mask = 0
position = Vector2( 0, 3.1604 )
Expand Down Expand Up @@ -82,6 +82,10 @@ editor/display_folded = true
margin_left = 2112.0
margin_right = 2560.0

[node name="time_display" parent="Info" index="1"]

editor/display_folded = true

[node name="CanvasModulate" type="CanvasModulate" parent="." index="4"]

visible = false
Expand Down
14 changes: 2 additions & 12 deletions default_bus_layout.tres
@@ -1,4 +1,4 @@
[gd_resource type="AudioBusLayout" load_steps=7 format=2]
[gd_resource type="AudioBusLayout" load_steps=6 format=2]

[sub_resource type="AudioEffectLowPassFilter" id=1]

Expand Down Expand Up @@ -42,14 +42,6 @@ resonance = 0.5
gain = 1.0
db = 0

[sub_resource type="AudioEffectLimiter" id=6]

resource_name = "Limiter"
ceiling_db = -0.1
threshold_db = -1.0
soft_clip_db = 2.0
soft_clip_ratio = 10.0

[resource]

bus/0/name = "Master"
Expand All @@ -74,12 +66,10 @@ bus/2/name = "MTBus"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
bus/2/volume_db = -0.1
bus/2/volume_db = -3.8
bus/2/send = "Master"
bus/2/effect/0/effect = SubResource( 4 )
bus/2/effect/0/enabled = true
bus/2/effect/1/effect = SubResource( 5 )
bus/2/effect/1/enabled = true
bus/2/effect/2/effect = SubResource( 6 )
bus/2/effect/2/enabled = true

0 comments on commit 6d156f2

Please sign in to comment.