begin network

This commit is contained in:
2024-08-16 19:00:45 +02:00
parent 65e2a0b3ce
commit 3769fd3ace
18 changed files with 305 additions and 77 deletions

View File

@@ -3750,15 +3750,6 @@ skin = SubResource("Skin_l3wpu")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.908729, 0)
shape = SubResource("CapsuleShape3D_mm42w")
[node name="SpringArmPivot" type="SpringArmPivot" parent="."]
[node name="SpringArm3D" type="SpringArm3D" parent="SpringArmPivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.31667, 0)
spring_length = 2.0
margin = 0.2
[node name="Camera3D" type="Camera3D" parent="SpringArmPivot/SpringArm3D"]
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
root_node = NodePath("../Mesh")
libraries = {

View File

@@ -4,7 +4,7 @@
[ext_resource type="Texture2D" path="res://Assets/Textures/Black.png" id="2_fkwcn"]
[ext_resource type="Texture2D" path="res://Assets/Textures/Orange.png" id="3_ux02w"]
[ext_resource type="Texture2D" path="res://Assets/Textures/Green.png" id="4_wp15n"]
[ext_resource type="PackedScene" uid="uid://d38w4ae3qj0k4" path="res://Scenes/Characters/first_person_player.tscn" id="5_8ctht"]
[ext_resource type="PackedScene" path="res://Scenes/Characters/first_person_player.tscn" id="5_8ctht"]
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_6c4vd"]
panorama = ExtResource("1_mnexj")
@@ -51,7 +51,7 @@ uv1_triplanar = true
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_rit6o"]
data = PackedVector3Array(-12.5, 2.5, 2.5, 2.5, -2.5, 2.5, -2.5, -2.5, 2.5, -12.5, 2.5, -2.5, -2.5, -2.5, -2.5, 2.5, -2.5, -2.5, -12.5, 2.5, 2.5, -12.5, 2.5, -2.5, 2.5, -2.5, 2.5, -12.5, 2.5, -2.5, 2.5, -2.5, -2.5, 2.5, -2.5, 2.5, -12.5, 2.5, -2.5, -12.5, 2.5, 2.5, -2.5, -2.5, -2.5, -12.5, 2.5, 2.5, -2.5, -2.5, 2.5, -2.5, -2.5, -2.5, -2.5, -2.5, 2.5, 2.5, -2.5, 2.5, -2.5, -2.5, -2.5, 2.5, -2.5, 2.5, 2.5, -2.5, -2.5, -2.5, -2.5, -2.5)
[node name="World" type="Node3D"]
[node name="World" type="World"]
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_ctwiv")

View File

@@ -1,6 +1,8 @@
[gd_scene format=3 uid="uid://bqfqg7xwwlxd8"]
[gd_scene load_steps=2 format=3 uid="uid://bqfqg7xwwlxd8"]
[node name="Main Menu" type="MainMenu"]
[ext_resource type="PackedScene" path="res://Scenes/Network/networking.tscn" id="1_vrong"]
[node name="MainMenu" type="MainMenu"]
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
@@ -39,3 +41,5 @@ text = "Create Game"
layout_mode = 2
theme_override_font_sizes/font_size = 35
text = "Quit"
[node name="Lobby" parent="." instance=ExtResource("1_vrong")]

View File

@@ -0,0 +1,3 @@
[gd_scene format=3 uid="uid://clafls1xhludi"]
[node name="Lobby" type="Lobby"]

15
godot/Scenes/main.tscn Normal file
View File

@@ -0,0 +1,15 @@
[gd_scene load_steps=3 format=3 uid="uid://4jt0v2b2l4rt"]
[ext_resource type="PackedScene" path="res://Scenes/Network/networking.tscn" id="1_06ibn"]
[ext_resource type="PackedScene" path="res://Scenes/Menus/mainmenu.tscn" id="2_lavg1"]
[node name="Main" type="Main"]
[node name="Lobby" parent="." instance=ExtResource("1_06ibn")]
[node name="MainMenu" parent="." instance=ExtResource("2_lavg1")]
[connection signal="local_player_connected" from="Lobby" to="MainMenu" method="on_connected"]
[connection signal="change_scene" from="MainMenu" to="." method="change_scene"]
[connection signal="create_game" from="MainMenu" to="Lobby" method="create_game"]
[connection signal="join_game" from="MainMenu" to="Lobby" method="join_game"]

View File

@@ -11,7 +11,7 @@ config_version=5
[application]
config/name="Blitz3"
run/main_scene="res://Scenes/Levels/world.tscn"
run/main_scene="res://Scenes/main.tscn"
config/features=PackedStringArray("4.2", "Forward Plus")
config/icon="res://icon.svg"