diff --git a/game/CREDITS.tres b/game/CREDITS.tres
index 965ec75b..687e0e64 100644
--- a/game/CREDITS.tres
+++ b/game/CREDITS.tres
@@ -42,6 +42,11 @@ Nathan Bonnemains
IMAGES
======
+LOGO AND ICON
+----------------------
+The Ghost
+traverseda
+
CURSORS
------------
Jakub 'Nighted' Steiner
diff --git a/game/Images/InfoIcon.svg b/game/Images/InfoIcon.svg
new file mode 100644
index 00000000..4e386deb
--- /dev/null
+++ b/game/Images/InfoIcon.svg
@@ -0,0 +1,43 @@
+
+
+
diff --git a/game/icon.png.import b/game/Images/InfoIcon.svg.import
similarity index 70%
rename from game/icon.png.import
rename to game/Images/InfoIcon.svg.import
index 96cbf462..b4035f49 100644
--- a/game/icon.png.import
+++ b/game/Images/InfoIcon.svg.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+path="res://.import/InfoIcon.svg-fa204b6256748a71f6912bf3faccbd66.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+source_file="res://Images/InfoIcon.svg"
+dest_files=[ "res://.import/InfoIcon.svg-fa204b6256748a71f6912bf3faccbd66.stex" ]
[params]
diff --git a/game/LICENSES.tres b/game/LICENSES.tres
index df966568..20f17a90 100644
--- a/game/LICENSES.tres
+++ b/game/LICENSES.tres
@@ -4,7 +4,14 @@
[resource]
script = ExtResource( 1 )
-text = "Fonts/Cabin-*.ttf
+text = "tabletop_club_{icon,logo}.png
+=========================
+Author: The Ghost
+License: CC BY-SA 4.0
+Modified By: traverseda
+URL: https://files.outsidecontext.solutions/s/G6aHm9qGPbJzBBH
+
+Fonts/Cabin-*.ttf
===========
Authors: Pablo Impallari, Igino Marini
License: SIL OFL v1.1
@@ -36,6 +43,12 @@ License: CC0
Modified By: Benjamin \"drwhut\" Beddows
URL: https://www.svgrepo.com/svg/10764/eye
+Images/InfoIcon.svg
+=================
+Author: SVG Repo
+License: CC0
+URL: https://www.svgrepo.com/svg/60892/info
+
Images/PaintIcon.svg
==================
Author: SVG Repo
diff --git a/game/Scenes/MainMenu.tscn b/game/Scenes/MainMenu.tscn
index fd2b432e..5cbc21dd 100644
--- a/game/Scenes/MainMenu.tscn
+++ b/game/Scenes/MainMenu.tscn
@@ -1,11 +1,12 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
-[ext_resource path="res://Scripts/Misc/VersionLabel.gd" type="Script" id=1]
-[ext_resource path="res://Scripts/Misc/CopyrightLabel.gd" type="Script" id=2]
[ext_resource path="res://Scripts/MainMenu.gd" type="Script" id=3]
[ext_resource path="res://Scenes/OptionsMenu.tscn" type="PackedScene" id=4]
[ext_resource path="res://Fonts/Cabin-Italic.tres" type="DynamicFont" id=5]
[ext_resource path="res://Scenes/RandomMusicPlayer.tscn" type="PackedScene" id=6]
+[ext_resource path="res://tabletop_club_logo.png" type="Texture" id=7]
+[ext_resource path="res://Scenes/MainMenuFont.tres" type="DynamicFont" id=8]
+[ext_resource path="res://Images/InfoIcon.svg" type="Texture" id=9]
[node name="MainMenu" type="Control"]
anchor_right = 1.0
@@ -16,69 +17,240 @@ __meta__ = {
"_editor_description_": "The main menu of the game."
}
-[node name="CenterContainer" type="CenterContainer" parent="."]
+[node name="MainView" type="HBoxContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="MainList" type="VBoxContainer" parent="MainView"]
+margin_left = 384.0
+margin_right = 640.0
+margin_bottom = 600.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="TextureRect" type="TextureRect" parent="MainView/MainList"]
+margin_right = 256.0
+margin_bottom = 256.0
+rect_min_size = Vector2( 256, 256 )
+texture = ExtResource( 7 )
+expand = true
+
+[node name="SingleplayerButton" type="Button" parent="MainView/MainList"]
+margin_top = 260.0
+margin_right = 256.0
+margin_bottom = 291.0
+custom_fonts/font = ExtResource( 8 )
+text = "Singleplayer"
+
+[node name="MultiplayerButton" type="Button" parent="MainView/MainList"]
+margin_top = 295.0
+margin_right = 256.0
+margin_bottom = 326.0
+custom_fonts/font = ExtResource( 8 )
+text = "Multiplayer"
+
+[node name="OptionsButton" type="Button" parent="MainView/MainList"]
+margin_top = 330.0
+margin_right = 256.0
+margin_bottom = 361.0
+custom_fonts/font = ExtResource( 8 )
+text = "Options"
+
+[node name="CreditsButton" type="Button" parent="MainView/MainList"]
+margin_top = 365.0
+margin_right = 256.0
+margin_bottom = 396.0
+custom_fonts/font = ExtResource( 8 )
+text = "Credits"
+
+[node name="QuitButton" type="Button" parent="MainView/MainList"]
+margin_top = 400.0
+margin_right = 256.0
+margin_bottom = 431.0
+custom_fonts/font = ExtResource( 8 )
+text = "Quit"
+
+[node name="Gap" type="Control" parent="MainView/MainList"]
+margin_top = 435.0
+margin_right = 256.0
+margin_bottom = 564.0
+size_flags_vertical = 3
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MainView/MainList"]
+margin_top = 568.0
+margin_right = 256.0
+margin_bottom = 600.0
+alignment = 2
+
+[node name="InfoButton" type="Button" parent="MainView/MainList/HBoxContainer"]
+margin_left = 224.0
+margin_right = 256.0
+margin_bottom = 32.0
+rect_min_size = Vector2( 32, 32 )
+icon = ExtResource( 9 )
+expand_icon = true
+
+[node name="MultiplayerDialog" type="WindowDialog" parent="."]
+margin_right = 431.0
+margin_bottom = 121.0
+window_title = "Multiplayer"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MultiplayerDialog"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="HostGameContainer" type="VBoxContainer" parent="MultiplayerDialog/HBoxContainer"]
+margin_right = 213.0
+margin_bottom = 121.0
+size_flags_horizontal = 3
+
+[node name="HostGameButton" type="Button" parent="MultiplayerDialog/HBoxContainer/HostGameContainer"]
+margin_right = 213.0
+margin_bottom = 26.0
+text = "Host Game"
+
+[node name="HostGameLabel" type="Label" parent="MultiplayerDialog/HBoxContainer/HostGameContainer"]
+margin_top = 30.0
+margin_right = 213.0
+margin_bottom = 96.0
+text = "Create a new lobby for your friends to join over the internet."
+autowrap = true
+
+[node name="EnterCodeContainer" type="VBoxContainer" parent="MultiplayerDialog/HBoxContainer"]
+margin_left = 217.0
+margin_right = 431.0
+margin_bottom = 121.0
+size_flags_horizontal = 3
+
+[node name="EnterCodeButton" type="Button" parent="MultiplayerDialog/HBoxContainer/EnterCodeContainer"]
+margin_right = 214.0
+margin_bottom = 26.0
+text = "Join Game"
+
+[node name="EnterCodeLabel" type="Label" parent="MultiplayerDialog/HBoxContainer/EnterCodeContainer"]
+margin_top = 30.0
+margin_right = 214.0
+margin_bottom = 73.0
+text = "Use a room code to join your friend's lobby."
+autowrap = true
+
+[node name="EnterCodeDialog" type="WindowDialog" parent="."]
+margin_right = 177.0
+margin_bottom = 63.0
+window_title = "Enter Room Code"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="VBoxContainer" type="VBoxContainer" parent="EnterCodeDialog"]
anchor_right = 1.0
anchor_bottom = 1.0
__meta__ = {
"_edit_use_anchors_": false
}
-[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
-margin_left = 438.0
-margin_top = 210.0
-margin_right = 585.0
-margin_bottom = 390.0
-
-[node name="SingleplayerButton" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_right = 147.0
-margin_bottom = 26.0
-text = "Singleplayer"
-
-[node name="HostGameButton" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_top = 30.0
-margin_right = 147.0
-margin_bottom = 56.0
-text = "Host Game"
-__meta__ = {
-"_editor_description_": ""
-}
-
-[node name="JoinContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
-margin_top = 60.0
-margin_right = 147.0
-margin_bottom = 90.0
-
-[node name="RoomCodeEdit" type="LineEdit" parent="CenterContainer/VBoxContainer/JoinContainer"]
-margin_right = 60.0
+[node name="RoomCodeContainer" type="HBoxContainer" parent="EnterCodeDialog/VBoxContainer"]
+margin_right = 177.0
margin_bottom = 30.0
-rect_min_size = Vector2( 60, 0 )
+
+[node name="RoomCodeLabel" type="Label" parent="EnterCodeDialog/VBoxContainer/RoomCodeContainer"]
+margin_top = 5.0
+margin_right = 85.0
+margin_bottom = 25.0
+text = "Room Code:"
+
+[node name="RoomCodeEdit" type="LineEdit" parent="EnterCodeDialog/VBoxContainer/RoomCodeContainer"]
+margin_left = 89.0
+margin_right = 177.0
+margin_bottom = 30.0
+size_flags_horizontal = 3
align = 1
max_length = 4
placeholder_text = "ABCD"
-[node name="JoinGameButton" type="Button" parent="CenterContainer/VBoxContainer/JoinContainer"]
-margin_left = 64.0
-margin_right = 147.0
-margin_bottom = 30.0
+[node name="JoinGameButton" type="Button" parent="EnterCodeDialog/VBoxContainer"]
+margin_top = 34.0
+margin_right = 177.0
+margin_bottom = 60.0
text = "Join Game"
-[node name="OptionsButton" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_top = 94.0
-margin_right = 147.0
-margin_bottom = 120.0
-text = "Options"
+[node name="InfoDialog" type="WindowDialog" parent="."]
+margin_right = 720.0
+margin_bottom = 450.0
+window_title = "Information"
+__meta__ = {
+"_edit_use_anchors_": false
+}
-[node name="CreditsButton" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_top = 124.0
-margin_right = 147.0
-margin_bottom = 150.0
-text = "Credits"
+[node name="ScrollContainer" type="ScrollContainer" parent="InfoDialog"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
-[node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_top = 154.0
-margin_right = 147.0
-margin_bottom = 180.0
-text = "Quit"
+[node name="VBoxContainer" type="VBoxContainer" parent="InfoDialog/ScrollContainer"]
+margin_right = 720.0
+margin_bottom = 618.0
+size_flags_horizontal = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="InfoLogoContainer" type="HBoxContainer" parent="InfoDialog/ScrollContainer/VBoxContainer"]
+margin_right = 708.0
+margin_bottom = 128.0
+alignment = 1
+
+[node name="TextureRect" type="TextureRect" parent="InfoDialog/ScrollContainer/VBoxContainer/InfoLogoContainer"]
+margin_left = 290.0
+margin_right = 418.0
+margin_bottom = 128.0
+rect_min_size = Vector2( 128, 128 )
+texture = ExtResource( 7 )
+expand = true
+
+[node name="VersionLabel" type="Label" parent="InfoDialog/ScrollContainer/VBoxContainer"]
+margin_top = 132.0
+margin_right = 708.0
+margin_bottom = 157.0
+custom_fonts/font = ExtResource( 8 )
+align = 1
+
+[node name="LicenseLabel" type="Label" parent="InfoDialog/ScrollContainer/VBoxContainer"]
+margin_top = 161.0
+margin_right = 708.0
+margin_bottom = 618.0
+text = "Copyright (c) 2020-2021 Benjamin 'drwhut' Beddows.
+Copyright (c) 2021 Tabletop Club contributors (see credits).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the \"Software\"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE."
+autowrap = true
[node name="CreditsDialog" type="WindowDialog" parent="."]
margin_right = 512.0
@@ -103,44 +275,19 @@ margin_bottom = 150.0
window_title = "Error"
dialog_autowrap = true
-[node name="VersionLabel" type="Label" parent="."]
-anchor_top = 1.0
-anchor_bottom = 1.0
-margin_top = -14.0
-margin_right = 40.0
-grow_vertical = 0
-script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": false,
-"_editor_description_": "Automatically displays the name and version of the game based on the project settings."
-}
-
-[node name="CopyrightLabel" type="Label" parent="."]
-anchor_left = 1.0
-anchor_top = 1.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = -40.0
-margin_top = -14.0
-grow_horizontal = 0
-grow_vertical = 0
-align = 2
-script = ExtResource( 2 )
-__meta__ = {
-"_edit_use_anchors_": false,
-"_editor_description_": "Automatically displays the first line of the description of the game in the project settings."
-}
-
[node name="RandomMusicPlayer" parent="." instance=ExtResource( 6 )]
[node name="OptionsMenu" parent="." instance=ExtResource( 4 )]
visible = false
-[connection signal="pressed" from="CenterContainer/VBoxContainer/SingleplayerButton" to="." method="_on_SingleplayerButton_pressed"]
-[connection signal="pressed" from="CenterContainer/VBoxContainer/HostGameButton" to="." method="_on_HostGameButton_pressed"]
-[connection signal="text_changed" from="CenterContainer/VBoxContainer/JoinContainer/RoomCodeEdit" to="." method="_on_RoomCodeEdit_text_changed"]
-[connection signal="pressed" from="CenterContainer/VBoxContainer/JoinContainer/JoinGameButton" to="." method="_on_JoinGameButton_pressed"]
-[connection signal="pressed" from="CenterContainer/VBoxContainer/OptionsButton" to="." method="_on_OptionsButton_pressed"]
-[connection signal="pressed" from="CenterContainer/VBoxContainer/CreditsButton" to="." method="_on_CreditsButton_pressed"]
-[connection signal="pressed" from="CenterContainer/VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]
+[connection signal="pressed" from="MainView/MainList/SingleplayerButton" to="." method="_on_SingleplayerButton_pressed"]
+[connection signal="pressed" from="MainView/MainList/MultiplayerButton" to="." method="_on_MultiplayerButton_pressed"]
+[connection signal="pressed" from="MainView/MainList/OptionsButton" to="." method="_on_OptionsButton_pressed"]
+[connection signal="pressed" from="MainView/MainList/CreditsButton" to="." method="_on_CreditsButton_pressed"]
+[connection signal="pressed" from="MainView/MainList/QuitButton" to="." method="_on_QuitButton_pressed"]
+[connection signal="pressed" from="MainView/MainList/HBoxContainer/InfoButton" to="." method="_on_InfoButton_pressed"]
+[connection signal="pressed" from="MultiplayerDialog/HBoxContainer/HostGameContainer/HostGameButton" to="." method="_on_HostGameButton_pressed"]
+[connection signal="pressed" from="MultiplayerDialog/HBoxContainer/EnterCodeContainer/EnterCodeButton" to="." method="_on_EnterCodeButton_pressed"]
+[connection signal="text_changed" from="EnterCodeDialog/VBoxContainer/RoomCodeContainer/RoomCodeEdit" to="." method="_on_RoomCodeEdit_text_changed"]
+[connection signal="pressed" from="EnterCodeDialog/VBoxContainer/JoinGameButton" to="." method="_on_JoinGameButton_pressed"]
[connection signal="locale_changed" from="OptionsMenu" to="." method="_on_OptionsMenu_locale_changed"]
diff --git a/game/Scenes/MainMenuFont.tres b/game/Scenes/MainMenuFont.tres
new file mode 100644
index 00000000..89117cb0
--- /dev/null
+++ b/game/Scenes/MainMenuFont.tres
@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://Fonts/Cabin-Regular.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 20
+font_data = ExtResource( 1 )
diff --git a/game/Scenes/OptionsMenu.tscn b/game/Scenes/OptionsMenu.tscn
index 57ab73d0..1ce80b74 100644
--- a/game/Scenes/OptionsMenu.tscn
+++ b/game/Scenes/OptionsMenu.tscn
@@ -496,20 +496,6 @@ margin_bottom = 154.0
size_flags_horizontal = 3
text = "Reimport Assets"
-[node name="ViewLicenseSpace" type="Control" parent="MarginContainer/VBoxContainer/TabContainer/General/GridContainer"]
-margin_top = 158.0
-margin_right = 486.0
-margin_bottom = 184.0
-size_flags_horizontal = 3
-
-[node name="ViewLicenseButton" type="Button" parent="MarginContainer/VBoxContainer/TabContainer/General/GridContainer"]
-margin_left = 490.0
-margin_top = 158.0
-margin_right = 976.0
-margin_bottom = 184.0
-size_flags_horizontal = 3
-text = "View License"
-
[node name="Key Bindings" type="ScrollContainer" parent="MarginContainer/VBoxContainer/TabContainer"]
visible = false
anchor_right = 1.0
@@ -1200,34 +1186,6 @@ __meta__ = {
"_edit_use_anchors_": false
}
-[node name="LicenseDialog" type="AcceptDialog" parent="."]
-margin_right = 83.0
-margin_bottom = 58.0
-window_title = "MIT License"
-dialog_text = "Copyright (c) 2020-2021 Benjamin 'drwhut' Beddows.
-Copyright (c) 2021 Tabletop Club contributors (see credits).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the \"Software\"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE."
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
[node name="RestartRequiredDialog" type="AcceptDialog" parent="."]
margin_right = 280.0
margin_bottom = 100.0
@@ -1242,7 +1200,6 @@ dialog_autowrap = true
[connection signal="item_selected" from="MarginContainer/VBoxContainer/TabContainer/General/GridContainer/LanguageButton" to="." method="_on_LanguageButton_item_selected"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/TabContainer/General/GridContainer/OpenAssetsButton" to="." method="_on_OpenAssetsButton_pressed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/TabContainer/General/GridContainer/ReimportButton" to="." method="_on_ReimportButton_pressed"]
-[connection signal="pressed" from="MarginContainer/VBoxContainer/TabContainer/General/GridContainer/ViewLicenseButton" to="." method="_on_ViewLicenseButton_pressed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/TabContainer/Key Bindings/GridContainer/ResetBindingsButton" to="." method="_on_ResetBindingsButton_pressed"]
[connection signal="item_selected" from="MarginContainer/VBoxContainer/TabContainer/Video/GridContainer/ShadowDetailButton" to="." method="_on_ShadowDetailButton_item_selected"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/BackButton" to="." method="_on_BackButton_pressed"]
diff --git a/game/Scripts/MainMenu.gd b/game/Scripts/MainMenu.gd
index 8c1b6a6b..32565c74 100644
--- a/game/Scripts/MainMenu.gd
+++ b/game/Scripts/MainMenu.gd
@@ -24,10 +24,14 @@ extends Control
onready var _credits_dialog = $CreditsDialog
onready var _credits_label = $CreditsDialog/CreditsLabel
+onready var _enter_code_dialog = $EnterCodeDialog
onready var _error_dialog = $ErrorDialog
+onready var _info_dialog = $InfoDialog
+onready var _multiplayer_dialog = $MultiplayerDialog
onready var _options_menu = $OptionsMenu
onready var _random_music_player = $RandomMusicPlayer
-onready var _room_code_edit = $CenterContainer/VBoxContainer/JoinContainer/RoomCodeEdit
+onready var _room_code_edit = $EnterCodeDialog/VBoxContainer/RoomCodeContainer/RoomCodeEdit
+onready var _version_label = $InfoDialog/ScrollContainer/VBoxContainer/VersionLabel
const ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -39,6 +43,10 @@ func display_error(error: String) -> void:
func _ready():
_update_credits_text()
+
+ _version_label.text = ProjectSettings.get_setting("application/config/name")
+ if ProjectSettings.has_setting("application/config/version"):
+ _version_label.text += " " + ProjectSettings.get_setting("application/config/version")
# Update the credits dialog text.
func _update_credits_text() -> void:
@@ -51,6 +59,7 @@ func _update_credits_text() -> void:
credits_text = credits_text.replace("DEVELOPERS", tr("Developers"))
credits_text = credits_text.replace("FONTS", tr("Fonts"))
credits_text = credits_text.replace("IMAGES", tr("Images"))
+ credits_text = credits_text.replace("LOGO AND ICON", tr("Logo and Icon"))
credits_text = credits_text.replace("SOUND EFFECTS", tr("Sound Effects"))
credits_text = credits_text.replace("TOOL ICONS", tr("Tool Icons"))
credits_text = credits_text.replace("TRANSLATORS", tr("Translators"))
@@ -76,9 +85,16 @@ func _update_credits_text() -> void:
func _on_SingleplayerButton_pressed():
Global.start_game_singleplayer()
+func _on_MultiplayerButton_pressed():
+ _multiplayer_dialog.popup_centered()
+
func _on_HostGameButton_pressed():
Global.start_game_as_server()
+func _on_EnterCodeButton_pressed():
+ _enter_code_dialog.popup_centered()
+ _multiplayer_dialog.visible = false
+
func _on_RoomCodeEdit_text_changed(new_text: String):
var caret_position = _room_code_edit.caret_position
_room_code_edit.text = new_text.to_upper()
@@ -110,3 +126,6 @@ func _on_CreditsButton_pressed():
func _on_QuitButton_pressed():
get_tree().quit()
+
+func _on_InfoButton_pressed():
+ _info_dialog.popup_centered()
diff --git a/game/Scripts/Misc/CopyrightLabel.gd b/game/Scripts/Misc/CopyrightLabel.gd
deleted file mode 100644
index 3b854610..00000000
--- a/game/Scripts/Misc/CopyrightLabel.gd
+++ /dev/null
@@ -1,28 +0,0 @@
-# tabletop-club
-# Copyright (c) 2020-2021 Benjamin 'drwhut' Beddows.
-# Copyright (c) 2021 Tabletop Club contributors (see game/CREDITS.tres).
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-extends Label
-
-func _ready():
- var description = ProjectSettings.get_setting("application/config/description")
- var description_lines = description.split("\n", false, 2)
- text = description_lines[0] + "\n" + description_lines[1]
diff --git a/game/Scripts/Misc/VersionLabel.gd b/game/Scripts/Misc/VersionLabel.gd
deleted file mode 100644
index 4d09566a..00000000
--- a/game/Scripts/Misc/VersionLabel.gd
+++ /dev/null
@@ -1,29 +0,0 @@
-# tabletop-club
-# Copyright (c) 2020-2021 Benjamin 'drwhut' Beddows.
-# Copyright (c) 2021 Tabletop Club contributors (see game/CREDITS.tres).
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-extends Label
-
-func _ready():
- text = ProjectSettings.get_setting("application/config/name")
-
- if ProjectSettings.has_setting("application/config/version"):
- text += " " + ProjectSettings.get_setting("application/config/version")
diff --git a/game/Scripts/OptionsMenu.gd b/game/Scripts/OptionsMenu.gd
index 88e4c24a..d3465736 100644
--- a/game/Scripts/OptionsMenu.gd
+++ b/game/Scripts/OptionsMenu.gd
@@ -36,7 +36,6 @@ const OPTIONS_FILE_PATH = "user://options.cfg"
onready var _binding_background = $BindingBackground
onready var _key_bindings_parent = $"MarginContainer/VBoxContainer/TabContainer/Key Bindings/GridContainer"
onready var _language_button = $MarginContainer/VBoxContainer/TabContainer/General/GridContainer/LanguageButton
-onready var _license_dialog = $LicenseDialog
onready var _open_assets_button = $MarginContainer/VBoxContainer/TabContainer/General/GridContainer/OpenAssetsButton
onready var _reimport_confirm = $ReimportConfirm
onready var _reset_bindings_confirm = $ResetBindingsConfirm
@@ -523,6 +522,3 @@ func _on_ShadowDetailButton_item_selected(_index: int):
func _on_SoundsVolumeSlider_value_changed(_value: float):
_apply_audio_config(_create_config_from_current())
-
-func _on_ViewLicenseButton_pressed():
- _license_dialog.popup_centered()
diff --git a/game/icon.png b/game/icon.png
deleted file mode 100644
index c98fbb60..00000000
Binary files a/game/icon.png and /dev/null differ
diff --git a/game/project.godot b/game/project.godot
index 336da30e..9fe26a33 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -159,7 +159,8 @@ Copyright (c) 2021 Tabletop Club contributors (see credits).
An open-source platform for playing tabletop games in a 3D environment, made with the Godot Engine!"
run/main_scene="res://Scenes/ImportAssets.tscn"
config/project_settings_override="user://override.cfg"
-config/icon="res://icon.png"
+config/icon="res://tabletop_club_icon.png"
+config/windows_native_icon="res://tabletop_club_icon.ico"
config/version="master"
[autoload]
diff --git a/game/tabletop_club_icon.ico b/game/tabletop_club_icon.ico
new file mode 100644
index 00000000..83afd38f
Binary files /dev/null and b/game/tabletop_club_icon.ico differ
diff --git a/game/tabletop_club_icon.png b/game/tabletop_club_icon.png
new file mode 100644
index 00000000..a5e6a87c
Binary files /dev/null and b/game/tabletop_club_icon.png differ
diff --git a/game/tabletop_club_icon.png.import b/game/tabletop_club_icon.png.import
new file mode 100644
index 00000000..bfb5316d
--- /dev/null
+++ b/game/tabletop_club_icon.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/tabletop_club_icon.png-cfc2bbe6854b19eb5e3b594c8db68459.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://tabletop_club_icon.png"
+dest_files=[ "res://.import/tabletop_club_icon.png-cfc2bbe6854b19eb5e3b594c8db68459.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/game/tabletop_club_logo.png b/game/tabletop_club_logo.png
new file mode 100644
index 00000000..f1411973
Binary files /dev/null and b/game/tabletop_club_logo.png differ
diff --git a/game/tabletop_club_logo.png.import b/game/tabletop_club_logo.png.import
new file mode 100644
index 00000000..71af1941
--- /dev/null
+++ b/game/tabletop_club_logo.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/tabletop_club_logo.png-106a5aab47d8365dd3edbeb867f0519b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://tabletop_club_logo.png"
+dest_files=[ "res://.import/tabletop_club_logo.png-106a5aab47d8365dd3edbeb867f0519b.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/tabletop_club_logo.svg b/tabletop_club_logo.svg
new file mode 100644
index 00000000..9508dbbe
--- /dev/null
+++ b/tabletop_club_logo.svg
@@ -0,0 +1,318 @@
+
+