kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2025-10-21 19:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Major] Finished product development - Stage II

Browse Source
This commit is contained in:
Kristofers Solo 2021-11-02 17:06:49 +02:00
parent 688cf43dea
commit 2628ff5e70
18 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Game/project.godot
View File

@ -16,15 +16,14 @@ config/icon="res://icon.png"
[autoload]
Network="*res://source/assets/scripts/server-handlers/network_processors/network.gd"
Global="*res://source/assets/scripts/server-handlers/global.gd"
Network="*res://source/assets/scripts/server_handlers/network_processors/network.gd"
Global="*res://source/assets/scripts/server_handlers/global.gd"
PersistentNodes="*res://source/scenes/OVERLAY/elements/persistent_nodes.tscn"
[display]
window/size/width=1920
window/size/height=1080
window/size/resizable=false
window/size/test_width=1024
window/size/test_height=600
window/stretch/mode="2d"

5
Game/source/assets/scripts/player_handlers/player_body_handler.gd
View File

@ -6,7 +6,6 @@ var username_text_instance = null
puppet var puppet_position = Vector2(0, 0) setget puppet_position_set
puppet var puppet_velocity = Vector2()
puppet var puppet_rotaion = 0
puppet var puppet_username = "" setget puppet_username_set
onready var tween = $Tween
@ -115,7 +114,7 @@ func _process(delta: float) -> void:
process_rotation()
func _physics_process(delta):
func _physics_process(delta) -> void:
if get_tree().has_network_peer():
if is_network_master():
if "0" in VDIR:
@ -203,7 +202,7 @@ func _on_network_tick_rate_timeout():
if is_network_master():
rset_unreliable("puppet_position", global_position)
#rset_unreliable("puppet_velocity", movementVector)
#rset_unreliable("puppet_rotation", rotation_degrees)
rset_unreliable("puppet_rotation", rotation_degrees)
sync func update_position(pos):

0
Game/source/assets/scripts/server-handlers/global.gd → Game/source/assets/scripts/server_handlers/global.gd
View File

0
Game/source/assets/scripts/server-handlers/network_processors/network.gd → Game/source/assets/scripts/server_handlers/network_processors/network.gd
View File

0
Game/source/assets/scripts/server-handlers/network_processors/network_setup.gd → Game/source/assets/scripts/server_handlers/network_processors/network_setup.gd
View File

0
Game/source/assets/scripts/server-handlers/server_processors/server_advertiser.gd → Game/source/assets/scripts/server_handlers/server_processors/server_advertiser.gd
View File

0
Game/source/assets/scripts/server-handlers/server_processors/server_browser.gd → Game/source/assets/scripts/server_handlers/server_processors/server_browser.gd
View File

0
Game/source/assets/scripts/server-handlers/server_processors/server_display.gd → Game/source/assets/scripts/server_handlers/server_processors/server_display.gd
View File

0
Game/source/assets/scripts/server-handlers/server_processors/server_listener.gd → Game/source/assets/scripts/server_handlers/server_processors/server_listener.gd
View File

0
Game/source/assets/scripts/server-handlers/trinity_site_level.gd → Game/source/assets/scripts/server_handlers/trinity_site_level.gd
View File

4
Game/source/entities/player/player_node.tscn
View File

