mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 20:25:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move fonts around

Browse source
This commit is contained in:
R2DLiu 2020-07-16 18:32:31 -04:00
commit 1d30f94cf1
10 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -17,9 +17,6 @@ project(dolphin-emu)
# unique name here. # unique name here.
set(DISTRIBUTOR "None" CACHE STRING "Name of the distributor.") set(DISTRIBUTOR "None" CACHE STRING "Name of the distributor.")
# Slippi Playback build option
add_compile_definitions(IS_PLAYBACK)
if(UNIX AND NOT APPLE AND NOT ANDROID) if(UNIX AND NOT APPLE AND NOT ANDROID)
option(ENABLE_X11 "Enables X11 Support" ON) option(ENABLE_X11 "Enables X11 Support" ON)
endif() endif()
@ -46,7 +43,10 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence, show the current gam
# launch). # launch).
# * The Dolphin team relies on the data in order to understand the behavior # * The Dolphin team relies on the data in order to understand the behavior
# of our software in the wild. # of our software in the wild.
option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" ON) option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" OFF)
# Enable Playback build for Slippi. TODO: turn off for normal builds
option(SLIPPI_PLAYBACK "Enable Playback changes" ON)
option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON) option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
@ -511,6 +511,11 @@ if(ENABLE_ANALYTICS)
add_definitions(-DUSE_ANALYTICS=1) add_definitions(-DUSE_ANALYTICS=1)
endif() endif()
if(SLIPPI_PLAYBACK)
# Slippi Playback build option
add_compile_definitions(IS_PLAYBACK)
endif()
######################################## ########################################
# Setup include directories (and make sure they are preferred over the Externals) # Setup include directories (and make sure they are preferred over the Externals)
# #

BIN
Data/Sys/GameFiles/GALE01/MnExtAll.dat.diff Normal file
View file

Binary file not shown.

BIN
Data/Sys/GameFiles/GALE01/MnExtAll.usd.diff Normal file
View file

Binary file not shown.

BIN
Data/Sys/GameFiles/GALE01/MnMaAll.dat.diff Normal file
View file

Binary file not shown.

BIN
Data/Sys/GameFiles/GALE01/MnMaAll.usd.diff Normal file
View file

Binary file not shown.

BIN
Data/Sys/GameFiles/GALE01/SdMenu.dat.diff Normal file
View file

Binary file not shown.

BIN
Data/Sys/GameFiles/GALE01/SdMenu.usd.diff Normal file
View file

Binary file not shown.

BIN
Data/Sys/Resources/Roboto-Medium.ttf Normal file
View file

Binary file not shown.

0
fontawesome-webfont.ttf → Data/Sys/Resources/fontawesome-webfont.ttf
View file

4
Source/Core/VideoCommon/RenderBase.cpp
View file

@ -922,10 +922,10 @@ bool Renderer::InitializeImGui()
#ifdef IS_PLAYBACK #ifdef IS_PLAYBACK
ImFontConfig config; ImFontConfig config;
config.MergeMode = true; config.MergeMode = true;
ImGui::GetIO().Fonts->AddFontFromFileTTF("Roboto-Medium.ttf", 14.0f, 0, ImGui::GetIO().Fonts->GetGlyphRangesDefault()); ImGui::GetIO().Fonts->AddFontFromFileTTF((File::GetSysDirectory() + "Resources/Roboto-Medium.ttf").c_str(), 14.0f, 0, ImGui::GetIO().Fonts->GetGlyphRangesDefault());
static const ImWchar icons_ranges[] = { ICON_MIN_FA, ICON_MAX_FA, 0 }; static const ImWchar icons_ranges[] = { ICON_MIN_FA, ICON_MAX_FA, 0 };
ImFontConfig icons_config; icons_config.MergeMode = true; icons_config.PixelSnapH = true; ImFontConfig icons_config; icons_config.MergeMode = true; icons_config.PixelSnapH = true;
ImGui::GetIO().Fonts->AddFontFromFileTTF(FONT_ICON_FILE_NAME_FA, 16.0f, &icons_config, icons_ranges); ImGui::GetIO().Fonts->AddFontFromFileTTF((File::GetSysDirectory() + "Resources/" + FONT_ICON_FILE_NAME_FA).c_str(), 16.0f, &icons_config, icons_ranges);
#endif #endif
// Don't create an ini file. TODO: Do we want this in the future? // Don't create an ini file. TODO: Do we want this in the future?