Compare commits

..

No commits in common. "aaee834a61ea91ea369682a5264f1c824557dc61" and "c7283297ab5a6d3cea432d2209622e6e25451c29" have entirely different histories.

8 changed files with 15 additions and 44 deletions

View File

@ -1,8 +1,6 @@
extends Node3D extends StaticBody3D
func grounded(src: Player): func grounded(src: Player):
src._is_grounded = true src._is_grounded = true

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=14 format=3 uid="uid://b00brfkibo5cj"] [gd_scene load_steps=13 format=3 uid="uid://b00brfkibo5cj"]
[ext_resource type="PackedScene" uid="uid://bq654gwim6col" path="res://level/level.glb" id="1_s37in"] [ext_resource type="PackedScene" uid="uid://bq654gwim6col" path="res://level/level.glb" id="1_s37in"]
[ext_resource type="Environment" uid="uid://covjrwmk4rplw" path="res://level/world_environment.tres" id="2_ptkl6"] [ext_resource type="Environment" uid="uid://covjrwmk4rplw" path="res://level/world_environment.tres" id="2_ptkl6"]
@ -6,7 +6,6 @@
[ext_resource type="Script" path="res://addons/smoother/smoother.gd" id="5_2tyle"] [ext_resource type="Script" path="res://addons/smoother/smoother.gd" id="5_2tyle"]
[ext_resource type="Script" path="res://level/PlayerSpawner.gd" id="6_7ww0m"] [ext_resource type="Script" path="res://level/PlayerSpawner.gd" id="6_7ww0m"]
[ext_resource type="MeshLibrary" uid="uid://cgh6y5j8wgi36" path="res://level/mesh_library/level_mesh_library.glb" id="6_d34iv"] [ext_resource type="MeshLibrary" uid="uid://cgh6y5j8wgi36" path="res://level/mesh_library/level_mesh_library.glb" id="6_d34iv"]
[ext_resource type="Script" path="res://level/Ground.gd" id="8_yu1ir"]
[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_ujmev"] [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_ujmev"]
margin = 2.067 margin = 2.067
@ -21,7 +20,8 @@ size = Vector2(100, 100)
[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_285vp"] [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_285vp"]
[sub_resource type="BoxShape3D" id="BoxShape3D_0y3ka"] [sub_resource type="BoxShape3D" id="BoxShape3D_kefm0"]
size = Vector3(6.87, 1, 1)
[node name="level" instance=ExtResource("1_s37in")] [node name="level" instance=ExtResource("1_s37in")]
script = ExtResource("2_s1bx6") script = ExtResource("2_s1bx6")
@ -95,7 +95,13 @@ shape = SubResource("BoxShape3D_m3lo5")
[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="." index="9"] [node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="." index="9"]
replication_config = SubResource("SceneReplicationConfig_285vp") replication_config = SubResource("SceneReplicationConfig_285vp")
[node name="SharedUI" type="Control" parent="." index="10"] [node name="StaticBody3D" type="StaticBody3D" parent="." index="10"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"]
transform = Transform3D(1.5, 0, 0, 0, 3.2, 0, 0, 0, 10, 5.01694, 11.1202, -5.176)
shape = SubResource("BoxShape3D_kefm0")
[node name="SharedUI" type="Control" parent="." index="11"]
layout_mode = 3 layout_mode = 3
anchors_preset = 0 anchors_preset = 0
offset_right = 40.0 offset_right = 40.0
@ -107,12 +113,5 @@ layout_mode = 0
offset_right = 40.0 offset_right = 40.0
offset_bottom = 23.0 offset_bottom = 23.0
[node name="Ground" type="Area3D" parent="." index="11"]
transform = Transform3D(9, 0, 0, 0, 9, 0, 0, 0, 9, 4.85232, 7.93442, -4.42363)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Ground" index="0"]
shape = SubResource("BoxShape3D_0y3ka")
script = ExtResource("8_yu1ir")
[connection signal="despawned" from="PlayerSpawner" to="." method="client_remove_player"] [connection signal="despawned" from="PlayerSpawner" to="." method="client_remove_player"]
[connection signal="spawned" from="PlayerSpawner" to="." method="client_add_player"] [connection signal="spawned" from="PlayerSpawner" to="." method="client_add_player"]

View File

@ -33,7 +33,6 @@ signal check_grounded
func _ready(): func _ready():
if username == "": if username == "":
username = "Player " + name username = "Player " + name
$Sphere.set_instance_shader_parameter("color", Color.DARK_ORANGE)
func is_on_ground() -> bool: func is_on_ground() -> bool:
_is_grounded = false _is_grounded = false

View File

@ -29,13 +29,6 @@ animation/fps=30
animation/trimming=false animation/trimming=false
animation/remove_immutable_tracks=true animation/remove_immutable_tracks=true
import_script/path="" import_script/path=""
_subresources={ _subresources={}
"materials": {
"skin": {
"use_external/enabled": true,
"use_external/path": "res://player/player_color.tres"
}
}
}
gltf/naming_version=1 gltf/naming_version=1
gltf/embedded_image_handling=1 gltf/embedded_image_handling=1

View File

@ -1,8 +0,0 @@
shader_type spatial;
instance uniform vec3 color : source_color;
void fragment() {
ALBEDO = color;
// Called for every pixel the material is visible on.
}

View File

@ -1,7 +0,0 @@
[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://k5oba64lxvnw"]
[ext_resource type="Shader" path="res://player/player_color.gdshader" id="1_mfu2j"]
[resource]
render_priority = 0
shader = ExtResource("1_mfu2j")

View File

@ -41,10 +41,6 @@ FmodManager="*res://addons/fmod/FmodManager.gd"
enabled=PackedStringArray("res://addons/fmod/plugin.cfg", "res://addons/godot_gltf2meshlib-6391ec247cc04f5fe89243b24fad68bc2ed2a96b/addons/gltf2meshlib/plugin.cfg") enabled=PackedStringArray("res://addons/fmod/plugin.cfg", "res://addons/godot_gltf2meshlib-6391ec247cc04f5fe89243b24fad68bc2ed2a96b/addons/gltf2meshlib/plugin.cfg")
[filesystem]
import/fbx/enabled=false
[input] [input]
move_left={ move_left={

View File

@ -1,3 +1,4 @@
Two types of servers / clients Two types of servers / clients
server.gd and client_lobbies.gd handle lobby management One for lobby management and one for actual game
and lobby.gd and client.gd handle the actual game server.gd and client_lobbies.gd handle the former
and lobby.gd and client.gd handle the latter