Merge branch 'next-level-visual-fix' of https://github.com/ASecondGuy…

…/Suffragium into asecondguy-next-level-visual-fix-fix

game/app/scenes/about.gd

@@ -44,7 +44,8 @@ func _write_to_label():
 
 		for key in line.split(" "):
 			if key.match("[/*]"):
-				_label.pop()
+				for _i in range(key.count("[")):
+					_label.pop()
 			else:
 				if first:
 					_label.append_bbcode(tr(key))

game/app/scenes/game_card.gd

@@ -49,12 +49,12 @@ func setup(game_config: ConfigFile):
 		$PopupDialogInfo/VC/TitleSection/HC/HighScore.visible = false
 
 	_label_title.text = game_name
-	_label_description.bbcode_text = game_description
+	_label_description.text = game_description
 	_label_playtime.text = playtime_number
 	_label_playtime_unit.text = playtime_unit
 
 	_popup_label_title.text = game_name
-	_popup_label_description.bbcode_text = game_description
+	_popup_label_description.text = game_description
 	_popup_label_author.text = game_config.get_value("game", "creator")
 	_popup_label_version.text = game_config.get_value("game", "version")
 	_popup_playtime.text = playtime_number

game/app/scenes/game_card.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://app/scenes/game_card.gd" type="Script" id=1]
 [ext_resource path="res://shared/fonts/roboto/roboto_regular.ttf" type="DynamicFontData" id=2]
@@ -15,10 +15,7 @@ font_data = ExtResource( 4 )
 [sub_resource type="DynamicFont" id=9]
 font_data = ExtResource( 2 )
 
-[sub_resource type="StyleBoxFlat" id=12]
-bg_color = Color( 0, 0, 0, 0 )
-shadow_color = Color( 0, 0, 0, 0.133333 )
-shadow_size = 6
+[sub_resource type="StyleBoxEmpty" id=22]
 
 [sub_resource type="ShaderMaterial" id=20]
 shader = ExtResource( 6 )
@@ -30,6 +27,13 @@ font_data = ExtResource( 4 )
 [sub_resource type="DynamicFont" id=11]
 font_data = ExtResource( 2 )
 
+[sub_resource type="StyleBoxFlat" id=23]
+content_margin_left = 16.0
+content_margin_right = 16.0
+content_margin_top = 16.0
+content_margin_bottom = 16.0
+bg_color = Color( 0.203922, 0.2, 0.2, 1 )
+
 [sub_resource type="StyleBoxFlat" id=16]
 border_width_left = 1
 border_color = Color( 0.266667, 0.266667, 0.266667, 1 )
@@ -46,9 +50,9 @@ corner_radius_bottom_left = 1
 [node name="GameCard" type="PanelContainer"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_right = -680.0
-margin_bottom = -389.0
-rect_min_size = Vector2( 320, 180 )
+margin_right = -704.0
+margin_bottom = -413.0
+rect_min_size = Vector2( 320, 187 )
 size_flags_horizontal = 0
 size_flags_vertical = 0
 theme = ExtResource( 7 )
@@ -57,12 +61,12 @@ script = ExtResource( 1 )
 [node name="Card" type="VBoxContainer" parent="."]
 margin_left = 12.0
 margin_top = 12.0
-margin_right = 332.0
-margin_bottom = 199.0
+margin_right = 308.0
+margin_bottom = 175.0
 rect_min_size = Vector2( 296, 0 )
 
 [node name="TitleSection" type="HBoxContainer" parent="Card"]
-margin_right = 320.0
+margin_right = 296.0
 margin_bottom = 64.0
 custom_constants/separation = 10
 
@@ -78,16 +82,16 @@ __meta__ = {
 
 [node name="VC" type="VBoxContainer" parent="Card/TitleSection"]
 margin_left = 74.0
-margin_right = 320.0
+margin_right = 296.0
 margin_bottom = 64.0
 size_flags_horizontal = 3
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="LabelTitle" type="Label" parent="Card/TitleSection/VC"]
-margin_right = 246.0
-margin_bottom = 42.0
+margin_right = 222.0
+margin_bottom = 40.0
 size_flags_vertical = 3
 custom_fonts/font = SubResource( 1 )
 text = "<game title>"
@@ -98,7 +102,7 @@ __meta__ = {
 
 [node name="HC" type="HBoxContainer" parent="Card/TitleSection/VC"]
 margin_top = 45.0
-margin_right = 246.0
+margin_right = 222.0
 margin_bottom = 64.0
 custom_constants/separation = 4
 __meta__ = {
@@ -135,41 +139,40 @@ __meta__ = {
 }
 
 [node name="Description" type="RichTextLabel" parent="Card"]
-margin_top = 67.0
-margin_right = 320.0
-margin_bottom = 149.0
+margin_top = 69.0
+margin_right = 296.0
+margin_bottom = 123.0
 size_flags_vertical = 3
 bbcode_enabled = true
 
 [node name="ButtonSection" type="HBoxContainer" parent="Card"]
-margin_top = 152.0
-margin_right = 320.0
-margin_bottom = 187.0
+margin_top = 128.0
+margin_right = 296.0
+margin_bottom = 163.0
 alignment = 2
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="ButtonInfo" type="Button" parent="Card/ButtonSection"]
-margin_left = 161.0
-margin_right = 237.0
+margin_left = 135.0
+margin_right = 211.0
 margin_bottom = 35.0
 text = "T_INFO"
 
 [node name="ButtonPlay" type="Button" parent="Card/ButtonSection"]
-margin_left = 240.0
-margin_right = 320.0
+margin_left = 216.0
+margin_right = 296.0
 margin_bottom = 35.0
 text = "T_PLAY"
 
 [node name="PopupDialogInfo" type="PopupDialog" parent="."]
-visible = true
 margin_left = 12.0
 margin_top = 12.0
-margin_right = 332.0
-margin_bottom = 199.0
-rect_min_size = Vector2( 320, 0 )
-custom_styles/panel = SubResource( 12 )
+margin_right = 662.0
+margin_bottom = 412.0
+rect_min_size = Vector2( 650, 400 )
+custom_styles/panel = SubResource( 22 )
 __meta__ = {
 "_edit_lock_": true
 }
@@ -201,7 +204,6 @@ margin_left = 12.0
 margin_top = 12.0
 margin_right = 638.0
 margin_bottom = 76.0
-custom_constants/separation = 10
 alignment = 2
 __meta__ = {
 "_edit_use_anchors_": false
@@ -215,22 +217,22 @@ texture = ExtResource( 3 )
 expand = true
 
 [node name="Title" type="VBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC"]
-margin_left = 74.0
-margin_right = 460.0
+margin_left = 69.0
+margin_right = 470.0
 margin_bottom = 64.0
 size_flags_horizontal = 3
 
 [node name="LabelTitle" type="Label" parent="PopupDialogInfo/VC/TitleSection/HC/Title"]
-margin_right = 386.0
-margin_bottom = 42.0
+margin_right = 401.0
+margin_bottom = 40.0
 size_flags_vertical = 3
 custom_fonts/font = SubResource( 10 )
 text = "<game title>"
 valign = 1
 
 [node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC/Title"]
 margin_top = 45.0
-margin_right = 386.0
+margin_right = 401.0
 margin_bottom = 64.0
 custom_constants/separation = 4
 
@@ -286,8 +288,8 @@ __meta__ = {
 }
 
 [node name="HighScore" type="VBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC"]
-margin_left = 470.0
-margin_right = 574.0
+margin_left = 475.0
+margin_right = 579.0
 margin_bottom = 64.0
 size_flags_horizontal = 8
 alignment = 1
@@ -296,9 +298,9 @@ __meta__ = {
 }
 
 [node name="Label" type="Label" parent="PopupDialogInfo/VC/TitleSection/HC/HighScore"]
-margin_top = 11.0
+margin_top = 10.0
 margin_right = 104.0
-margin_bottom = 30.0
+margin_bottom = 29.0
 size_flags_horizontal = 3
 custom_fonts/font = SubResource( 11 )
 text = "T_HIGHSCORE"
@@ -308,9 +310,9 @@ __meta__ = {
 }
 
 [node name="LabelHighscore" type="Label" parent="PopupDialogInfo/VC/TitleSection/HC/HighScore"]
-margin_top = 33.0
+margin_top = 34.0
 margin_right = 104.0
-margin_bottom = 52.0
+margin_bottom = 53.0
 size_flags_horizontal = 3
 custom_fonts/font = SubResource( 11 )
 text = "<highscore>"
@@ -333,44 +335,44 @@ margin_top = 88.0
 margin_right = 650.0
 margin_bottom = 333.0
 size_flags_vertical = 3
+custom_styles/panel = SubResource( 23 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/InfoSection"]
-margin_left = 12.0
-margin_top = 12.0
-margin_right = 638.0
-margin_bottom = 233.0
+margin_left = 15.0
+margin_top = 5.0
+margin_right = 635.0
+margin_bottom = 240.0
 custom_constants/separation = 16
 
 [node name="Description" type="RichTextLabel" parent="PopupDialogInfo/VC/InfoSection/HC"]
-margin_right = 393.0
-margin_bottom = 221.0
+margin_right = 417.0
+margin_bottom = 235.0
 size_flags_horizontal = 3
 size_flags_stretch_ratio = 2.0
 bbcode_enabled = true
 
 [node name="VSeparator" type="VSeparator" parent="PopupDialogInfo/VC/InfoSection/HC"]
-margin_left = 409.0
-margin_right = 413.0
-margin_bottom = 221.0
+margin_left = 433.0
+margin_right = 437.0
+margin_bottom = 235.0
 custom_styles/separator = SubResource( 16 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="VC" type="VBoxContainer" parent="PopupDialogInfo/VC/InfoSection/HC"]
-margin_left = 429.0
-margin_right = 626.0
-margin_bottom = 221.0
+margin_left = 453.0
+margin_right = 620.0
+margin_bottom = 235.0
 size_flags_horizontal = 3
-alignment = 1
+size_flags_stretch_ratio = 0.4
 
 [node name="Label" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
-margin_top = 64.0
-margin_right = 197.0
-margin_bottom = 83.0
+margin_right = 167.0
+margin_bottom = 19.0
 size_flags_vertical = 1
 custom_fonts/font = SubResource( 11 )
 text = "T_AUTHOR"
@@ -379,9 +381,9 @@ __meta__ = {
 }
 
 [node name="LabelAuthor" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
-margin_top = 86.0
-margin_right = 197.0
-margin_bottom = 105.0
+margin_top = 24.0
+margin_right = 167.0
+margin_bottom = 43.0
 size_flags_vertical = 1
 custom_fonts/font = SubResource( 11 )
 text = "<author>"
@@ -391,15 +393,15 @@ __meta__ = {
 }
 
 [node name="Control" type="Control" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
-margin_top = 108.0
-margin_right = 197.0
-margin_bottom = 113.0
+margin_top = 48.0
+margin_right = 167.0
+margin_bottom = 53.0
 rect_min_size = Vector2( 0, 5 )
 
 [node name="Label2" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
-margin_top = 116.0
-margin_right = 197.0
-margin_bottom = 135.0
+margin_top = 58.0
+margin_right = 167.0
+margin_bottom = 77.0
 size_flags_vertical = 1
 custom_fonts/font = SubResource( 11 )
 text = "T_VERSION"
@@ -408,9 +410,9 @@ __meta__ = {
 }
 
 [node name="LabelVersion" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
-margin_top = 138.0
-margin_right = 197.0
-margin_bottom = 157.0
+margin_top = 82.0
+margin_right = 167.0
+margin_bottom = 101.0
 size_flags_vertical = 1
 custom_fonts/font = SubResource( 11 )
 text = "<version>"