Merge de branche Nils et Zac
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
[ext_resource type="Script" uid="uid://2p5d6vogtn82" path="res://common/audio_manager/scripts/audio_manager.gd" id="1_0tvca"]
|
||||
[ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg" id="2_tuvql"]
|
||||
[ext_resource type="AudioStream" uid="uid://b1hut6lc1jevh" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg" id="4_2fduo"]
|
||||
[ext_resource type="AudioStream" uid="uid://dftxjfdqgsbd3" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg" id="4_tuvql"]
|
||||
[ext_resource type="AudioStream" uid="uid://6yx6txbgc6pt" path="res://common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg" id="5_8204s"]
|
||||
[ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg" id="5_ajci6"]
|
||||
[ext_resource type="AudioStream" uid="uid://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="6_6o1yh"]
|
||||
@@ -20,12 +19,10 @@
|
||||
[ext_resource type="AudioStream" uid="uid://8nmr5vifkt1f" path="res://common/audio_manager/assets/sfx/harvest/harvest_1.wav" id="13_xoaox"]
|
||||
[ext_resource type="AudioStream" uid="uid://dgkdcq4j6fe3o" path="res://common/audio_manager/assets/sfx/harvest/harvest_2.wav" id="14_b5bgj"]
|
||||
[ext_resource type="AudioStream" uid="uid://crncg0mdx1fdw" path="res://common/audio_manager/assets/morceaux/demo/ending.ogg" id="14_h3tkm"]
|
||||
[ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://common/audio_manager/assets/sfx/dig/dig_3.wav" id="15_rlnfe"]
|
||||
[ext_resource type="AudioStream" uid="uid://eh3dbuxu5qtw" path="res://common/audio_manager/assets/sfx/harvest/harvest_3.wav" id="15_ynvb4"]
|
||||
[ext_resource type="AudioStream" uid="uid://bown4yipeef8l" path="res://common/audio_manager/assets/sfx/harvest/harvest_4.wav" id="16_obeji"]
|
||||
[ext_resource type="AudioStream" uid="uid://delq7gsdeqjq2" path="res://common/audio_manager/assets/sfx/respawn/respawn.wav" id="16_xmumj"]
|
||||
[ext_resource type="AudioStream" uid="uid://cbo4ld2yypmte" path="res://common/audio_manager/assets/sfx/harvest/harvest_5.wav" id="17_6w0re"]
|
||||
[ext_resource type="AudioStream" uid="uid://bdxkvaciw4mb3" path="res://common/audio_manager/assets/sfx/dig/dig_2.wav" id="17_bfg8q"]
|
||||
[ext_resource type="AudioStream" uid="uid://da3srn8vx4erd" path="res://common/audio_manager/assets/sfx/vending_machine/item-drop.wav" id="18_ehr7m"]
|
||||
[ext_resource type="AudioStream" uid="uid://cs4y6sinpth8e" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_1.wav" id="18_j8acj"]
|
||||
[ext_resource type="AudioStream" uid="uid://c5nfoa6v3r5f7" path="res://common/audio_manager/assets/sfx/harvest/harvest_6.wav" id="18_o4guq"]
|
||||
@@ -33,7 +30,7 @@
|
||||
[ext_resource type="AudioStream" uid="uid://bbhkivgarlhqm" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_2.wav" id="19_yjs51"]
|
||||
[ext_resource type="AudioStream" uid="uid://ccfubsk6135qy" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_3.wav" id="20_4ojdh"]
|
||||
[ext_resource type="AudioStream" uid="uid://bjind1iji0gt7" path="res://common/audio_manager/assets/sfx/pick_up/pick_up_1.wav" id="20_pu6t4"]
|
||||
[ext_resource type="AudioStream" uid="uid://ds4rc2k28kgqx" path="res://common/audio_manager/assets/sfx/door/door_opening.wav" id="20_yr73o"]
|
||||
[ext_resource type="AudioStream" uid="uid://br0jqajrqvgie" path="res://common/audio_manager/assets/sfx/door/door_opening.wav" id="20_yr73o"]
|
||||
[ext_resource type="AudioStream" uid="uid://cqa0gvgpoa7pd" path="res://common/audio_manager/assets/sfx/pick_up/pick_up_2.wav" id="21_dk5s6"]
|
||||
[ext_resource type="AudioStream" uid="uid://cbm4r5bf7py11" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_4.wav" id="21_ehr7m"]
|
||||
[ext_resource type="AudioStream" uid="uid://dq5qwydrca3vy" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_5.wav" id="22_aedoe"]
|
||||
@@ -65,9 +62,17 @@
|
||||
[ext_resource type="AudioStream" uid="uid://cv5avkd3qekt7" path="res://common/audio_manager/assets/sfx/movement/movement.wav" id="51_iyxkn"]
|
||||
[ext_resource type="AudioStream" uid="uid://53ixfbcd5qwu" path="res://common/audio_manager/assets/sfx/holo/holo_appear.wav" id="63_aedoe"]
|
||||
[ext_resource type="AudioStream" uid="uid://dsijqgnnadgem" path="res://common/audio_manager/assets/sfx/holo/holo_disappear.wav" id="64_ge2sc"]
|
||||
[ext_resource type="AudioStream" uid="uid://c7ehk3l4q3qg1" path="res://common/audio_manager/assets/sfx/vending_machine/VM_item_drop.wav" id="62_yr73o"]
|
||||
[ext_resource type="AudioStream" uid="uid://dgs7j7itgedoy" path="res://common/audio_manager/assets/sfx/vending_machine/VM_power_off.wav" id="63_lwdce"]
|
||||
[ext_resource type="AudioStream" uid="uid://cij7rpji5tutr" path="res://common/audio_manager/assets/sfx/vending_machine/VM_power_on.wav" id="64_qvjf5"]
|
||||
|
||||
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_6o1yh"]
|
||||
streams_count = 3
|
||||
|
||||
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_kfbah"]
|
||||
random_pitch = 1.2599211
|
||||
streams_count = 4
|
||||
stream_0/stream = ExtResource("43_kbm55")
|
||||
stream_1/stream = ExtResource("44_rb87w")
|
||||
stream_2/stream = ExtResource("45_mur2l")
|
||||
stream_3/stream = ExtResource("46_t0v4u")
|
||||
|
||||
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_1w04j"]
|
||||
random_pitch = 1.2
|
||||
@@ -117,6 +122,12 @@ script = ExtResource("1_0tvca")
|
||||
[node name="Ambiances" type="Node" parent="." unique_id=1989991562]
|
||||
unique_name_in_owner = true
|
||||
|
||||
[node name="BaseRelais" type="AudioStreamPlayer" parent="Ambiances" unique_id=1895636918]
|
||||
stream = ExtResource("7_ge2sc")
|
||||
|
||||
[node name="VendingRoom" type="AudioStreamPlayer" parent="Ambiances" unique_id=1478190718]
|
||||
stream = ExtResource("7_ge2sc")
|
||||
|
||||
[node name="Exterior" type="AudioStreamPlayer" parent="Ambiances" unique_id=1405716780]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("2_tuvql")
|
||||
@@ -137,12 +148,13 @@ stream = ExtResource("7_spekb")
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("8_tuvql")
|
||||
|
||||
[node name="Vending_room_base_relais" type="AudioStreamPlayer" parent="Ambiances" unique_id=1544089647]
|
||||
stream = ExtResource("7_ge2sc")
|
||||
|
||||
[node name="Musics" type="Node" parent="." unique_id=1450527710]
|
||||
unique_name_in_owner = true
|
||||
|
||||
[node name="RegionDesertPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=1222638526]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("11_yjs51")
|
||||
|
||||
[node name="RegionForestPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=1029114070]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("6_6o1yh")
|
||||
@@ -159,9 +171,6 @@ stream = ExtResource("5_ajci6")
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("4_2fduo")
|
||||
|
||||
[node name="RegionDesertPhase1" type="AudioStreamPlayer" parent="Musics" unique_id=2003475958]
|
||||
stream = ExtResource("11_yjs51")
|
||||
|
||||
[node name="RegionForestLoop" type="AudioStreamPlayer" parent="Musics" unique_id=482654512]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("12_xmumj")
|
||||
@@ -221,6 +230,9 @@ stream = ExtResource("23_ge2sc")
|
||||
[node name="Recharge7" type="AudioStreamPlayer" parent="Sfx" unique_id=355754872]
|
||||
stream = ExtResource("24_yr73o")
|
||||
|
||||
[node name="Rocks" type="AudioStreamPlayer" parent="Sfx" unique_id=1012908521]
|
||||
stream = SubResource("AudioStreamRandomizer_kfbah")
|
||||
|
||||
[node name="Respawn" type="AudioStreamPlayer" parent="Sfx" unique_id=1902559716]
|
||||
stream = ExtResource("16_xmumj")
|
||||
|
||||
@@ -295,18 +307,3 @@ volume_db = -6.0
|
||||
[node name="HoloDisappear" type="AudioStreamPlayer" parent="Sfx" unique_id=1756615928]
|
||||
stream = ExtResource("64_ge2sc")
|
||||
volume_db = -6.0
|
||||
|
||||
[node name="Teleportation" type="AudioStreamPlayer" parent="Sfx" unique_id=369599456]
|
||||
stream = ExtResource("50_rlnfe")
|
||||
volume_db = -3.0
|
||||
|
||||
[node name="Door_opening" type="AudioStreamPlayer" parent="Sfx" unique_id=1045862259]
|
||||
|
||||
[node name="VM_drop" type="AudioStreamPlayer" parent="Sfx" unique_id=1831741123]
|
||||
stream = ExtResource("62_yr73o")
|
||||
|
||||
[node name="VM_power_off" type="AudioStreamPlayer" parent="Sfx" unique_id=2112201239]
|
||||
stream = ExtResource("63_lwdce")
|
||||
|
||||
[node name="VM_power_on" type="AudioStreamPlayer" parent="Sfx" unique_id=617324673]
|
||||
stream = ExtResource("64_qvjf5")
|
||||
|
||||
Reference in New Issue
Block a user