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

Backport #71330 and #71573 #73836

Merged
merged 2 commits into from
May 16, 2024
Merged

Backport #71330 and #71573 #73836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be27964
Updates the Terminus font
Lumi-Virtual Jan 29, 2024
0c4621f
Draw SDL ASCII lines by default
ZhilkinSerg Feb 6, 2024
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
4 changes: 2 additions & 2 deletions LICENSE-OFL-Terminus-Font.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Copyright (c) 2019 Dimitar Toshkov Zhekov,
Copyright (C) 2020 Dimitar Toshkov Zhekov,
with Reserved Font Name "Terminus Font".

Copyright (c) 2017 tisimst
with Reserved Font Name "Vecterminus"

Copyright (c) 2011 Tilman Blumenbach,
Copyright (c) 2011-2023 Tilman Blumenbach,
with Reserved Font Name "Terminus (TTF)".

This Font Software is licensed under the SIL Open Font License, Version 1.1.
Expand Down
Binary file modified data/font/Terminus.ttf
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2279,7 +2279,7 @@ void options_manager::add_options_graphics()

add( "FONT_WIDTH", page_id, to_translation( "Font width" ),
to_translation( "Set the font width. Requires restart." ),
8, 100, 8, COPT_CURSES_HIDE
6, 100, 8, COPT_CURSES_HIDE
);

add( "FONT_HEIGHT", page_id, to_translation( "Font height" ),
Expand All @@ -2294,7 +2294,7 @@ void options_manager::add_options_graphics()

add( "MAP_FONT_WIDTH", page_id, to_translation( "Map font width" ),
to_translation( "Set the map font width. Requires restart." ),
8, 100, 16, COPT_CURSES_HIDE
6, 100, 16, COPT_CURSES_HIDE
);

add( "MAP_FONT_HEIGHT", page_id, to_translation( "Map font height" ),
Expand All @@ -2309,7 +2309,7 @@ void options_manager::add_options_graphics()

add( "OVERMAP_FONT_WIDTH", page_id, to_translation( "Overmap font width" ),
to_translation( "Set the overmap font width. Requires restart." ),
8, 100, 16, COPT_CURSES_HIDE
6, 100, 16, COPT_CURSES_HIDE
);

add( "OVERMAP_FONT_HEIGHT", page_id, to_translation( "Overmap font height" ),
Expand Down
Loading