mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 11:03:45 +01:00
Merge branch 'master' into TemporaryHackishBranch
# Conflicts: # Core/SaveState.cpp # UI/ControlMappingScreen.cpp # UI/CwCheatScreen.cpp # UI/GameSettingsScreen.cpp # UI/PauseScreen.cpp # android/assets/ppge_atlas.zim # android/assets/ppge_atlas_luna.meta # android/assets/ui_atlas.zim # android/assets/ui_atlas_luna.meta # android/res/drawable-hdpi/ic_launcher.png # android/res/drawable-ldpi/ic_launcher.png # android/res/drawable-mdpi/ic_launcher.png # android/res/drawable-xhdpi/ic_launcher.png # android/res/drawable-xhdpi/tv_banner.png # android/res/drawable-xxhdpi/ic_launcher.png # android/res/drawable/ic_banner.png # assets/ppge_atlas.zim # assets/ppge_atlas_luna.meta # assets/ui_atlas.zim # assets/ui_atlas_luna.meta
This commit is contained in:
commit
0ee43104e4
598 files changed
+50337
-26888
No files matched your search
+6
-6
@@ -589,10 +589,10 @@ void SystemInfoScreen::CreateViews() {
|
||||
|
||||
storage->Add(new ItemHeader(si->T("Directories")));
|
||||
// Intentionally non-translated
|
||||
storage->Add(new InfoItem("MemStickDirectory", g_Config.memStickDirectory));
|
||||
storage->Add(new InfoItem("InternalDataDirectory", g_Config.internalDataDirectory));
|
||||
storage->Add(new InfoItem("AppCacheDir", g_Config.appCacheDirectory));
|
||||
storage->Add(new InfoItem("ExtStorageDir", g_Config.externalDirectory));
|
||||
storage->Add(new InfoItem("MemStickDirectory", g_Config.memStickDirectory.ToVisualString()));
|
||||
storage->Add(new InfoItem("InternalDataDirectory", g_Config.internalDataDirectory.ToVisualString()));
|
||||
storage->Add(new InfoItem("AppCacheDir", g_Config.appCacheDirectory.ToVisualString()));
|
||||
storage->Add(new InfoItem("ExtStorageDir", g_Config.externalDirectory.ToVisualString()));
|
||||
|
||||
#if PPSSPP_PLATFORM(ANDROID)
|
||||
storage->Add(new InfoItem("ExtFilesDir", g_extFilesDir));
|
||||
@@ -1184,7 +1184,7 @@ UI::EventReturn FrameDumpTestScreen::OnLoadDump(UI::EventParams ¶ms) {
|
||||
// Our disc streaming functionality detects the URL and takes over and handles loading framedumps well,
|
||||
// except for some reason the game ID.
|
||||
// TODO: Fix that since it can be important for compat settings.
|
||||
LaunchFile(screenManager(), url);
|
||||
LaunchFile(screenManager(), Path(url));
|
||||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
@@ -1192,7 +1192,7 @@ void FrameDumpTestScreen::update() {
|
||||
UIScreen::update();
|
||||
|
||||
if (!listing_) {
|
||||
listing_ = g_DownloadManager.StartDownload(framedumpsBaseUrl, "");
|
||||
listing_ = g_DownloadManager.StartDownload(framedumpsBaseUrl, Path());
|
||||
}
|
||||
|
||||
if (listing_ && listing_->Done() && files_.empty()) {
|
||||
|
||||
Reference in new issue
Block a user