merge conf fix

Amanda/medieval_tavern_props_pack/props.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://dydt8t6an07tt"]
 
-[ext_resource type="PackedScene" uid="uid://caeps7026h7y7" path="res://Amanda/medieval_tavern_props_pack/medieval_tavern_props_pack.blend" id="1_mma1v"]
+[ext_resource type="PackedScene" uid="uid://2b0d5l2nlgf3" path="res://Amanda/medieval_tavern_props_pack/medieval_tavern_props_pack.blend" id="1_mma1v"]
 
 [node name="props" instance=ExtResource("1_mma1v")]
 

Florian/Map/Oktoberfest.tscn

@@ -1,34 +1,36 @@
-[gd_scene load_steps=59 format=4 uid="uid://by5cq6m32hbor"]
+[gd_scene load_steps=61 format=4 uid="uid://by5cq6m32hbor"]
 
-[ext_resource type="Script" path="res://Florian/Map/oktoberfest.gd" id="1_20xaa"]
+[ext_resource type="Script" uid="uid://bhh76i4a51brf" path="res://Florian/Map/oktoberfest.gd" id="1_20xaa"]
-[ext_resource type="Texture2D" uid="uid://8lntiwf30qqc" path="res://Amanda/medieval_tavern_props_pack/textures/tex_chair_wood.png" id="1_kmmfq"]
+[ext_resource type="Texture2D" uid="uid://siyny4elk634" path="res://Amanda/medieval_tavern_props_pack/textures/tex_chair_wood.png" id="1_kmmfq"]
 [ext_resource type="PackedScene" uid="uid://crrco762ow56c" path="res://Florian/Player/PlayerRigidbody.tscn" id="2_82wr0"]
-[ext_resource type="Texture2D" uid="uid://d0jmvu4qbxn54" path="res://Amanda/medieval_tavern_props_pack/textures/tex_barrel.png" id="2_o3vbn"]
+[ext_resource type="Texture2D" uid="uid://dotcifqbq8dp2" path="res://Amanda/medieval_tavern_props_pack/textures/tex_barrel.png" id="2_o3vbn"]
-[ext_resource type="Texture2D" uid="uid://b55s7kfqvm4we" path="res://Amanda/medieval_tavern_props_pack/textures/tex_table_wood_round.png" id="3_6t3lb"]
+[ext_resource type="Texture2D" uid="uid://ch3nggq0gb5jf" path="res://Amanda/medieval_tavern_props_pack/textures/tex_table_wood_round.png" id="3_6t3lb"]
 [ext_resource type="PackedScene" uid="uid://bobfhgsydmmr2" path="res://Florian/pyro.tscn" id="4_h8052"]
 [ext_resource type="PackedScene" uid="uid://byhsp6ujjsh8m" path="res://Florian/Entity/interactable.tscn" id="5_ygtpi"]
-[ext_resource type="Script" uid="uid://ddwcbl3nbt6j4" path="res://Florian/Map/lights.gd" id="6_g561u"]
+[ext_resource type="Script" path="res://Florian/Map/lights.gd" id="6_g561u"]
 [ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="6_miqpv"]
 [ext_resource type="PackedScene" uid="uid://bk4djtjemu7we" path="res://Florian/Entity/People/guitar.tscn" id="6_ptxqs"]
 [ext_resource type="PackedScene" uid="uid://c5552lenumx2j" path="res://Florian/Entity/People/saxophone.tscn" id="7_miqpv"]
 [ext_resource type="PackedScene" uid="uid://bybsn53hd1mge" path="res://Florian/Entity/People/guys.tscn" id="9_3box6"]
 [ext_resource type="PackedScene" uid="uid://bw73kprk7ptvn" path="res://Florian/PointsLogic/PictureSpot.tscn" id="10_28ddj"]