@ -49,3 +49,7 @@ texture = ExtResource( 5 )
[node name="Tween" type="Tween" parent="."]
[node name="network_tick_rate" type="Timer" parent="."]
wait_time = 0.03
autostart = true
[connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"]

10
Game/source/levels/trinity_site/trinity_site_level.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://source/assets/scripts/server-handlers/trinity_site_level.gd" type="Script" id=1]
[ext_resource path="res://source/assets/scripts/server_handlers/trinity_site_level.gd" type="Script" id=1]
[ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=2]
[ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout-monochrome.png" type="Texture" id=3]
@ -27,16 +27,16 @@ polygon = PoolVector2Array( 411.392, 250.341, 409.273, 253.255, 403.446, 255.638
[node name="spawn_locations" type="Node" parent="."]
[node name="1" type="Position2D" parent="spawn_locations"]
position = Vector2( 395.113, 723.483 )
position = Vector2( 385.599, 826.944 )
[node name="2" type="Position2D" parent="spawn_locations"]
position = Vector2( 962.095, 904.443 )
position = Vector2( 963.877, 884.843 )
[node name="3" type="Position2D" parent="spawn_locations"]
position = Vector2( 1780.68, 680.768 )
position = Vector2( 1770.68, 678.768 )
[node name="4" type="Position2D" parent="spawn_locations"]
position = Vector2( 946.144, 307.022 )
position = Vector2( 969.307, 315.931 )
[node name="UI" type="CanvasLayer" parent="."]
script = ExtResource( 2 )

14
Game/source/scenes/GUI/main_menu.tscn
View File

@ -1,13 +1,13 @@
[gd_scene load_steps=7 format=2]
[ext_resource path="res://source/fonts/roboto/roboto.tres" type="DynamicFont" id=1]
[ext_resource path="res://source/assets/scripts/server-handlers/network_processors/network_setup.gd" type="Script" id=2]
[ext_resource path="res://source/assets/scripts/server_handlers/network_processors/network_setup.gd" type="Script" id=2]
[ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=3]
[ext_resource path="res://source/floor.tscn" type="PackedScene" id=4]
[ext_resource path="res://font/Roboto-Regular.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://source/fonts/roboto/Roboto-Regular.ttf" type="DynamicFontData" id=5]
[sub_resource type="DynamicFont" id=1]
size = 64
size = 32
use_mipmaps = true
use_filter = true
font_data = ExtResource( 5 )
@ -88,10 +88,10 @@ __meta__ = {
}
[node name="device_ip_address" type="Label" parent="UI"]
anchor_top = 1.0
anchor_left = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = -150.0
margin_left = -256.0
margin_bottom = 64.0
custom_fonts/font = SubResource( 1 )
align = 1
valign = 1
@ -100,7 +100,7 @@ __meta__ = {
}
[node name="floor" parent="." instance=ExtResource( 4 )]
position = Vector2( 1048.45, 986.437 )
position = Vector2( 960, 1104 )
scale = Vector2( 2, 1 )
[connection signal="pressed" from="multiplayer_configure/create_server" to="." method="_on_create_server_pressed"]

2
Game/source/scenes/GUI/server_handlers/server_advertiser.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://source/assets/scripts/server-handlers/server_processors/server_advertiser.gd" type="Script" id=1]
[ext_resource path="res://source/assets/scripts/server_handlers/server_processors/server_advertiser.gd" type="Script" id=1]
[node name="server_advertiser" type="Node"]
script = ExtResource( 1 )

2
Game/source/scenes/GUI/server_handlers/server_browser.tscn
View File

@ -2,7 +2,7 @@
[ext_resource path="res://source/fonts/roboto/roboto.tres" type="DynamicFont" id=1]
[ext_resource path="res://source/scenes/GUI/server_handlers/server_listener.tscn" type="PackedScene" id=2]
[ext_resource path="res://source/assets/scripts/server-handlers/server_processors/server_browser.gd" type="Script" id=3]
[ext_resource path="res://source/assets/scripts/server_handlers/server_processors/server_browser.gd" type="Script" id=3]
[sub_resource type="Animation" id=1]
resource_name = "searching_for_servers"

2
Game/source/scenes/GUI/server_handlers/server_display.tscn
View File

@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://source/fonts/roboto/roboto.tres" type="DynamicFont" id=1]
[ext_resource path="res://source/assets/scripts/server-handlers/server_processors/server_display.gd" type="Script" id=2]
[ext_resource path="res://source/assets/scripts/server_handlers/server_processors/server_display.gd" type="Script" id=2]
[node name="server_display" type="Label"]
anchor_right = 1.0

2
Game/source/scenes/GUI/server_handlers/server_listener.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://source/assets/scripts/server-handlers/server_processors/server_listener.gd" type="Script" id=1]
[ext_resource path="res://source/assets/scripts/server_handlers/server_processors/server_listener.gd" type="Script" id=1]
[node name="server_listener" type="Node"]
script = ExtResource( 1 )

1
kristofers/game/code/player.gd
View File

@ -15,7 +15,6 @@ var username_text_instance = null
puppet var puppet_position = Vector2(0, 0) setget puppet_position_set
puppet var puppet_velocity = Vector2()
puppet var puppet_rotaion = 0
puppet var puppet_username = "" setget puppet_username_set
onready var tween = $Tween