From 707165373ba1f1e844eb4902ebb799e54ba84ee2 Mon Sep 17 00:00:00 2001 From: Chris Bell Date: Thu, 12 Dec 2024 22:44:39 -0600 Subject: [PATCH] Renaming and adding some stuff --- .../core/enviroment/dev-level/dev-level.tscn | 2 +- ...etworkManager.gd => old_NetworkManager.gd} | 0 ..._manager.tscn => old_network_manager.tscn} | 2 +- ...work_test_ui.gd => old_network_test_ui.gd} | 0 .../{test-lobby.tscn => old_test-lobby.tscn} | 6 +-- ...x_prefab.tscn => old_user_box_prefab.tscn} | 0 assets/core/networking/scenes/lobby.tscn | 9 +++++ .../core/networking/scripts/NetworkManager.gd | 11 ++++++ assets/core/networking/scripts/lobby.gd | 11 ++++++ assets/scenes/main.tscn | 2 +- export_presets.cfg | 39 +++++++++++++++++++ 11 files changed, 76 insertions(+), 6 deletions(-) rename assets/core/networking/old/{NetworkManager.gd => old_NetworkManager.gd} (100%) rename assets/core/networking/old/{network_manager.tscn => old_network_manager.tscn} (83%) rename assets/core/networking/old/{network_test_ui.gd => old_network_test_ui.gd} (100%) rename assets/core/networking/old/{test-lobby.tscn => old_test-lobby.tscn} (92%) rename assets/core/networking/old/{user_box_prefab.tscn => old_user_box_prefab.tscn} (100%) create mode 100644 assets/core/networking/scenes/lobby.tscn create mode 100644 assets/core/networking/scripts/NetworkManager.gd create mode 100644 assets/core/networking/scripts/lobby.gd create mode 100644 export_presets.cfg diff --git a/assets/core/enviroment/dev-level/dev-level.tscn b/assets/core/enviroment/dev-level/dev-level.tscn index e04af94..252a298 100644 --- a/assets/core/enviroment/dev-level/dev-level.tscn +++ b/assets/core/enviroment/dev-level/dev-level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=10 format=3 uid="uid://ewovs6ns5y3k"] -[ext_resource type="Script" path="res://assets/core/networking/old/NetworkManager.gd" id="1_kki4t"] +[ext_resource type="Script" path="res://assets/core/networking/old/old_NetworkManager.gd" id="1_kki4t"] [ext_resource type="Texture2D" uid="uid://gymb0tju4y67" path="res://addons/kennysprototypetextures/Dark/texture_black (1).png" id="1_l0osb"] [ext_resource type="PackedScene" uid="uid://c6w0ivy4hetrl" path="res://assets/core/player-controller/scenes/player.tscn" id="2_q510b"] diff --git a/assets/core/networking/old/NetworkManager.gd b/assets/core/networking/old/old_NetworkManager.gd similarity index 100% rename from assets/core/networking/old/NetworkManager.gd rename to assets/core/networking/old/old_NetworkManager.gd diff --git a/assets/core/networking/old/network_manager.tscn b/assets/core/networking/old/old_network_manager.tscn similarity index 83% rename from assets/core/networking/old/network_manager.tscn rename to assets/core/networking/old/old_network_manager.tscn index f461aed..3df4efc 100644 --- a/assets/core/networking/old/network_manager.tscn +++ b/assets/core/networking/old/old_network_manager.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bpmn7t87tfk7f"] -[ext_resource type="Script" path="res://assets/core/networking/old/NetworkManager.gd" id="1_6essl"] +[ext_resource type="Script" path="res://assets/core/networking/old/old_NetworkManager.gd" id="1_6essl"] [node name="NetworkManager" type="Node"] script = ExtResource("1_6essl") diff --git a/assets/core/networking/old/network_test_ui.gd b/assets/core/networking/old/old_network_test_ui.gd similarity index 100% rename from assets/core/networking/old/network_test_ui.gd rename to assets/core/networking/old/old_network_test_ui.gd diff --git a/assets/core/networking/old/test-lobby.tscn b/assets/core/networking/old/old_test-lobby.tscn similarity index 92% rename from assets/core/networking/old/test-lobby.tscn rename to assets/core/networking/old/old_test-lobby.tscn index 9e9c3d1..9bb17bc 100644 --- a/assets/core/networking/old/test-lobby.tscn +++ b/assets/core/networking/old/old_test-lobby.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://dfa8n5rw2qpfd"] -[ext_resource type="PackedScene" uid="uid://bpmn7t87tfk7f" path="res://assets/core/networking/old/network_manager.tscn" id="1_i1w5w"] -[ext_resource type="Script" path="res://assets/core/networking/old/network_test_ui.gd" id="2_rbs4r"] -[ext_resource type="PackedScene" uid="uid://biryul3n6thlw" path="res://assets/core/networking/old/user_box_prefab.tscn" id="3_if51w"] +[ext_resource type="PackedScene" uid="uid://bpmn7t87tfk7f" path="res://assets/core/networking/old/old_network_manager.tscn" id="1_i1w5w"] +[ext_resource type="Script" path="res://assets/core/networking/old/old_network_test_ui.gd" id="2_rbs4r"] +[ext_resource type="PackedScene" uid="uid://biryul3n6thlw" path="res://assets/core/networking/old/old_user_box_prefab.tscn" id="3_if51w"] [node name="Test-lobby" type="Node"] diff --git a/assets/core/networking/old/user_box_prefab.tscn b/assets/core/networking/old/old_user_box_prefab.tscn similarity index 100% rename from assets/core/networking/old/user_box_prefab.tscn rename to assets/core/networking/old/old_user_box_prefab.tscn diff --git a/assets/core/networking/scenes/lobby.tscn b/assets/core/networking/scenes/lobby.tscn new file mode 100644 index 0000000..85c5f58 --- /dev/null +++ b/assets/core/networking/scenes/lobby.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://7t1x82gvrw8a"] + +[node name="Lobby" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 diff --git a/assets/core/networking/scripts/NetworkManager.gd b/assets/core/networking/scripts/NetworkManager.gd new file mode 100644 index 0000000..fae2c76 --- /dev/null +++ b/assets/core/networking/scripts/NetworkManager.gd @@ -0,0 +1,11 @@ +extends Node + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/assets/core/networking/scripts/lobby.gd b/assets/core/networking/scripts/lobby.gd new file mode 100644 index 0000000..a1d4176 --- /dev/null +++ b/assets/core/networking/scripts/lobby.gd @@ -0,0 +1,11 @@ +extends Control + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/assets/scenes/main.tscn b/assets/scenes/main.tscn index 902a939..aac1d47 100644 --- a/assets/scenes/main.tscn +++ b/assets/scenes/main.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://huq7dxk5yvjk"] -[ext_resource type="Script" path="res://assets/core/networking/old/NetworkManager.gd" id="1_dcack"] +[ext_resource type="Script" path="res://assets/core/networking/old/old_NetworkManager.gd" id="1_dcack"] [node name="Main" type="Node"] diff --git a/export_presets.cfg b/export_presets.cfg new file mode 100644 index 0000000..2d20e2d --- /dev/null +++ b/export_presets.cfg @@ -0,0 +1,39 @@ +[preset.0] + +name="Linux" +platform="Linux" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../build/linux/debug/Steamforged Skies.x86_64" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.0.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\""