From 1ffb4f829535a7a2bc84dce8598c0a21cbbe9a5b Mon Sep 17 00:00:00 2001 From: Aaron Choo Date: Tue, 30 Jul 2019 10:15:26 +0800 Subject: [PATCH] Change file names for consistency --- Characters/ScoreBoard/ScoreBoard.tscn | 2 +- Lobby/PreGameLobby/PreGameLobby.gd | 1 + Lobby/PreGameLobby/PreGameLobby.tscn | 3 ++- MainMenu/MainMenu.tscn | 2 +- Settings/Settings.tscn | 4 ++-- Theme/{button_theme.tres => ButtonTheme.tres} | 0 Theme/{Theme.tres => VolumeToggleTheme.tres} | 0 7 files changed, 7 insertions(+), 5 deletions(-) rename Theme/{button_theme.tres => ButtonTheme.tres} (100%) rename Theme/{Theme.tres => VolumeToggleTheme.tres} (100%) diff --git a/Characters/ScoreBoard/ScoreBoard.tscn b/Characters/ScoreBoard/ScoreBoard.tscn index 81d9a42..855edd8 100644 --- a/Characters/ScoreBoard/ScoreBoard.tscn +++ b/Characters/ScoreBoard/ScoreBoard.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://Characters/ScoreBoard/ScoreBoard.gd" type="Script" id=1] [ext_resource path="res://Fonts/m5x7.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://Theme/button_theme.tres" type="Theme" id=3] +[ext_resource path="res://Theme/ButtonTheme.tres" type="Theme" id=3] [ext_resource path="res://Fonts/ButtonFont.tres" type="DynamicFont" id=4] [sub_resource type="DynamicFont" id=1] diff --git a/Lobby/PreGameLobby/PreGameLobby.gd b/Lobby/PreGameLobby/PreGameLobby.gd index 68575a1..1938d8f 100644 --- a/Lobby/PreGameLobby/PreGameLobby.gd +++ b/Lobby/PreGameLobby/PreGameLobby.gd @@ -61,6 +61,7 @@ remotesync func go_to_map(): get_node("/root").add_child(world) for id in Network.players_info: var actor_path : String = Network.players_info[id].actor_path + print(actor_path) var spawnpoint : String = str(Network.players_info[id].spawnpoint) var player_name : String = Network.players_info[id].name var player = load(actor_path).instance() diff --git a/Lobby/PreGameLobby/PreGameLobby.tscn b/Lobby/PreGameLobby/PreGameLobby.tscn index 45eef3e..5c68a90 100644 --- a/Lobby/PreGameLobby/PreGameLobby.tscn +++ b/Lobby/PreGameLobby/PreGameLobby.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://Lobby/PreGameLobby/PreGameLobby.gd" type="Script" id=1] [ext_resource path="res://Assets/LobbyBackground/finalNight.PNG" type="Texture" id=2] -[ext_resource path="res://Theme/button_theme.tres" type="Theme" id=3] +[ext_resource path="res://Theme/ButtonTheme.tres" type="Theme" id=3] + diff --git a/MainMenu/MainMenu.tscn b/MainMenu/MainMenu.tscn index 091fd7c..c20d32b 100644 --- a/MainMenu/MainMenu.tscn +++ b/MainMenu/MainMenu.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://Assets/LobbyBackground/finalNight.PNG" type="Texture" id=3] [ext_resource path="res://Fonts/monogram_extended.ttf" type="DynamicFontData" id=4] [ext_resource path="res://Fonts/ButtonFont.tres" type="DynamicFont" id=5] -[ext_resource path="res://Theme/Theme.tres" type="Theme" id=6] +[ext_resource path="res://Theme/VolumeToggleTheme.tres" type="Theme" id=6] [sub_resource type="DynamicFontData" id=1] font_path = "res://Fonts/monogram_extended.ttf" diff --git a/Settings/Settings.tscn b/Settings/Settings.tscn index 986c791..6aac4d4 100644 --- a/Settings/Settings.tscn +++ b/Settings/Settings.tscn @@ -2,9 +2,9 @@ [ext_resource path="res://Settings/Settings.gd" type="Script" id=1] [ext_resource path="res://MainMenu/Label.tscn" type="PackedScene" id=2] -[ext_resource path="res://Theme/Theme.tres" type="Theme" id=3] +[ext_resource path="res://Theme/VolumeToggleTheme.tres" type="Theme" id=3] [ext_resource path="res://MainMenu/BackButton.tscn" type="PackedScene" id=4] -[ext_resource path="res://Theme/button_theme.tres" type="Theme" id=5] +[ext_resource path="res://Theme/ButtonTheme.tres" type="Theme" id=5] [ext_resource path="res://Assets/Music/Automation.ogg" type="AudioStream" id=6] [node name="Settings" type="CanvasLayer"] diff --git a/Theme/button_theme.tres b/Theme/ButtonTheme.tres similarity index 100% rename from Theme/button_theme.tres rename to Theme/ButtonTheme.tres diff --git a/Theme/Theme.tres b/Theme/VolumeToggleTheme.tres similarity index 100% rename from Theme/Theme.tres rename to Theme/VolumeToggleTheme.tres