diff --git a/Amanda/furni/tent/barrel.blend.import b/Amanda/furni/tent/barrel.blend.import index fb5bee3..784bbc2 100644 --- a/Amanda/furni/tent/barrel.blend.import +++ b/Amanda/furni/tent/barrel.blend.import @@ -4,11 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://ddnwvcwa6drqi" -valid=false +path="res://.godot/imported/barrel.blend-d55ef0f77e7a5f2e77ecca4be941021a.scn" [deps] source_file="res://Amanda/furni/tent/barrel.blend" +dest_files=["res://.godot/imported/barrel.blend-d55ef0f77e7a5f2e77ecca4be941021a.scn"] [params] diff --git a/Amanda/furni/tent/tent.blend.import b/Amanda/furni/tent/tent.blend.import index b5976e4..f771f9b 100644 --- a/Amanda/furni/tent/tent.blend.import +++ b/Amanda/furni/tent/tent.blend.import @@ -4,11 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://ptwannnym6kc" -valid=false +path="res://.godot/imported/tent.blend-c2e4a2ad0442aa1c9be7f4044876a350.scn" [deps] source_file="res://Amanda/furni/tent/tent.blend" +dest_files=["res://.godot/imported/tent.blend-c2e4a2ad0442aa1c9be7f4044876a350.scn"] [params] diff --git a/Amanda/skybox/Skydome_0.png b/Amanda/skybox/Skydome_0.png new file mode 100644 index 0000000..81d9d5d Binary files /dev/null and b/Amanda/skybox/Skydome_0.png differ diff --git a/Florian/Map/Oktoberfest.tscn b/Florian/Map/Oktoberfest.tscn index cc04075..2b2f87e 100644 --- a/Florian/Map/Oktoberfest.tscn +++ b/Florian/Map/Oktoberfest.tscn @@ -1,23 +1,25 @@ -[gd_scene load_steps=27 format=3 uid="uid://by5cq6m32hbor"] +[gd_scene load_steps=29 format=3 uid="uid://by5cq6m32hbor"] [ext_resource type="Texture2D" uid="uid://dv401srtwuvtg" path="res://icon.svg" id="1_6v0xc"] +[ext_resource type="Script" uid="uid://bhh76i4a51brf" path="res://Florian/Map/oktoberfest.gd" id="1_20xaa"] [ext_resource type="Texture2D" uid="uid://cd1v04y3nf1dv" path="res://Amanda/furni/Images/table_diffuse.jpg" id="1_tre0f"] [ext_resource type="PackedScene" uid="uid://crrco762ow56c" path="res://Florian/Player/PlayerRigidbody.tscn" id="2_82wr0"] [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="PackedScene" uid="uid://ow35tpunk744" path="res://Florian/PhysicsProps/physics_beer.tscn" id="18_3uiso"] +[ext_resource type="PackedScene" uid="uid://ci05g3ilu86xl" path="res://Nikita/pause_menu.tscn" id="20_mmnkp"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_g561u"] albedo_texture = ExtResource("1_tre0f") @@ -48,6 +50,7 @@ point_count = 4 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tre0f"] [node name="Oktoberfest" type="Node3D"] +script = ExtResource("1_20xaa") [node name="Floor" type="MeshInstance3D" parent="."] material_override = SubResource("StandardMaterial3D_g561u") @@ -385,6 +388,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) [node name="Node3D2" type="Node3D" parent="."] +[node name="PauseMenu" parent="." instance=ExtResource("20_mmnkp")] + [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"] diff --git a/Florian/Map/oktoberfest.gd b/Florian/Map/oktoberfest.gd new file mode 100644 index 0000000..3050cb6 --- /dev/null +++ b/Florian/Map/oktoberfest.gd @@ -0,0 +1,30 @@ +extends Node3D + +var paused = false +var main_scene : PackedScene + +func _ready() -> void: + $PauseMenu.hide() + $PauseMenu.resume.connect(_on_resume_button_pressed) + $PauseMenu.main_menu.connect(_on_menu_button_pressed) + main_scene = load("res://Nikita/hub_scene.tscn") + +func _process(delta: float) -> void: + if Input.is_action_just_pressed("pause"): + pause_menu() + +func pause_menu(): + if paused: + $PauseMenu.hide() + Engine.time_scale = 1 + else: + $PauseMenu.show() + Engine.time_scale = 0 + paused = !paused + +func _on_resume_button_pressed(): + pause_menu() + +func _on_menu_button_pressed(): + pause_menu() + get_tree().change_scene_to_packed(main_scene) diff --git a/Florian/Map/oktoberfest.gd.uid b/Florian/Map/oktoberfest.gd.uid new file mode 100644 index 0000000..f1bacf5 --- /dev/null +++ b/Florian/Map/oktoberfest.gd.uid @@ -0,0 +1 @@ +uid://bhh76i4a51brf diff --git a/Nikita/balloonfest.tscn b/Nikita/balloonfest.tscn new file mode 100644 index 0000000..c9a84b0 --- /dev/null +++ b/Nikita/balloonfest.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=9 format=3 uid="uid://cge0bfktyd7ka"] + +[ext_resource type="Texture2D" uid="uid://c8bo7u0yr3cfj" path="res://Nikita/textures/golden_gate_hills_1k.png" id="1_dcn22"] +[ext_resource type="PackedScene" uid="uid://c6sjs2nhsigfv" path="res://Nikita/source/ballons.glb" id="1_fqyqv"] +[ext_resource type="Script" uid="uid://csuiro5uqp8m7" path="res://Nikita/scripts/balloonfest.gd" id="1_ojto3"] +[ext_resource type="PackedScene" uid="uid://crrco762ow56c" path="res://Florian/Player/PlayerRigidbody.tscn" id="2_akthd"] +[ext_resource type="PackedScene" uid="uid://ci05g3ilu86xl" path="res://Nikita/pause_menu.tscn" id="4_eb1mq"] + +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_eb1mq"] +panorama = ExtResource("1_dcn22") + +[sub_resource type="Sky" id="Sky_ojto3"] +sky_material = SubResource("PanoramaSkyMaterial_eb1mq") + +[sub_resource type="Environment" id="Environment_akthd"] +background_mode = 2 +sky = SubResource("Sky_ojto3") + +[node name="Balloonfest" type="Node3D"] +script = ExtResource("1_ojto3") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 34.0624, 0) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_akthd") + +[node name="terrain" parent="." instance=ExtResource("1_fqyqv")] +transform = Transform3D(50, 0, 0, 0, 50, 0, 0, 0, 50, -4.9729, 0, 0.821295) + +[node name="PlayerRigidbody" parent="." instance=ExtResource("2_akthd")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.3581, 1.08998, -30.0003) + +[node name="PauseMenu" parent="." instance=ExtResource("4_eb1mq")] diff --git a/Nikita/earth.tscn b/Nikita/earth.tscn index 0457eab..ec2bee3 100644 --- a/Nikita/earth.tscn +++ b/Nikita/earth.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=9 format=3 uid="uid://cjlojmoyhw2cp"] +[gd_scene load_steps=10 format=3 uid="uid://cjlojmoyhw2cp"] [ext_resource type="PackedScene" uid="uid://7fijqcjxggit" path="res://Nikita/source/Earth_Final.fbx" id="1_mnd7v"] [ext_resource type="Texture2D" uid="uid://cw4gkryn2sl7y" path="res://Nikita/textures/Earth2_Water_BaseColor.png" id="2_v2ft5"] [ext_resource type="Texture2D" uid="uid://da0uksbt2mkqw" path="res://Nikita/textures/Earth2_Land_BaseColor.png" id="3_drefq"] [ext_resource type="PackedScene" uid="uid://ccjwh4alvryho" path="res://Nikita/waypoint.tscn" id="4_drefq"] [ext_resource type="PackedScene" uid="uid://by5cq6m32hbor" path="res://Florian/Map/Oktoberfest.tscn" id="5_tyl1s"] +[ext_resource type="PackedScene" uid="uid://cge0bfktyd7ka" path="res://Nikita/balloonfest.tscn" id="6_3pxso"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tyl1s"] albedo_texture = ExtResource("2_v2ft5") @@ -40,3 +41,5 @@ transform = Transform3D(-4.37114e-10, 0, -0.01, 0, 0.01, 0, 0.01, 0, -4.37114e-1 [node name="WaypointBal" parent="." index="3" instance=ExtResource("4_drefq")] transform = Transform3D(-4.37114e-10, 0, 0.01, 0, 0.01, 0, -0.01, 0, -4.37114e-10, -0.0725918, 0.0486524, -0.0129466) +scene_name = "Balloon Festival" +switch_to = ExtResource("6_3pxso") diff --git a/Nikita/hub_scene.tscn b/Nikita/hub_scene.tscn index 63405de..9fc28a0 100644 --- a/Nikita/hub_scene.tscn +++ b/Nikita/hub_scene.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=7 format=3 uid="uid://b6kb866y3e4aa"] +[gd_scene load_steps=9 format=3 uid="uid://b6kb866y3e4aa"] [ext_resource type="PackedScene" uid="uid://cjlojmoyhw2cp" path="res://Nikita/earth.tscn" id="1_248vy"] +[ext_resource type="Script" uid="uid://br8pxakwsn4m1" path="res://Nikita/scripts/hub_scene.gd" id="1_fkqbs"] [ext_resource type="Texture2D" uid="uid://cn2wdmm2xiodm" path="res://Nikita/textures/panorama_image.png" id="2_vvf8p"] [ext_resource type="PackedScene" uid="uid://tvwwstaorixw" path="res://Nikita/camera_hub.tscn" id="3_ur8lc"] +[ext_resource type="PackedScene" uid="uid://ci05g3ilu86xl" path="res://Nikita/pause_menu.tscn" id="5_0puvs"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_ur8lc"] panorama = ExtResource("2_vvf8p") @@ -15,6 +17,7 @@ background_mode = 2 sky = SubResource("Sky_fkqbs") [node name="Hub" type="Node3D"] +script = ExtResource("1_fkqbs") [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_ur8lc") @@ -27,3 +30,5 @@ transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.0327197, -0.325403, -0.945009, 0.0112599, -0.945575, 0.325209, -0.999401, 1.5123e-09, 0.034603, -30.3869, 3.61956, 0) + +[node name="PauseMenu" parent="." instance=ExtResource("5_0puvs")] diff --git a/Nikita/pause_menu.tscn b/Nikita/pause_menu.tscn new file mode 100644 index 0000000..0601645 --- /dev/null +++ b/Nikita/pause_menu.tscn @@ -0,0 +1,45 @@ +[gd_scene load_steps=2 format=3 uid="uid://ci05g3ilu86xl"] + +[ext_resource type="Script" uid="uid://dpbldsvv2uovr" path="res://Nikita/scripts/pause_menu.gd" id="1_jsawv"] + +[node name="PauseMenu" type="Control"] +layout_mode = 3 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1_jsawv") + +[node name="MarginContainer" type="MarginContainer" parent="."] +layout_mode = 1 +anchors_preset = -1 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -35.0 +offset_top = -50.5 +offset_right = 35.0 +offset_bottom = 50.5 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] +layout_mode = 2 + +[node name="Resume" type="Button" parent="MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "Resume" + +[node name="MainMenu" type="Button" parent="MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "Menu" + +[node name="Quit" type="Button" parent="MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "Quit" + +[connection signal="pressed" from="MarginContainer/VBoxContainer/Resume" to="." method="_on_resume_pressed"] +[connection signal="pressed" from="MarginContainer/VBoxContainer/MainMenu" to="." method="_on_main_menu_pressed"] +[connection signal="pressed" from="MarginContainer/VBoxContainer/Quit" to="." method="_on_quit_pressed"] diff --git a/Nikita/scripts/balloonfest.gd b/Nikita/scripts/balloonfest.gd new file mode 100644 index 0000000..3050cb6 --- /dev/null +++ b/Nikita/scripts/balloonfest.gd @@ -0,0 +1,30 @@ +extends Node3D + +var paused = false +var main_scene : PackedScene + +func _ready() -> void: + $PauseMenu.hide() + $PauseMenu.resume.connect(_on_resume_button_pressed) + $PauseMenu.main_menu.connect(_on_menu_button_pressed) + main_scene = load("res://Nikita/hub_scene.tscn") + +func _process(delta: float) -> void: + if Input.is_action_just_pressed("pause"): + pause_menu() + +func pause_menu(): + if paused: + $PauseMenu.hide() + Engine.time_scale = 1 + else: + $PauseMenu.show() + Engine.time_scale = 0 + paused = !paused + +func _on_resume_button_pressed(): + pause_menu() + +func _on_menu_button_pressed(): + pause_menu() + get_tree().change_scene_to_packed(main_scene) diff --git a/Nikita/scripts/balloonfest.gd.uid b/Nikita/scripts/balloonfest.gd.uid new file mode 100644 index 0000000..4bfe2c1 --- /dev/null +++ b/Nikita/scripts/balloonfest.gd.uid @@ -0,0 +1 @@ +uid://csuiro5uqp8m7 diff --git a/Nikita/scripts/hub_scene.gd b/Nikita/scripts/hub_scene.gd new file mode 100644 index 0000000..d683e2d --- /dev/null +++ b/Nikita/scripts/hub_scene.gd @@ -0,0 +1,28 @@ +extends Node3D + +var paused = false +var main_scene : PackedScene + +func _ready() -> void: + $PauseMenu.hide() + $PauseMenu.resume.connect(_on_resume_button_pressed) + $PauseMenu.main_menu.connect(_on_menu_button_pressed) + +func _process(delta: float) -> void: + if Input.is_action_just_pressed("pause"): + pause_menu() + +func pause_menu(): + if paused: + $PauseMenu.hide() + Engine.time_scale = 1 + else: + $PauseMenu.show() + Engine.time_scale = 0 + paused = !paused + +func _on_resume_button_pressed(): + pause_menu() + +func _on_menu_button_pressed(): + pause_menu() diff --git a/Nikita/scripts/hub_scene.gd.uid b/Nikita/scripts/hub_scene.gd.uid new file mode 100644 index 0000000..6e5da72 --- /dev/null +++ b/Nikita/scripts/hub_scene.gd.uid @@ -0,0 +1 @@ +uid://br8pxakwsn4m1 diff --git a/Nikita/scripts/pause_menu.gd b/Nikita/scripts/pause_menu.gd new file mode 100644 index 0000000..db8aebb --- /dev/null +++ b/Nikita/scripts/pause_menu.gd @@ -0,0 +1,15 @@ +extends Control + +signal resume +signal main_menu + +func _on_resume_pressed() -> void: + emit_signal("resume") + + +func _on_main_menu_pressed() -> void: + emit_signal("main_menu") + + +func _on_quit_pressed() -> void: + get_tree().quit() diff --git a/Nikita/scripts/pause_menu.gd.uid b/Nikita/scripts/pause_menu.gd.uid new file mode 100644 index 0000000..6a7b36d --- /dev/null +++ b/Nikita/scripts/pause_menu.gd.uid @@ -0,0 +1 @@ +uid://dpbldsvv2uovr diff --git a/Nikita/source/ballons.glb b/Nikita/source/ballons.glb new file mode 100644 index 0000000..7e181a6 Binary files /dev/null and b/Nikita/source/ballons.glb differ diff --git a/Nikita/textures/golden_gate_hills_1k.exr b/Nikita/textures/golden_gate_hills_1k.exr new file mode 100644 index 0000000..1575113 Binary files /dev/null and b/Nikita/textures/golden_gate_hills_1k.exr differ diff --git a/Nikita/textures/golden_gate_hills_1k.png b/Nikita/textures/golden_gate_hills_1k.png new file mode 100644 index 0000000..8b4584d Binary files /dev/null and b/Nikita/textures/golden_gate_hills_1k.png differ diff --git a/project.godot b/project.godot index 03c73e7..f4d08f9 100644 --- a/project.godot +++ b/project.godot @@ -20,6 +20,10 @@ config/icon="res://icon.svg" PictureTakeablesArray="*res://picture_takeables_array.gd" PathfindingArray="*res://pathfinding_array.gd" +[dotnet] + +project/assembly_name="AllAroundTheWorld" + [input] forward={ @@ -57,6 +61,11 @@ 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]