null/promiscuity
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branches 'main' and 'main' of https://git.ranaze.com/null/promiscuity
Deploy Promiscuity Auth API / deploy (push) Successful in 46s
Details
Deploy Promiscuity Character API / deploy (push) Successful in 45s
Details
Deploy Promiscuity Inventory API / deploy (push) Successful in 45s
Details
Deploy Promiscuity Locations API / deploy (push) Successful in 45s
Details
k8s smoke test / test (push) Successful in 8s
Details

Browse Source 
# Conflicts:
#	game/scenes/Levels/level.tscn
This commit is contained in:
deifiedexile
2026-03-19 11:36:58 -05:00
parent b5c7c7c8b6 9ba725d207
commit 932f7be66b
235 changed files with 6906 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/scenes/Levels/level.tscn
+7
View File
@@ -10,6 +10,8 @@
[ext_resource type="PackedScene" uid="uid://bnqaqbgynoyys" path="res://assets/models/TestCharAnimated.glb" id="5_fi66n"]
[ext_resource type="Script" uid="uid://bk53njt7i3kmv" path="res://scenes/Interaction/dialog_trigger_area.gd" id="6_dialog"]
[ext_resource type="Script" uid="uid://cshtdpjp4xy2f" path="res://scenes/Quests/quest_trigger_area.gd" id="7_qtrigger"]
[ext_resource type="PackedScene" path="res://scenes/Interaction/prototype_gateway.tscn" id="8_teleporter"]
[ext_resource type="Material" path="res://assets/materials/kenney_prototype_ground_green.tres" id="9_ground_mat"]
[ext_resource type="Shader" uid="uid://bi3o8elbtqoni" path="res://addons/simplegrasstextured/shaders/grass.gdshader" id="9_43ksg"]
[ext_resource type="Texture2D" uid="uid://c4ggdp0kg5wjk" path="res://addons/simplegrasstextured/textures/grassbushcc008.png" id="10_loupo"]
[ext_resource type="Script" uid="uid://2juaclm8gc1n" path="res://addons/simplegrasstextured/grass.gd" id="11_1meta"]
@@ -276,6 +278,7 @@ height = 6.0
size = Vector3(1080, 2, 1080)
[sub_resource type="BoxMesh" id="BoxMesh_w7c3h"]
material = ExtResource("9_ground_mat")
size = Vector3(1080, 2, 1080)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_i35yb"]
@@ -564,6 +567,10 @@ scroll_active = false
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_a4mo8")
[node name="LevelExitTeleporter" parent="." instance=ExtResource("8_teleporter")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 0, 0)
target_scene_path = "res://scenes/Levels/transportation_level.tscn"
[connection signal="pressed" from="Menu/Control/VBoxContainer/ContinueButton" to="Menu" method="_on_continue_button_pressed"]
[connection signal="pressed" from="Menu/Control/VBoxContainer/MainMenuButton" to="Menu" method="_on_main_menu_button_pressed"]
[connection signal="pressed" from="Menu/Control/VBoxContainer/QuitButton" to="Menu" method="_on_quit_button_pressed"]