Merge branch 'ps4' of https://git.neolegacy.dev/pieeebot/cafeberry into ps4
# Conflicts: # Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp # Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp # Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp # Minecraft.Client/OrbisMedia/strings.h # MinecraftConsoles.sln
This commit is contained in:
@@ -154,7 +154,7 @@ void SonyLeaderboardManager::scoreboardThreadInternal()
|
||||
// The following NP call should be reserved for asynchronous multiplayer modes that require PS Plus to be accessed.
|
||||
//
|
||||
// Note 2:
|
||||
// The message is not displayed with a user without PlayStation®Plus subscription and they are able to access the Leaderboards.
|
||||
// The message is not displayed with a user without PlayStation�Plus subscription and they are able to access the Leaderboards.
|
||||
|
||||
// NotifyAsyncPlusFeature();
|
||||
|
||||
|
||||
Binary file not shown.
@@ -6,13 +6,13 @@ param(
|
||||
Write-Host "Orbis Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
|
||||
|
||||
$directories = @(
|
||||
"music",
|
||||
"Orbis",
|
||||
"Common",
|
||||
"Common\Media",
|
||||
"Common\Tutorial",
|
||||
"Common\res",
|
||||
"Sound"
|
||||
"PS4_GAME\music",
|
||||
"PS4_GAME\Orbis",
|
||||
"PS4_GAME\Common",
|
||||
"PS4_GAME\Common\Media",
|
||||
"PS4_GAME\Common\Tutorial",
|
||||
"PS4_GAME\Common\res",
|
||||
"PS4_GAME\Orbis\Sound"
|
||||
)
|
||||
|
||||
foreach ($dir in $directories) {
|
||||
@@ -27,7 +27,7 @@ $folderCopies = @(
|
||||
@{ Source = "PS3\Sound"; Dest = "PS4_GAME\Sound" },
|
||||
@{ Source = "Common\Postbuilds\Contents\Orbis\sce_module"; Dest = "PS4_GAME\sce_module" },
|
||||
@{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" },
|
||||
@{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" },
|
||||
@{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" }
|
||||
)
|
||||
|
||||
foreach ($copy in $folderCopies) {
|
||||
@@ -41,7 +41,7 @@ foreach ($copy in $folderCopies) {
|
||||
|
||||
$fileCopies = @(
|
||||
@{ Source = "Orbis\PS4ProductCodes.bin"; Dest = "PS4_GAME\Orbis\PS4ProductCodes.bin" },
|
||||
@{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" },
|
||||
@{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" }
|
||||
)
|
||||
|
||||
foreach ($copy in $fileCopies) {
|
||||
|
||||
Reference in New Issue
Block a user