Change file names for consistency

AaronCQL · Jul 30, 2019 · 1ffb4f8 · 1ffb4f8
1 parent 011121d
commit 1ffb4f8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → Theme/ButtonTheme.tres b/Theme/button_theme.tres → Theme/ButtonTheme.tres
diff --git a/Theme/Theme.tres → Theme/VolumeToggleTheme.tres b/Theme/Theme.tres → Theme/VolumeToggleTheme.tres