-[ext_resource type="Script" uid="uid://cu3fdbo1lelob" path="res://Florian/Map/dancing_people.gd" id="10_mbtuy"]
+[ext_resource type="Script" path="res://Florian/Map/dancing_people.gd" id="10_mbtuy"]
 [ext_resource type="PackedScene" uid="uid://k3ij7wrtwpms" path="res://Florian/table_0.tscn" id="10_ubr03"]
-[ext_resource type="PackedScene" uid="uid://oxm6ufgip22u" path="res://Florian/Props/tent.tscn" id="11_4etk5"]
+[ext_resource type="PackedScene" uid="uid://m3sk1ustdixv" path="res://Florian/Props/tent.tscn" id="11_4etk5"]
 [ext_resource type="Texture2D" uid="uid://cx783frd814e6" path="res://Florian/Decals/power.png" id="11_bsfgy"]
 [ext_resource type="PackedScene" uid="uid://lrf6ltd1wwg1" path="res://Florian/Entity/People/waitress_path.tscn" id="12_g561u"]
 [ext_resource type="PackedScene" uid="uid://ctcspqlxrw22q" path="res://Florian/PhysicsProps/PhysicsBarrel.tscn" id="13_ijkca"]
-[ext_resource type="Texture2D" uid="uid://b668hlnork7jt" path="res://Florian/Textures/bush.jpg" id="14_70e5e"]
+[ext_resource type="Texture2D" uid="uid://oej528bt551q" path="res://Florian/Textures/bush.jpg" id="14_70e5e"]
-[ext_resource type="Texture2D" uid="uid://bjqu1o6hbbmrf" path="res://Amanda/medieval_tavern_props_pack/textures/tex_fireplace_2.png" id="17_sdh5o"]
+[ext_resource type="Texture2D" uid="uid://cssu4gijvm0t3" path="res://Amanda/medieval_tavern_props_pack/textures/tex_fireplace_2.png" id="17_sdh5o"]
 [ext_resource type="PackedScene" uid="uid://ow35tpunk744" path="res://Florian/PhysicsProps/physics_beer.tscn" id="18_3uiso"]
 [ext_resource type="Texture2D" uid="uid://bmgydj38uhwoe" path="res://Amanda/skybox/Skydome_0.png" id="19_20xaa"]
 [ext_resource type="PackedScene" uid="uid://bxruw32nq7qfw" path="res://Florian/Props/beer_stand.tscn" id="19_d5eeg"]
 [ext_resource type="PackedScene" uid="uid://v86q0i25q2dj" path="res://Florian/PhysicsProps/DrunkFollow.tscn" id="20_20xaa"]
-[ext_resource type="AudioStream" uid="uid://bf4mxj37o7bh2" path="res://Florian/Audio/oktoberfestambience.mp3.ogg" id="21_mmnkp"]
+[ext_resource type="AudioStream" uid="uid://b36jr8py078ma" path="res://Florian/Audio/oktoberfestambience.mp3.ogg" id="21_mmnkp"]
 [ext_resource type="PackedScene" uid="uid://b85ujwx0p8gvn" path="res://Florian/Props/door.tscn" id="22_bv6bj"]
 [ext_resource type="PackedScene" uid="uid://c4fw8rjct7vms" path="res://Florian/Entity/People/accor.tscn" id="23_0a0yf"]
 [ext_resource type="Script" uid="uid://btok1rqmtms4o" path="res://Florian/Map/accor_animation.gd" id="24_ho8ja"]
