forked from pieeebot/cafeberry
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 str1k3r
|
3866e525f1 | ||
|
str1k3r
|
9254fbcdb3 |
@@ -38,7 +38,7 @@ jobs:
|
||||
/m
|
||||
|
||||
- name: Zip Build
|
||||
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.map"
|
||||
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
|
||||
|
||||
- name: Stage artifacts
|
||||
run: |
|
||||
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
} elseif ("${{ matrix.platform }}" -eq "PSVita") {
|
||||
7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*"
|
||||
} elseif ("${{ matrix.platform }}" -eq "PS3") {
|
||||
7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/*" "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.map"
|
||||
7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/*" "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
|
||||
} elseif ("${{ matrix.platform }}" -eq "Xbox360") {
|
||||
7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb"
|
||||
} else {
|
||||
|
||||
+13
-20
@@ -1,33 +1,25 @@
|
||||
/*Debug
|
||||
/*Release
|
||||
/*ContentPackage
|
||||
/*ContentPackage_NO_TU
|
||||
/*ContentPackage_SYMBOLS
|
||||
/*ReleaseForArt
|
||||
.vs
|
||||
/x64
|
||||
/ipch
|
||||
.vs/
|
||||
.vscode
|
||||
/*Debug
|
||||
/*Release*
|
||||
/*ContentPackage*
|
||||
|
||||
# Minecraft.Client
|
||||
/Minecraft.Client/x64/
|
||||
/Minecraft.Client/x64
|
||||
/Minecraft.Client/x64_*
|
||||
/Minecraft.Client/*Debug
|
||||
/Minecraft.Client/*Release
|
||||
/Minecraft.Client/*ContentPackage
|
||||
/Minecraft.Client/*ContentPackage_NO_TU
|
||||
/Minecraft.Client/*ContentPackage_SYMBOLS
|
||||
/Minecraft.Client/*ReleaseForArt
|
||||
/Minecraft.Client/*Release*
|
||||
/Minecraft.Client/*ContentPackage*
|
||||
/Minecraft.Client/Windows64/GameHDD
|
||||
|
||||
# Minecraft.world
|
||||
/Minecraft.World/x64/
|
||||
/Minecraft.World/x64
|
||||
/Minecraft.World/x64_*
|
||||
/Minecraft.World/*Debug
|
||||
/Minecraft.World/*Release
|
||||
/Minecraft.World/*ContentPackage
|
||||
/Minecraft.World/*ContentPackage_NO_TU
|
||||
/Minecraft.World/*ContentPackage_SYMBOLS
|
||||
/Minecraft.World/*ReleaseForArt
|
||||
/Minecraft.World/*Release*
|
||||
/Minecraft.World/*ContentPackage*
|
||||
|
||||
# PS3 SPU Tasks
|
||||
/Minecraft.Client/PS3/SPU_Tasks/objFiles
|
||||
@@ -45,4 +37,5 @@
|
||||
*-app
|
||||
*.sdf
|
||||
*.opensdf
|
||||
*.v11.suo
|
||||
*.v11.suo
|
||||
*.vcxproj.user
|
||||
@@ -528,58 +528,37 @@ void UIController::loadSkins()
|
||||
}
|
||||
|
||||
#endif
|
||||
// Every platform has one of these, so nothing shared
|
||||
if(m_fScreenHeight==1080.0f)
|
||||
|
||||
// str1k3r - Fixes 720p/480p Crashes on Windows64, also allows this to be used on 1080p consoles instead of just Windows64
|
||||
// This also cleans up some 4J code and turns 3 if statements into 1.
|
||||
if (m_fScreenHeight >= 1080.0f)
|
||||
{
|
||||
m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskinHD.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
|
||||
m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
|
||||
m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
|
||||
m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
|
||||
m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskin.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
|
||||
m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
|
||||
m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
|
||||
m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
|
||||
m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
|
||||
}
|
||||
|
||||
#if defined(__PS3__) || defined(__PSVITA__)
|
||||
m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
|
||||
m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
|
||||
m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
|
||||
m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
|
||||
m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
|
||||
#endif
|
||||
|
||||
#if ( defined(_WINDOWS64) || defined(_DURANGO) || defined(__ORBIS__) )
|
||||
|
||||
#if defined(_WINDOWS64)
|
||||
// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
|
||||
#ifndef _FINAL_BUILD
|
||||
m_iggyLibraries[eLibraryFallback_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
|
||||
m_iggyLibraries[eLibraryFallback_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
|
||||
m_iggyLibraries[eLibraryFallback_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
|
||||
m_iggyLibraries[eLibraryFallback_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
|
||||
m_iggyLibraries[eLibraryFallback_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
|
||||
m_iggyLibraries[eLibraryFallback_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
|
||||
m_iggyLibraries[eLibraryFallback_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
|
||||
m_iggyLibraries[eLibraryFallback_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
|
||||
m_iggyLibraries[eLibraryFallback_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
|
||||
m_iggyLibraries[eLibraryFallback_Default] = loadSkin(L"skin.swf", L"skin.swf");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
|
||||
m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
|
||||
m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
|
||||
m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
|
||||
m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
|
||||
m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
|
||||
#endif // HD platforms
|
||||
}
|
||||
|
||||
IggyLibrary UIController::loadSkin(const wstring &skinPath, const wstring &skinName)
|
||||
|
||||
@@ -96,24 +96,7 @@ private:
|
||||
eLibrary_HUD,
|
||||
eLibrary_Tooltips,
|
||||
eLibrary_Default,
|
||||
|
||||
#if ( defined(_WINDOWS64) )
|
||||
// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
|
||||
#ifndef _FINAL_BUILD
|
||||
eLibraryFallback_Platform,
|
||||
eLibraryFallback_GraphicsDefault,
|
||||
eLibraryFallback_GraphicsHUD,
|
||||
eLibraryFallback_GraphicsInGame,
|
||||
eLibraryFallback_GraphicsTooltips,
|
||||
eLibraryFallback_GraphicsLabels,
|
||||
eLibraryFallback_Labels,
|
||||
eLibraryFallback_InGame,
|
||||
eLibraryFallback_HUD,
|
||||
eLibraryFallback_Tooltips,
|
||||
eLibraryFallback_Default,
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
eLibrary_Count,
|
||||
};
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
</Project>
|
||||
@@ -1,3 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
</Project>
|
||||
@@ -7,13 +7,16 @@ Cafeberry is a project aiming to update the December 17th 2014 codebase (mostly)
|
||||
| Platform | Development Status | Known Issues |
|
||||
| :------------- | :-------------------- | :------------------------------------------------------------------------ |
|
||||
| PS3 | Active | SPU variants for TU19 blocks are missing, needs to be further optimized. |
|
||||
| Xbox 360 | On hold | Havent tested, should work? |
|
||||
| PS4 | Active | Only buildable on Windows 7 With 1.70 SDK. See Notes |
|
||||
| Xbox 360 | Active | Works, Crashes when using updated XUI Scenes. See Notes |
|
||||
| PS4 | Active | Only Easily buildable on Windows 7. See Notes |
|
||||
| Xbox One | On hold | Needs to be re-coded to run on Developer Mode UWP instead. |
|
||||
| PS Vita | Active | Only buildable on Windows 7 With 3.75 SDK. |
|
||||
| PSVita | Active | Buildable With 3.570 or 3.750 SDK. |
|
||||
| Wii U & Switch | Work in progress | UI System (ImXui) is still in progress, need to decompile the rest. |
|
||||
|
||||
**Notes:**
|
||||
- **PS4:** Can't be built on Windows 10+ because the 1.70 SDK only supports Windows 7, solutions:
|
||||
1. Attempt to add support for 4.50 SDK (difficult or unlikely to work)
|
||||
2. Getting the 1.70 SDK on Windows 10+ (annoying to do)
|
||||
2. Force the 1.70 SDK on Windows 10+ (Takes 5-15m)
|
||||
- **Xbox 360:** Needs XUI Scenes from TU18+, solutions:
|
||||
1. Get XURS from built .xex's and turn them back into XUI file's
|
||||
2. Recreate XUI scenes based off of Iggy scenes from TU57+
|
||||
Reference in New Issue
Block a user