forked from unfa/liblast
Fixed player capsule sizes. Commited some updated resuorce and scene files.
parent
cbf16c9968
commit
51ba264ee4
|
@ -16,23 +16,49 @@ dock_hsplit_4=0
|
||||||
|
|
||||||
[EditorNode]
|
[EditorNode]
|
||||||
|
|
||||||
open_scenes=[ "res://Main.tscn" ]
|
open_scenes=["res://Main.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn"]
|
||||||
|
|
||||||
[ScriptEditor]
|
[ScriptEditor]
|
||||||
|
|
||||||
open_scripts=[ {
|
open_scripts=[{
|
||||||
"path": "res://Player.gd",
|
"path": "res://Main.gd",
|
||||||
"state": {
|
"state": {
|
||||||
"bookmarks": [ ],
|
"bookmarks": [],
|
||||||
"breakpoints": [ ],
|
"breakpoints": [],
|
||||||
"column": 12,
|
"column": 19,
|
||||||
"folded_lines": PackedInt32Array( ),
|
"folded_lines": [],
|
||||||
"h_scroll_position": 0,
|
"h_scroll_position": 0,
|
||||||
"row": 15,
|
"row": 76,
|
||||||
"scroll_position": 0.0,
|
"scroll_position": 66.0,
|
||||||
"selection": false,
|
"selection": false,
|
||||||
"syntax_highlighter": "GDScript"
|
"syntax_highlighter": "GDScript"
|
||||||
}
|
}
|
||||||
} ]
|
}, {
|
||||||
open_help=[ ]
|
"path": "res://Assets/Characters/Player.gd",
|
||||||
|
"state": {
|
||||||
|
"bookmarks": [],
|
||||||
|
"breakpoints": [],
|
||||||
|
"column": 0,
|
||||||
|
"folded_lines": [],
|
||||||
|
"h_scroll_position": 0,
|
||||||
|
"row": 141,
|
||||||
|
"scroll_position": 141.0,
|
||||||
|
"selection": false,
|
||||||
|
"syntax_highlighter": "GDScript"
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
"path": "res://Assets/Weapons/Weapon.gd",
|
||||||
|
"state": {
|
||||||
|
"bookmarks": [],
|
||||||
|
"breakpoints": [],
|
||||||
|
"column": 32,
|
||||||
|
"folded_lines": [],
|
||||||
|
"h_scroll_position": 0,
|
||||||
|
"row": 76,
|
||||||
|
"scroll_position": 57.0,
|
||||||
|
"selection": false,
|
||||||
|
"syntax_highlighter": "GDScript"
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
open_help=["LightmapProbe"]
|
||||||
split_offset=39
|
split_offset=39
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
[gd_scene load_steps=7 format=2]
|
[gd_scene load_steps=7 format=3 uid="uid://cwuys43c7ak61"]
|
||||||
|
|
||||||
[ext_resource path="res://Assets/Characters/Player.gd" type="Script" id=1]
|
[ext_resource type="Script" path="res://Assets/Characters/Player.gd" id="1"]
|
||||||
[ext_resource path="res://Assets/Weapons/Weapon.tscn" type="PackedScene" id=3]
|
[ext_resource type="PackedScene" path="res://Assets/Weapons/Weapon.tscn" id="3"]
|
||||||
|
|
||||||
[sub_resource type="StandardMaterial3D" id=4]
|
[sub_resource type="StandardMaterial3D" id="4"]
|
||||||
albedo_color = Color(0.545098, 0.545098, 0.545098, 1)
|
albedo_color = Color(0.545098, 0.545098, 0.545098, 1)
|
||||||
roughness = 0.22
|
roughness = 0.22
|
||||||
rim_enabled = true
|
rim_enabled = true
|
||||||
|
@ -11,25 +11,25 @@ rim_tint = 0.0
|
||||||
proximity_fade_distance = 0.68
|
proximity_fade_distance = 0.68
|
||||||
distance_fade_max_distance = 0.4
|
distance_fade_max_distance = 0.4
|
||||||
|
|
||||||
[sub_resource type="CapsuleMesh" id=1]
|
[sub_resource type="CapsuleMesh" id="1"]
|
||||||
material = SubResource( 4 )
|
material = SubResource( "4" )
|
||||||
radius = 0.4
|
radius = 0.4
|
||||||
mid_height = 0.9
|
height = 1.7
|
||||||
|
|
||||||
[sub_resource type="CapsuleShape3D" id=2]
|
[sub_resource type="CapsuleShape3D" id="2"]
|
||||||
radius = 0.4
|
radius = 0.4
|
||||||
height = 0.9
|
height = 1.7
|
||||||
|
|
||||||
[sub_resource type="CylinderShape3D" id=3]
|
[sub_resource type="CylinderShape3D" id="3"]
|
||||||
radius = 0.25
|
radius = 0.25
|
||||||
height = 0.5
|
height = 0.5
|
||||||
|
|
||||||
[node name="Player" type="CharacterBody3D"]
|
[node name="Player" type="CharacterBody3D"]
|
||||||
script = ExtResource( 1 )
|
script = ExtResource( "1" )
|
||||||
|
|
||||||
[node name="Mesh" type="MeshInstance3D" parent="."]
|
[node name="Mesh" type="MeshInstance3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.852763, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.852763, 0)
|
||||||
mesh = SubResource( 1 )
|
mesh = SubResource( "1" )
|
||||||
surface_material_override/0 = null
|
surface_material_override/0 = null
|
||||||
script = null
|
script = null
|
||||||
|
|
||||||
|
@ -47,19 +47,19 @@ script = null
|
||||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.3, -0.4, -0.6)
|
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.3, -0.4, -0.6)
|
||||||
script = null
|
script = null
|
||||||
|
|
||||||
[node name="Weapon" parent="Head/Camera/Hand" instance=ExtResource( 3 )]
|
[node name="Weapon" parent="Head/Camera/Hand" instance=ExtResource( "3" )]
|
||||||
|
|
||||||
[node name="Tween" type="Node" parent="Head/Camera"]
|
[node name="Tween" type="Node" parent="Head/Camera"]
|
||||||
script = null
|
script = null
|
||||||
|
|
||||||
[node name="Body" type="CollisionShape3D" parent="."]
|
[node name="Body" type="CollisionShape3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.852763, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.852763, 0)
|
||||||
shape = SubResource( 2 )
|
shape = SubResource( "2" )
|
||||||
script = null
|
script = null
|
||||||
|
|
||||||
[node name="Feet" type="CollisionShape3D" parent="."]
|
[node name="Feet" type="CollisionShape3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.252763, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.252763, 0)
|
||||||
shape = SubResource( 3 )
|
shape = SubResource( "3" )
|
||||||
disabled = true
|
disabled = true
|
||||||
script = null
|
script = null
|
||||||
|
|
||||||
|
|
|
@ -1,28 +1,38 @@
|
||||||
[gd_resource type="Theme" load_steps=10 format=2]
|
[gd_resource type="Theme" load_steps=10 format=3 uid="uid://ddtu7o1dbp0s8"]
|
||||||
|
|
||||||
[ext_resource path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" type="FontData" id=1]
|
[ext_resource type="FontData" uid="uid://bvp75f670ewmh" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" id="1"]
|
||||||
[ext_resource path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" type="FontData" id=2]
|
[ext_resource type="FontData" uid="uid://bu513u0hckm6v" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" id="2"]
|
||||||
[ext_resource path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" type="FontData" id=3]
|
[ext_resource type="FontData" uid="uid://c1efeg0l6epya" path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" id="3"]
|
||||||
[ext_resource path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" type="FontData" id=4]
|
[ext_resource type="FontData" uid="uid://dm2ua4ixk71jw" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" id="4"]
|
||||||
|
|
||||||
[sub_resource type="Font" id=1]
|
[sub_resource type="Font" id="1"]
|
||||||
data/0 = ExtResource( 2 )
|
variation_coordinates = {
|
||||||
|
}
|
||||||
|
data/0 = ExtResource( "2" )
|
||||||
|
|
||||||
[sub_resource type="Font" id=2]
|
[sub_resource type="Font" id="2"]
|
||||||
data/0 = ExtResource( 1 )
|
variation_coordinates = {
|
||||||
|
}
|
||||||
|
data/0 = ExtResource( "1" )
|
||||||
|
|
||||||
[sub_resource type="Font" id=3]
|
[sub_resource type="Font" id="3"]
|
||||||
data/0 = ExtResource( 1 )
|
variation_coordinates = {
|
||||||
|
}
|
||||||
|
data/0 = ExtResource( "1" )
|
||||||
|
|
||||||
[sub_resource type="Font" id=4]
|
[sub_resource type="Font" id="4"]
|
||||||
data/0 = ExtResource( 3 )
|
variation_coordinates = {
|
||||||
|
}
|
||||||
|
data/0 = ExtResource( "3" )
|
||||||
|
|
||||||
[sub_resource type="Font" id=5]
|
[sub_resource type="Font" id="5"]
|
||||||
data/0 = ExtResource( 4 )
|
variation_coordinates = {
|
||||||
|
}
|
||||||
|
data/0 = ExtResource( "4" )
|
||||||
|
|
||||||
[resource]
|
[resource]
|
||||||
RichTextLabel/fonts/bold_font = SubResource( 1 )
|
RichTextLabel/fonts/bold_font = SubResource( "1" )
|
||||||
RichTextLabel/fonts/bold_italics_font = SubResource( 2 )
|
RichTextLabel/fonts/bold_italics_font = SubResource( "2" )
|
||||||
RichTextLabel/fonts/italics_font = SubResource( 3 )
|
RichTextLabel/fonts/italics_font = SubResource( "3" )
|
||||||
RichTextLabel/fonts/mono_font = SubResource( 4 )
|
RichTextLabel/fonts/mono_font = SubResource( "4" )
|
||||||
RichTextLabel/fonts/normal_font = SubResource( 5 )
|
RichTextLabel/fonts/normal_font = SubResource( "5" )
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[gd_scene load_steps=5 format=3 uid="uid://o68cawatyat2"]
|
[gd_scene load_steps=5 format=3 uid="uid://o68cawatyat2"]
|
||||||
|
|
||||||
[ext_resource type="PackedScene" path="res://Map.tscn" id="1"]
|
[ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1"]
|
||||||
[ext_resource type="PackedScene" path="res://Assets/UI/GUI.tscn" id="2"]
|
[ext_resource type="PackedScene" path="res://Assets/UI/GUI.tscn" id="2"]
|
||||||
[ext_resource type="Script" path="res://Main.gd" id="3"]
|
[ext_resource type="Script" path="res://Main.gd" id="3"]
|
||||||
[ext_resource type="PackedScene" path="res://Assets/HUD/HUD.tscn" id="4"]
|
[ext_resource type="PackedScene" path="res://Assets/HUD/HUD.tscn" id="4"]
|
||||||
|
@ -89,6 +89,11 @@ __meta__ = {
|
||||||
"_edit_use_anchors_": false
|
"_edit_use_anchors_": false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[node name="LightmapProbe" type="LightmapProbe" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 17, 0)
|
||||||
|
visible = false
|
||||||
|
script = null
|
||||||
|
|
||||||
[connection signal="pressed" from="NetworkTesting/Host" to="." method="_on_Host_pressed"]
|
[connection signal="pressed" from="NetworkTesting/Host" to="." method="_on_Host_pressed"]
|
||||||
[connection signal="pressed" from="NetworkTesting/Connect" to="." method="_on_Connect_pressed"]
|
[connection signal="pressed" from="NetworkTesting/Connect" to="." method="_on_Connect_pressed"]
|
||||||
[connection signal="text_submitted" from="NetworkTesting/TextEdit" to="." method="_on_TextEdit_text_submitted"]
|
[connection signal="text_submitted" from="NetworkTesting/TextEdit" to="." method="_on_TextEdit_text_submitted"]
|
||||||
|
|
103
Game/Map.tscn
103
Game/Map.tscn
File diff suppressed because one or more lines are too long
|
@ -1,7 +1,7 @@
|
||||||
[gd_resource type="Environment" load_steps=2 format=2]
|
[gd_resource type="Environment" load_steps=2 format=3 uid="uid://dfa7tkbqp6ve8"]
|
||||||
|
|
||||||
[sub_resource type="Sky" id=1]
|
[sub_resource type="Sky" id="1"]
|
||||||
|
|
||||||
[resource]
|
[resource]
|
||||||
background_mode = 2
|
background_mode = 2
|
||||||
sky = SubResource( 1 )
|
sky = SubResource( "1" )
|
||||||
|
|
Loading…
Reference in New Issue