+[ext_resource type="PackedScene" uid="uid://dl42xs7anteub" path="res://Nikita/finish_screen.tscn" id="30_s3xcw"]
+[ext_resource type="PackedScene" uid="uid://ci05g3ilu86xl" path="res://Nikita/pause_menu.tscn" id="31_fese6"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3uiso"]
 albedo_texture = ExtResource("1_kmmfq")
@@ -1248,6 +1250,10 @@ material = SubResource("StandardMaterial3D_tre0f")
 
 [node name="Node3D3" type="Node3D" parent="."]
 
+[node name="FinishScreen" parent="." instance=ExtResource("30_s3xcw")]
+
+[node name="PauseMenu" parent="." instance=ExtResource("31_fese6")]
+
 [connection signal="interact" from="Stage/Interactable" to="Stage/Pyro" method="_turn_on_off"]
 [connection signal="interact" from="Stage/Interactable" to="Stage/Pyro2" method="_turn_on_off"]
 [connection signal="interact" from="Stage/Interactable" to="Stage/Pyro3" method="_turn_on_off"]

Florian/Map/chinese_ny.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=65 format=3 uid="uid://b2rihishxk0on"]
+[gd_scene load_steps=64 format=3 uid="uid://b2rihishxk0on"]
 
 [ext_resource type="PackedScene" uid="uid://4qygsglmdow6" path="res://Amanda/temple_gate/source/01door.FBX.fbx" id="1_dr64d"]
 [ext_resource type="Texture2D" uid="uid://bnrri5m5k1c1a" path="res://Amanda/grass.png" id="2_r0dy2"]
@@ -12,14 +12,13 @@
 [ext_resource type="Texture2D" uid="uid://by4qtiie7iop" path="res://Amanda/SandyDry_S.jpg" id="9_8kkm8"]
 [ext_resource type="Texture2D" uid="uid://c2teei5qadpf5" path="res://Amanda/Sprite assets/girl_c.png" id="10_64lnl"]
 [ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="10_qqwfx"]
-[ext_resource type="Texture2D" uid="uid://bphnmyd2oiua0" path="res://Amanda/skybox/satara_night_no_lamps_2k.exr" id="13_3f12g"]
 [ext_resource type="PackedScene" uid="uid://osrimuaocr1t" path="res://Amanda/tree/scene.gltf" id="13_cx38t"]
 [ext_resource type="Texture2D" uid="uid://cb1dwblmnwxcs" path="res://Amanda/Sprite assets/Untitled_Artwork-1 17.png" id="14_s4atm"]
 [ext_resource type="Texture2D" uid="uid://ciiwxhviiq2vy" path="res://Florian/Props/clothgrown.jpg" id="15_bowqk"]
 [ext_resource type="Texture2D" uid="uid://dvat0w2k6bb78" path="res://Amanda/Sprite assets/Untitled_Artwork-1 18.png" id="15_hp67e"]
 [ext_resource type="Script" uid="uid://bgolfgrq66diw" path="res://npc_path_follower.gd" id="17_3f12g"]
 [ext_resource type="PackedScene" uid="uid://dggx2w2c8xojc" path="res://Florian/PhysicsProps/firework.tscn" id="19_qqao8"]
-[ext_resource type="AudioStream" uid="uid://yuv8dxd17p6s" path="res://Florian/Audio/chineseAmbientMusicGame.ogg" id="20_72n5s"]
+[ext_resource type="AudioStream" uid="uid://dqomxq6g33eod" path="res://Florian/Audio/chineseAmbientMusicGame.ogg" id="20_72n5s"]
 [ext_resource type="Script" uid="uid://b7m4mddm1165v" path="res://Florian/Map/firework_spawn_locations.gd" id="21_yd64k"]
 [ext_resource type="PackedScene" uid="uid://iky4i2bjknty" path="res://Florian/Props/gong.tscn" id="22_ppss2"]
 [ext_resource type="PackedScene" uid="uid://byhsp6ujjsh8m" path="res://Florian/Entity/interactable.tscn" id="23_4rmvb"]
@@ -200,7 +199,6 @@ animations = [{
 }]
 
 [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_3f12g"]
-panorama = ExtResource("13_3f12g")
 
 [sub_resource type="Sky" id="Sky_qqao8"]
 sky_material = SubResource("PanoramaSkyMaterial_3f12g")

project.godot

@@ -57,3 +57,12 @@ interact={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
 ]
 }
+pause={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+
+[rendering]
+
+renderer/rendering_method="gl_compatibility"