Skip to content

Commit

Permalink
Updates assets and adds Rockso to the credits.
Browse files Browse the repository at this point in the history
  • Loading branch information
SternXD committed Jun 24, 2024
1 parent 2826bd8 commit cd06eb9
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 11 deletions.
Binary file modified bin/resources/fullscreenui/game-list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/resources/fullscreenui/start-bios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/resources/icons/AppIconLarge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pcsx2-winrt/Assets/SplashScreen.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pcsx2-winrt/Assets/Square44x44Logo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pcsx2-winrt/Assets/StoreLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions pcsx2-winrt/pcsx2-winrt.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,17 @@
</ItemGroup>
<ItemGroup>
<Image Include="Assets\LockScreenLogo.scale-200.png" />
<Image Include="Assets\SplashScreen.scale-200.png" />
<Image Include="Assets\SplashScreen.scale-200.png">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="Assets\Square150x150Logo.scale-200.png" />
<Image Include="Assets\Square44x44Logo.scale-200.png" />
<Image Include="Assets\Square44x44Logo.scale-200.png">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Image Include="Assets\StoreLogo.png" />
<Image Include="Assets\StoreLogo.png">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="Assets\Wide310x150Logo.scale-200.png" />
<Image Include="resources\cover-placeholder.png" />
<Image Include="resources\fullscreenui\applications-system.png" />
Expand Down
2 changes: 1 addition & 1 deletion pcsx2-winrt/pcsx2-winrt.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
<Font Include="resources\fonts\promptfont.otf" />
</ItemGroup>
<ItemGroup>
<None Include="pcsx2-winrt_TemporaryKey.pfx" />
<None Include="PropertySheet.props" />
<None Include="resources\patches.zip">
<Filter>resources</Filter>
Expand Down Expand Up @@ -246,6 +245,7 @@
</None>
<None Include="xbsx2_TemporaryKey.pfx" />
<None Include="packages.config" />
<None Include="xbsx2-winrt_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Text Include="resources\game_controller_db.txt">
Expand Down
16 changes: 9 additions & 7 deletions pcsx2/ImGui/FullscreenUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ void FullscreenUI::DrawLandingWindow()
QueueResetFocus();
}
ImGui::SetCursorPos(ImVec2(10, ImGui::GetWindowSize().y - 30));
ImGui::Text("XBSX2.0 is an unofficial fork of PCSX2. Please do not contact PCSX2 for any help with Xbox/XBSX2 related issues.");
ImGui::Text("XBSX2 is an unofficial fork of PCSX2. Please do not contact PCSX2 for any help with Xbox/XBSX2 related issues.");
}
EndHorizontalMenu();

Expand Down Expand Up @@ -6518,7 +6518,7 @@ void FullscreenUI::DrawGameListSettingsWindow()
FSUI_CSTR("Reverses the game list sort order from the default (usually ascending to descending)."), "UI",
"FullscreenUIGameSortReverse", false);
}

#ifndef WINRT_XBOX
MenuHeading(FSUI_CSTR("Cover Settings"));
{
DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_FOLDER, "Covers Directory"), "Folders", "Covers", EmuFolders::Covers);
Expand All @@ -6528,7 +6528,7 @@ void FullscreenUI::DrawGameListSettingsWindow()
Host::OnCoverDownloaderOpenRequested();
}
}

#endif
MenuHeading(FSUI_CSTR("Operations"));
{
if (MenuButton(
Expand Down Expand Up @@ -6631,13 +6631,13 @@ void FullscreenUI::DrawAboutWindow()
{
ImGui::SetNextWindowSize(LayoutScale(1000.0f, 580.0f));
ImGui::SetNextWindowPos(ImGui::GetIO().DisplaySize * 0.5f, ImGuiCond_Always, ImVec2(0.5f, 0.5f));
ImGui::OpenPopup("About XBSX2.0");
ImGui::OpenPopup("About XBSX2");

ImGui::PushFont(g_large_font);
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, LayoutScale(10.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, LayoutScale(30.0f, 30.0f));

if (ImGui::BeginPopupModal("About XBSX2.0", &s_about_window_open, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize))
if (ImGui::BeginPopupModal("About XBSX2", &s_about_window_open, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize))
{
ImGui::NewLine();

Expand All @@ -6660,7 +6660,9 @@ void FullscreenUI::DrawAboutWindow()

ImGui::TextWrapped("Thank you to the PCSX2 team for their hard work on the PCSX2 project.");

ImGui::TextWrapped("Thank you to worleydl for help with the Achievement Login code");
ImGui::TextWrapped("Thank you to worleydl for the Achievement Login code.");

ImGui::TextWrapped("Thank you to Rockso for remaking the old PCSX2 assets.");

ImGui::NewLine();

Expand All @@ -6669,7 +6671,7 @@ void FullscreenUI::DrawAboutWindow()
if (ActiveButton(ICON_FA_PERSON_BOOTH "Discord", false))
ExitFullscreenAndOpenURL(XBOXEMULATIONHUB_DISCORD_URL);

if (ActiveButton(ICON_FA_BUG " XBSX2.0 GitHub Repository", false))
if (ActiveButton(ICON_FA_BUG " XBSX2 GitHub Repository", false))
ExitFullscreenAndOpenURL(XBSX2_GITHUB_URL);

if (ActiveButton(FSUI_ICONSTR(ICON_FA_NEWSPAPER, "License"), false))
Expand Down

0 comments on commit cd06eb9

Please sign in to comment.