From 62829b9aeaa1355392228469ec0af4e828c5ce42 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Mon, 8 Nov 2021 13:22:07 +0200 Subject: [PATCH] Added direction and weapon sync --- Game/project.godot | 34 +++++++--------- .../player_handlers/player_body_handler.gd | 40 ++++++++++++++----- .../scripts/player_handlers/weapon_handler.gd | 35 ---------------- .../scripts/ui_element_handlers/game_UI.gd | 2 +- .../scripts/ui_element_handlers/main_menu.gd | 3 +- Game/source/entities/player/player_node.tscn | 37 +++++++---------- Game/source/entities/player/shoot_point.gd | 5 --- .../trinity_site/trinity_site_level.tscn | 2 +- Game/source/scenes/GUI/main_menu.tscn | 8 ++-- Game/source/scenes/GUI/network_setup.tscn | 16 ++++---- .../OVERLAY/elements/username_text.tscn | 12 +++--- kristofers/test/Godot-Multiplayer-Shooter | 1 + kristofers/test/godot-demos | 1 + 13 files changed, 85 insertions(+), 111 deletions(-) delete mode 100644 Game/source/assets/scripts/player_handlers/weapon_handler.gd delete mode 100644 Game/source/entities/player/shoot_point.gd create mode 160000 kristofers/test/Godot-Multiplayer-Shooter create mode 160000 kristofers/test/godot-demos diff --git a/Game/project.godot b/Game/project.godot index f080cf2..243da71 100644 --- a/Game/project.godot +++ b/Game/project.godot @@ -20,10 +20,6 @@ Network="*res://source/assets/scripts/server_handlers/network_processors/network Global="*res://source/assets/scripts/server_handlers/global.gd" PersistentNodes="*res://source/scenes/OVERLAY/elements/persistent_nodes.tscn" -[debug] - -settings/stdout/print_fps=true - [display] window/size/width=1920 @@ -41,42 +37,42 @@ fps=false input_right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) ] } input_left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) ] } input_up={ "deadzone": 0.49, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) ] } input_down={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) ] } input_debug={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"unicode":0,"echo":false,"script":null) ] } input_enter={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) ] } input_shift={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) ] } input_shoot={ @@ -86,17 +82,17 @@ input_shoot={ } esc={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) ] } rotation_increase={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null) ] } rotation_decrease={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null) ] } diff --git a/Game/source/assets/scripts/player_handlers/player_body_handler.gd b/Game/source/assets/scripts/player_handlers/player_body_handler.gd index e7cf8c2..3596f21 100644 --- a/Game/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/Game/source/assets/scripts/player_handlers/player_body_handler.gd @@ -17,6 +17,12 @@ puppet var puppet_position = Vector2(0, 0) setget puppet_position_set puppet var puppet_velocity = Vector2() puppet var puppet_rotation = 0 puppet var puppet_username = "" setget puppet_username_set +puppet var puppet_weapon_position = Vector2() +puppet var puppet_weapon_angle = 0 +puppet var puppet_direction = "left" +puppet var puppet_theme = "01" +puppet var puppet_character_states = {} + onready var tween = $Tween onready var sprite = $player_sprite @@ -61,6 +67,7 @@ var weaponAngle = 0 func _ready(): weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-01".texture.get_width() * $"weaponHolder/Player-character-theme-gun-01".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-01".texture.get_height() * $"weaponHolder/Player-character-theme-gun-01".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) $"weaponHolder/Player-character-theme-gun-01".position = weaponPositionalOffset + get_tree().connect("network_peer_connected", self, "_network_peer_connected") username_text_instance = Global.instance_node_at_location(username_text, PersistentNodes, global_position) username_text_instance.player_following = self @@ -71,7 +78,9 @@ func _ready(): if get_tree().has_network_peer(): if is_network_master(): Global.player_master = self - + print($"weaponHolder/Player-character-theme-gun-01".position) + else: + print($"weaponHolder/Player-character-theme-gun-01".position) # Allow update process override. set_process(true) $player_animated_sprite.play("idle") @@ -146,7 +155,7 @@ func _process(delta: float) -> void: VDIR[v_t][v]["ray"]["collided"] = false update() process_rotation() - rotate_weapon() + func _physics_process(delta) -> void: if get_tree().has_network_peer(): @@ -217,15 +226,23 @@ func _physics_process(delta) -> void: - if Input.is_action_pressed("input_shoot") and can_shoot and not is_reloading: - rpc("instance_bullet", get_tree().get_network_unique_id()) - is_reloading = true - reload_timer.start() + #if Input.is_action_pressed("input_shoot") and can_shoot and not is_reloading: + # rpc("instance_bullet", get_tree().get_network_unique_id()) + # is_reloading = true + # reload_timer.start() + rotate_weapon() else: - rotation = lerp_angle(rotation, puppet_rotation, delta * 8) - + #rotation = lerp_angle(rotation, puppet_rotation, delta * 8) + $"weaponHolder/Player-character-theme-gun-01".position = puppet_weapon_position + weaponAngle = puppet_weapon_angle + direction = puppet_direction + + rotate_weapon() if not tween.is_active(): - move_and_slide(puppet_velocity * currentMovementSpeed) + pass + + + if hp <= 0: if get_tree().is_network_server(): rpc("destroy") @@ -295,6 +312,10 @@ func _on_network_tick_rate_timeout(): rset_unreliable("puppet_position", global_position) #rset_unreliable("puppet_velocity", movementVector) rset_unreliable("puppet_rotation", rotation) + rset_unreliable("puppet_weapon_position", weaponPosition) + rset_unreliable("puppet_weapon_angle", weaponAngle) + rset_unreliable("puppet_direction", direction) + rset_unreliable("puppet_character_states", characterStates) sync func instance_bullet(id): @@ -391,4 +412,3 @@ func rotate_weapon(): weaponPosition += Vector2(weaponPositionalOffset.x,0).rotated(deg2rad(weaponAngle)) + Vector2(0,weaponPositionalOffset.y) $"weaponHolder/Player-character-theme-gun-01".position = weaponPosition $"weaponHolder/Player-character-theme-gun-01".rotation_degrees = weaponAngle - pass diff --git a/Game/source/assets/scripts/player_handlers/weapon_handler.gd b/Game/source/assets/scripts/player_handlers/weapon_handler.gd deleted file mode 100644 index f08ccf6..0000000 --- a/Game/source/assets/scripts/player_handlers/weapon_handler.gd +++ /dev/null @@ -1,35 +0,0 @@ -extends CollisionShape2D - -var weaponWidth = 0 -var weaponHeight = 0 -var weaponOffset = Vector2(0,0) -var weaponHolderRadius = get_shape().get_radius() -var weaponPosition = Vector2(0,0) - -var weaponPreviousAngle = 0 -var weaponAngle = 0 - -func _ready(): - weaponWidth = $"Player-character-theme-gun-01".texture.get_width() * $"Player-character-theme-gun-01".scale.x - weaponHeight = $"Player-character-theme-gun-01".texture.get_height() * $"Player-character-theme-gun-01".scale.y - weaponOffset = Vector2(-weaponWidth, -weaponHeight / 2) - weaponPosition += weaponOffset - pass - -func _process(delta): - if Input.is_action_pressed("rotation_increase"): - rotate_weapon(2) - if Input.is_action_pressed("rotation_decrease"): - rotate_weapon(-2) - $"Player-character-theme-gun-01".position = weaponPosition - -func rotate_weapon(degrees): - weaponAngle += degrees - if weaponAngle > -10 and weaponAngle < 90: - weaponPosition -= weaponOffset.rotated(deg2rad(weaponPreviousAngle)) - weaponPosition += weaponOffset.rotated(deg2rad(weaponAngle)) - $"Player-character-theme-gun-01".rotation_degrees = weaponAngle - weaponPreviousAngle = weaponAngle - else: - weaponAngle -= degrees - diff --git a/Game/source/assets/scripts/ui_element_handlers/game_UI.gd b/Game/source/assets/scripts/ui_element_handlers/game_UI.gd index f2e07d4..279f5a9 100644 --- a/Game/source/assets/scripts/ui_element_handlers/game_UI.gd +++ b/Game/source/assets/scripts/ui_element_handlers/game_UI.gd @@ -1,7 +1,7 @@ extends CanvasLayer # if 0, then singleplayer will work, if 1, then multiplayer only -var winner_amount = 1 +var winner_amount = 0 onready var win_timer = $Control/winner/win_timer onready var winner = $Control/winner diff --git a/Game/source/assets/scripts/ui_element_handlers/main_menu.gd b/Game/source/assets/scripts/ui_element_handlers/main_menu.gd index 0acbbe2..de367e4 100644 --- a/Game/source/assets/scripts/ui_element_handlers/main_menu.gd +++ b/Game/source/assets/scripts/ui_element_handlers/main_menu.gd @@ -2,7 +2,8 @@ extends Control func _on_play_pressed(): - get_tree().change_scene("res://source/levels/trinity_site/trinity_site_level.tscn") + #get_tree().change_scene("res://source/levels/trinity_site/trinity_site_level.tscn") + pass func _on_LAN_party_pressed(): diff --git a/Game/source/entities/player/player_node.tscn b/Game/source/entities/player/player_node.tscn index 3c17633..902a566 100644 --- a/Game/source/entities/player/player_node.tscn +++ b/Game/source/entities/player/player_node.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=53 format=2] +[gd_scene load_steps=51 format=2] [ext_resource path="res://source/assets/sprites/character/player/theme/01/na/Player-character-theme-01.png" type="Texture" id=1] [ext_resource path="res://source/assets/scripts/player_handlers/player_collider_handler.gd" type="Script" id=2] @@ -15,8 +15,6 @@ [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 7.png" type="Texture" id=13] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 12.png" type="Texture" id=14] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 10.png" type="Texture" id=15] -[ext_resource path="res://icon.png" type="Texture" id=16] -[ext_resource path="res://source/entities/player/shoot_point.gd" type="Script" id=17] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 18.png" type="Texture" id=18] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/right_r/Player-character-theme-01_anim-idle – 34.png" type="Texture" id=19] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 17.png" type="Texture" id=20] @@ -54,11 +52,6 @@ animations = [ { "frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, -"name": "idle-speed-left-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, "name": "boost-speed-left-01", "speed": 50.0 }, { @@ -69,13 +62,18 @@ animations = [ { }, { "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, -"name": "boost-speed-right-01", -"speed": 50.0 +"name": "move-speed-right-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], +"loop": true, +"name": "idle-speed-left-01", +"speed": 25.0 }, { "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, -"name": "move-speed-right-01", -"speed": 35.0 +"name": "boost-speed-right-01", +"speed": 50.0 }, { "frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, @@ -109,7 +107,10 @@ scale_random = 0.41 [sub_resource type="CircleShape2D" id=5] radius = 41.5403 -[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] +[node name="player" type="KinematicBody2D" groups=[ +"Net", +"Player", +]] script = ExtResource( 11 ) [node name="player_collider" type="CollisionShape2D" parent="."] @@ -142,15 +143,6 @@ one_shot = true wait_time = 0.1 one_shot = true -[node name="shoot_point" type="Position2D" parent="."] -position = Vector2( -40.8514, -27.8513 ) -script = ExtResource( 17 ) - -[node name="gun" type="Sprite" parent="shoot_point"] -position = Vector2( 24.6369, 0.293762 ) -scale = Vector2( 0.0911242, 0.0308412 ) -texture = ExtResource( 16 ) - [node name="hitbox" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] @@ -166,6 +158,7 @@ process_material = SubResource( 4 ) texture = ExtResource( 26 ) [node name="weaponHolder" type="CollisionShape2D" parent="."] +z_index = 1 shape = SubResource( 5 ) [node name="Player-character-theme-gun-01" type="Sprite" parent="weaponHolder"] diff --git a/Game/source/entities/player/shoot_point.gd b/Game/source/entities/player/shoot_point.gd deleted file mode 100644 index ba915cc..0000000 --- a/Game/source/entities/player/shoot_point.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Position2D - - -func _process(delta): - look_at(get_global_mouse_position()) diff --git a/Game/source/levels/trinity_site/trinity_site_level.tscn b/Game/source/levels/trinity_site/trinity_site_level.tscn index f9d472b..b3db345 100644 --- a/Game/source/levels/trinity_site/trinity_site_level.tscn +++ b/Game/source/levels/trinity_site/trinity_site_level.tscn @@ -142,10 +142,10 @@ margin_left = 2.37842 margin_top = -35.5 margin_right = 2.37842 margin_bottom = 106.5 +custom_fonts/font = SubResource( 1 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_constants/shadow_offset_x = 6 custom_constants/shadow_offset_y = 6 -custom_fonts/font = SubResource( 1 ) text = "You are the winner" align = 1 valign = 1 diff --git a/Game/source/scenes/GUI/main_menu.tscn b/Game/source/scenes/GUI/main_menu.tscn index e01614e..c35c9fc 100644 --- a/Game/source/scenes/GUI/main_menu.tscn +++ b/Game/source/scenes/GUI/main_menu.tscn @@ -66,8 +66,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "PLAY" align = 1 valign = 1 @@ -91,8 +91,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "LAN Party" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "EXIT" align = 1 valign = 1 @@ -138,8 +138,8 @@ margin_left = 1798.91 margin_top = 989.536 margin_right = 1889.91 margin_bottom = 1061.54 -custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/Game/source/scenes/GUI/network_setup.tscn b/Game/source/scenes/GUI/network_setup.tscn index 570b58e..b720165 100644 --- a/Game/source/scenes/GUI/network_setup.tscn +++ b/Game/source/scenes/GUI/network_setup.tscn @@ -67,8 +67,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CREATE SERVER" align = 1 valign = 1 @@ -91,8 +91,8 @@ anchor_bottom = 0.5 margin_left = -233.0 margin_top = -36.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "JOIN SERVER" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "RETURN" align = 1 valign = 1 @@ -155,9 +155,9 @@ margin_left = -403.0 margin_top = -243.0 margin_right = 403.0 margin_bottom = -138.0 +custom_fonts/font = ExtResource( 4 ) custom_colors/selection_color = Color( 0.607843, 0.607843, 0.607843, 1 ) custom_colors/cursor_color = Color( 1, 1, 1, 1 ) -custom_fonts/font = ExtResource( 4 ) align = 1 placeholder_text = "Enter username" __meta__ = { @@ -173,8 +173,8 @@ margin_bottom = 201.885 [node name="Label" type="Label" parent="multiplayer_configure/username/username_text_edit/confirm"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 1 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CONFIRM" align = 1 valign = 1 @@ -227,8 +227,8 @@ margin_left = -74.5 margin_top = -32.0 margin_right = 74.5 margin_bottom = 32.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 10 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "START" align = 1 valign = 1 @@ -246,8 +246,8 @@ margin_left = -319.0 margin_top = -56.0 margin_right = 319.0 margin_bottom = 56.0 -custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_fonts/font = SubResource( 2 ) +custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) align = 1 valign = 1 __meta__ = { @@ -264,8 +264,8 @@ margin_left = -116.5 margin_top = 60.0 margin_right = 116.5 margin_bottom = 89.0 -custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_fonts/font = SubResource( 3 ) +custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) text = "WAITING FOR PLAYERS" align = 1 valign = 1 diff --git a/Game/source/scenes/OVERLAY/elements/username_text.tscn b/Game/source/scenes/OVERLAY/elements/username_text.tscn index 258fa59..5d70358 100644 --- a/Game/source/scenes/OVERLAY/elements/username_text.tscn +++ b/Game/source/scenes/OVERLAY/elements/username_text.tscn @@ -9,15 +9,17 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 1 ) -[node name="username_text" type="Node2D" groups=["Net"]] +[node name="username_text" type="Node2D" groups=[ +"Net", +]] z_index = 10 script = ExtResource( 2 ) [node name="Label" type="Label" parent="."] -margin_left = -197.0 -margin_top = -125.0 -margin_right = 197.0 -margin_bottom = -49.0 +margin_left = -199.67 +margin_top = -131.674 +margin_right = 194.33 +margin_bottom = -55.6742 custom_fonts/font = SubResource( 1 ) text = "null" align = 1 diff --git a/kristofers/test/Godot-Multiplayer-Shooter b/kristofers/test/Godot-Multiplayer-Shooter new file mode 160000 index 0000000..1d8a364 --- /dev/null +++ b/kristofers/test/Godot-Multiplayer-Shooter @@ -0,0 +1 @@ +Subproject commit 1d8a364050a146c1e8b84b369100f6d9af72161e diff --git a/kristofers/test/godot-demos b/kristofers/test/godot-demos new file mode 160000 index 0000000..7a78e59 --- /dev/null +++ b/kristofers/test/godot-demos @@ -0,0 +1 @@ +Subproject commit 7a78e59446655802ed8824eb41ceadbe4b70de73