Merge main and remove free_queue when dying
This commit is contained in:
commit
05ff226721
28 changed files with 6228 additions and 10 deletions
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=15 format=3 uid="uid://durhes43gex7a"]
|
||||
[gd_scene load_steps=16 format=3 uid="uid://durhes43gex7a"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://c7bfiw54rvaq2" path="res://scenes/player_melodie.tscn" id="1_cl1wt"]
|
||||
[ext_resource type="Script" path="res://scenes/room.gd" id="1_jh83c"]
|
||||
|
@ -9,6 +9,7 @@
|
|||
[ext_resource type="Texture2D" uid="uid://dhva3tivsvknl" path="res://ressources/images/mur_coin.svg" id="4_6a3f6"]
|
||||
[ext_resource type="PackedScene" uid="uid://di4chlep1t1or" path="res://parametres/menu_parametres.tscn" id="6_6ubhx"]
|
||||
[ext_resource type="PackedScene" uid="uid://bndtclt51nsih" path="res://scenes/interface.tscn" id="8_5s7tf"]
|
||||
[ext_resource type="PackedScene" uid="uid://ctgxrbcg2vu1p" path="res://scenes/ecran_mort.tscn" id="10_3ou8w"]
|
||||
[ext_resource type="PackedScene" uid="uid://cm5spgl8o4fam" path="res://scenes/enemies/robot.tscn" id="10_5qrsc"]
|
||||
|
||||
[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"]
|
||||
|
@ -136,6 +137,12 @@ texture = ExtResource("4_6a3f6")
|
|||
[node name="Slime" parent="." groups=["Enemies"] instance=ExtResource("3_04ip2")]
|
||||
position = Vector2(-448, 205)
|
||||
|
||||
[node name="Interface" parent="." instance=ExtResource("8_5s7tf")]
|
||||
offset_left = -640.0
|
||||
offset_top = -360.0
|
||||
offset_right = -640.0
|
||||
offset_bottom = -360.0
|
||||
|
||||
[node name="Menu_parametres" parent="." instance=ExtResource("6_6ubhx")]
|
||||
process_mode = 3
|
||||
visible = false
|
||||
|
@ -144,13 +151,16 @@ offset_top = -360.0
|
|||
offset_right = 640.0
|
||||
offset_bottom = 360.0
|
||||
|
||||
[node name="Interface" parent="." instance=ExtResource("8_5s7tf")]
|
||||
offset_left = -640.0
|
||||
offset_top = -360.0
|
||||
offset_right = -640.0
|
||||
offset_bottom = -360.0
|
||||
[node name="Ecran mort" parent="." instance=ExtResource("10_3ou8w")]
|
||||
process_mode = 3
|
||||
visible = false
|
||||
offset_left = -258.0
|
||||
offset_top = -383.0
|
||||
offset_right = -258.0
|
||||
offset_bottom = -383.0
|
||||
|
||||
[node name="Robot" parent="." groups=["Enemies"] instance=ExtResource("10_5qrsc")]
|
||||
position = Vector2(-428, 11)
|
||||
|
||||
[connection signal="finished" from="Musique" to="." method="_on_audio_stream_player_finished"]
|
||||
[connection signal="retour_menu" from="Ecran mort" to="." method="_on_ecran_mort_retour_menu"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue