Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

Commit

Permalink
Update Overpass to custom build of someone's unmerged PR fixing height
Browse files Browse the repository at this point in the history 
RedHatOfficial/Overpass#66
  • Loading branch information
@ForLoveOfCats
ForLoveOfCats committed Nov 23, 2019
1 parent 1a8b0e2 commit b0b171f
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 15 deletions.
3 changes: 2 additions & 1 deletion UI/Fonts/DebugFont.tres
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=1]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=1]


[resource]
size = 14
Expand Down
Binary file added UI/Fonts/Overpass.otf
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion UI/Fonts/OverpassSemibold.tres → UI/Fonts/Overpass.tres
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=1]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=1]


[resource]
size = 18
Expand Down
Binary file removed UI/Fonts/OverpassSemibold.otf
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion UI/ItemCountLabel.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://UI/Theme/Theme.tres" type="Theme" id=1]
[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=2]


[sub_resource type="DynamicFont" id=1]
size = 22
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/ConnectMenu/ConnectMenu.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
[ext_resource path="res://UI/Menu/Pieces/SmallTitlePiece.tscn" type="PackedScene" id=2]
[ext_resource path="res://UI/Menu/Pieces/LabelPiece.tscn" type="PackedScene" id=3]
[ext_resource path="res://UI/Menu/Pieces/SpacerLabelPiece.tscn" type="PackedScene" id=4]
[ext_resource path="res://UI/Fonts/OverpassSemibold.tres" type="DynamicFont" id=5]
[ext_resource path="res://UI/Fonts/Overpass.tres" type="DynamicFont" id=5]
[ext_resource path="res://UI/Menu/Pieces/ButtonPiece.tscn" type="PackedScene" id=6]


[node name="VBoxContainer" type="VBoxContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/HelpMenu/HelpMenu.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
[ext_resource path="res://UI/Menu/Pieces/SmallTitlePiece.tscn" type="PackedScene" id=2]
[ext_resource path="res://UI/Menu/Pieces/SpacerLabelPiece.tscn" type="PackedScene" id=3]
[ext_resource path="res://UI/Menu/Pieces/LabelPiece.tscn" type="PackedScene" id=4]
[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=5]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=5]
[ext_resource path="res://UI/Menu/Pieces/ButtonPiece.tscn" type="PackedScene" id=6]


[sub_resource type="DynamicFont" id=1]
size = 24
font_data = ExtResource( 5 )
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/HostMenu/SlotButton.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.tres" type="DynamicFont" id=1]
[ext_resource path="res://UI/Fonts/Overpass.tres" type="DynamicFont" id=1]
[ext_resource path="res://UI/Menu/HostMenu/SlotButton.cs" type="Script" id=2]
[ext_resource path="res://UI/Menu/Pieces/MouseOverSfx.tscn" type="PackedScene" id=3]


[node name="Button" type="Button"]
margin_right = 12.0
margin_bottom = 20.0
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/MainMenu/MainMenu.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[gd_scene load_steps=7 format=2]

[ext_resource path="res://UI/Menu/MainMenu/MainMenu.cs" type="Script" id=1]
[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=2]
[ext_resource path="res://UI/Menu/Pieces/LabelPiece.tscn" type="PackedScene" id=3]
[ext_resource path="res://UI/Menu/Pieces/SpacerLabelPiece.tscn" type="PackedScene" id=4]
[ext_resource path="res://UI/Menu/Pieces/ButtonPiece.tscn" type="PackedScene" id=5]


[sub_resource type="DynamicFont" id=1]
size = 90
font_data = ExtResource( 2 )
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/NickMenu/NickMenu.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
[ext_resource path="res://UI/Menu/NickMenu/NickMenu.cs" type="Script" id=1]
[ext_resource path="res://UI/Menu/Pieces/SmallTitlePiece.tscn" type="PackedScene" id=2]
[ext_resource path="res://UI/Menu/Pieces/LabelPiece.tscn" type="PackedScene" id=3]
[ext_resource path="res://UI/Fonts/OverpassSemibold.tres" type="DynamicFont" id=4]
[ext_resource path="res://UI/Fonts/Overpass.tres" type="DynamicFont" id=4]
[ext_resource path="res://UI/Menu/Pieces/ButtonPiece.tscn" type="PackedScene" id=5]


[node name="VBoxContainer" type="VBoxContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/Pieces/ButtonPiece.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.tres" type="DynamicFont" id=1]
[ext_resource path="res://UI/Fonts/Overpass.tres" type="DynamicFont" id=1]
[ext_resource path="res://UI/Menu/Pieces/ButtonPiece.cs" type="Script" id=2]
[ext_resource path="res://UI/Menu/Pieces/MouseOverSfx.tscn" type="PackedScene" id=3]


[node name="Button" type="Button"]
margin_right = 12.0
margin_bottom = 20.0
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/Pieces/LabelPiece.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.tres" type="DynamicFont" id=1]
[ext_resource path="res://UI/Fonts/Overpass.tres" type="DynamicFont" id=1]


[node name="Label" type="Label"]
margin_right = 40.0
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/Pieces/SmallSpacerLabelPiece.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=1]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=1]


[sub_resource type="DynamicFont" id=1]
size = 9
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/Pieces/SmallTitlePiece.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=1]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=1]


[sub_resource type="DynamicFont" id=1]
size = 40
Expand Down
3 changes: 2 additions & 1 deletion UI/Menu/Pieces/SpacerLabelPiece.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.tres" type="DynamicFont" id=1]
[ext_resource path="res://UI/Fonts/Overpass.tres" type="DynamicFont" id=1]


[node name="SpacerLabel" type="Label"]
margin_right = 40.0
Expand Down
3 changes: 2 additions & 1 deletion UI/NickLabel.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=1]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=1]


[sub_resource type="DynamicFont" id=1]
size = 15
Expand Down
2 changes: 1 addition & 1 deletion UI/Theme/Theme.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[ext_resource path="res://UI/Theme/ButtonPressed.tres" type="StyleBox" id=4]
[ext_resource path="res://UI/Theme/ScrollBarBody.tres" type="StyleBox" id=5]
[ext_resource path="res://UI/Theme/LineEdit.tres" type="StyleBox" id=6]
[ext_resource path="res://UI/Fonts/OverpassSemibold.otf" type="DynamicFontData" id=7]
[ext_resource path="res://UI/Fonts/Overpass.otf" type="DynamicFontData" id=7]

[sub_resource type="StyleBoxEmpty" id=1]

Expand Down

0 comments on commit b0b171f

Please sign in to comment.