Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ver 3.3 #13

Merged
merged 1 commit into from
Dec 8, 2019
Merged

ver 3.3 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions resource/interface/DefaultDialog.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,13 @@ guiTypes = {

instantTextBoxType = {
name = "Description"
# position = { x = 52 y = 80 }
position = { x = 40 y = 80 }
textureFile = ""
font = "vic_22_black"
borderSize = {x = 0 y = 0}
text = "UI_MISSING_TEXT"
# maxWidth = 388
maxWidth = 405
maxHeight = 250
format = centre
Expand Down Expand Up @@ -365,11 +367,13 @@ guiTypes = {

instantTextBoxType = {
name = "Description"
# position = { x = 52 y = 80 }
position = { x = 40 y = 80 }
textureFile = ""
font = "vic_22_black"
borderSize = {x = 0 y = 0}
text = "UI_MISSING_TEXT"
# maxWidth = 388
maxWidth = 405
maxHeight = 250
format = centre
Expand Down Expand Up @@ -505,6 +509,8 @@ guiTypes = {
font = "decorative"
borderSize = {x = 0 y = 0}
text = ""
# maxWidth = 75
# maxHeight = 75
maxWidth = 120
maxHeight = 120
format = left
Expand Down Expand Up @@ -887,11 +893,14 @@ guiTypes = {

instantTextBoxType = {
name = "decorative_letter"
# position = { x = 0 y = 0 }
position = { x = 10 y = 0 }
textureFile = ""
font = "decorative_color"
borderSize = { x = 0 y = 0 }
text = ""
# maxWidth = 75
# maxHeight = 75
maxWidth = 120
maxHeight = 120
format = left
Expand Down
1 change: 1 addition & 0 deletions resource/interface/Frontend_settings.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,7 @@ guiTypes = {

checkboxType = {
name = "autosavetocloud_checkbox"
# position = { x = 32 y = 161 }
position = { x = 5000 y = 5000 }
quadTextureSprite = "GFX_checkbox_default"
buttonText = ""
Expand Down
2 changes: 1 addition & 1 deletion resource/interface/crusades.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ guiTypes = {
instantTextBoxType = {
name = "participants_strength"
position = { x = 314 y = 557 }
font = "vic_18"
font = "vic_22"
text = "UI_MISSING_TEXT"
format = center
maxWidth = 145
Expand Down
11 changes: 10 additions & 1 deletion resource/interface/eventwindow.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ guiTypes = {
OverlappingElementsBoxType = {
name = "related_traits2"
position = { x = 288 y = 477 }
size = { x=193 y=40 }
size = { x=195 y=40 }
format = right
}
###
Expand Down Expand Up @@ -1296,11 +1296,15 @@ guiTypes = {
instantTextBoxType =
{
name = "decorative_letter"
# position = { x = 50 y = 274 }
position = { x = 0 y = 270 }
textureFile = ""
font = "decorative"
borderSize = {x = 0 y = 0}
text = ""
# maxWidth = 75
# maxHeight = 75
# format = left
maxWidth = 120
maxHeight = 120
format = right
Expand Down Expand Up @@ -1336,11 +1340,13 @@ guiTypes = {
instantTextBoxType =
{
name = "Description"
# position = { x = 51 y = 351 }
position = { x = 40 y = 356 }
textureFile = ""
font = "vic_18_black"
borderSize = {x = 0 y = 0}
text = "UI_MISSING_TEXT"
# maxWidth = 452
maxWidth = 456
maxHeight = 200
format = left
Expand Down Expand Up @@ -2038,11 +2044,14 @@ guiTypes = {
instantTextBoxType =
{
name = "decorative_letter"
# maxWidth = 452
position = { x = 85 y = 300 }
textureFile = ""
font = "decorative"
borderSize = {x = 0 y = 0}
text = ""
# maxWidth = 75
# maxHeight = 75
maxWidth = 120
maxHeight = 120
format = left
Expand Down
5 changes: 2 additions & 3 deletions resource/interface/fonts.gfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ bitmapfonts = {
}

}


bitmapfont = {
name = "small"
Expand Down Expand Up @@ -144,12 +144,11 @@ bitmapfonts = {
}

}

bitmapfont = {
name = "tahoma_60"
# fontname = "Mapfont"
fontname = "aoyagireisyo60"
# fontname = "crap"
color = 0xff333333
}

Expand Down
56 changes: 47 additions & 9 deletions resource/interface/frontend.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,12 +1251,28 @@ guiTypes = {
clicksound = menu_click
}

guiButtonType = {
name = "extend_featured_ruler"
position = { x = 145 y = -100 }
quadTextureSprite = "GFX_featured_ruler_arrow_round_right"
Orientation = "UPPER_LEFT"
clicksound = click
}

guiButtonType = {
name = "extend_browser_window"
position = { x = -180 y = -100 }
quadTextureSprite = "GFX_featured_ruler_arrow_round_left"
Orientation = "UPPER_LEFT"
clicksound = click
}

###### TEST BUTTONS ######

guiButtonType =
{
name = "single_player_button"
position = { x = -465 y = -110 }
position = { x = -665 y = -110 }
quadTextureSprite ="GFX_big_button_176"
buttonText = "FE_NEW_GAME"
buttonFont = "vic_22"
Expand All @@ -1266,7 +1282,7 @@ guiTypes = {
guiButtonType =
{
name = "load_game_button"
position = { x = -465 y = -60 }
position = { x = -665 y = -60 }
quadTextureSprite ="GFX_big_button_176"
buttonText = "FE_LOAD_GAME"
buttonFont = "vic_22"
Expand All @@ -1276,7 +1292,7 @@ guiTypes = {
guiButtonType =
{
name = "nudge_button"
position = { x = -465 y = -10 }
position = { x = -665 y = -10 }
quadTextureSprite ="GFX_big_button_176"
buttonText = "NUDGE"
buttonFont = "vic_22"
Expand Down Expand Up @@ -1418,12 +1434,24 @@ guiTypes = {
}

instantTextBoxType = {
name = "banner_dlc_text"
position = { x=-122 y=268 }
font = "vic_22_black"
text = ""
maxWidth = 244
maxHeight = 22
name = "banner_dlc_text_even"
position = { x=-135 y=257 }
font = "vic_22"
text = "UI_MISSING_TEXT"
maxWidth = 270
maxHeight = 44
format = centre
fixedsize = yes
alwaystransparent = yes
}

instantTextBoxType = {
name = "banner_dlc_text_odd"
position = { x=-135 y=246 }
font = "vic_22"
text = "UI_MISSING_TEXT"
maxWidth = 270
maxHeight = 66
format = centre
fixedsize = yes
alwaystransparent = yes
Expand Down Expand Up @@ -6512,6 +6540,14 @@ guiTypes = {
downsound = ""
fullscreen=no
Orientation = "CENTER"

iconType = {
name = "background_click_blocker"
spriteType ="GFX_transparent_48"
orientation = "CENTER"
position = {x = -24000 y = -24000 }
scale = 1000
}

iconType = {
name ="menu"
Expand Down Expand Up @@ -6546,11 +6582,13 @@ guiTypes = {

guiButtonType = {
name = "remote_tab"
# position = { x = 118 y = -26 }
position = { x = 5000 y = -5000 }
quadTextureSprite ="GFX_settings_tab_new"
}

instantTextBoxType={
# position = {x = 117 y = -16 }
position = {x = 5000 y = -5000 }
name = "remote_tab_label"
borderSize = {x = 0 y = 0}
Expand Down
2 changes: 2 additions & 0 deletions resource/interface/menubar.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,11 +787,13 @@ guiTypes = {

guiButtonType = {
name = "remote_tab"
# position = { x = 118 y = -26 }
position = { x = 5000 y = -5000 }
quadTextureSprite ="GFX_settings_tab_new"
}

instantTextBoxType={
# position = {x = 117 y = -16 }
position = {x = 5000 y = -5000 }
name = "remote_tab_label"
borderSize = {x = 0 y = 0}
Expand Down
1 change: 1 addition & 0 deletions resource/interface/province.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ guiTypes = {
Orientation = "UPPER_LEFT"
}

# fix order
editBoxType = {
name = "province_name"
position = { x = 72 y = 5 }
Expand Down
9 changes: 8 additions & 1 deletion resource/interface/succession.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ guiTypes = {
instantTextBoxType =
{
name = "dead_decorative_letter"
# position = { x = 44 y = 258 }
position = { x = 40 y = 258 }
font = "decorative"
borderSize = {x = 0 y = 0}
borderSize = {x = 0 y = 0 }
# maxWidth = 75
# maxHeight = 75
maxWidth = 120
maxHeight = 120
format = left
Expand All @@ -39,9 +42,12 @@ guiTypes = {
instantTextBoxType =
{
name = "heir_decorative_letter"
# position = { x = 613 y = 258 }
position = { x = 609 y = 258 }
font = "decorative"
borderSize = {x = 0 y = 0}
# maxWidth = 75
# maxHeight = 75
maxWidth = 120
maxHeight = 120
format = left
Expand All @@ -54,6 +60,7 @@ guiTypes = {
font = "vic_22_black"
borderSize = {x = 0 y = 0}
text = "UI_MISSING_TEXT"
# maxWidth = 340
maxWidth = 293
maxHeight = 134
#format = centre
Expand Down