thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change font cache path, and also include that in the repo. attempt to make it work on mac without proper certs

Browse source
This commit is contained in:
RandomityGuy 2023-01-07 21:44:16 +05:30
parent c823c98b3e
commit 31259b7c6f
17 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/tmp/cache.dat
View file

@ -1 +1 @@
by16:font%2Farial.fntaoy3:veri1y4:timei1659272757y4:hashy40:dc7f069d72e0d1b6b7edfd5b9e6af9c22f9c641cy3:outy23:tmp%2Ffont%2Farial.bfntghy21:font%2FMarkerFelt.fntaoR1i1R2i1671391968R3y40:836b0782cf49a07371611bb95cee54c6d6241b63R5y28:tmp%2Ffont%2FMarkerFelt.bfntghy17:font%2FExpo50.fntaoR1i1R2i1626163037R3y40:f2bb3df897a1cbe1bc70650168d9ecf7de1195f1R5y24:tmp%2Ffont%2FExpo50.bfntghy17:font%2FExpo32.fntaoR1i1R2i1626163037R3y40:d3397b6efedac7bfa90be848901a0167dfd32e7eR5y24:tmp%2Ffont%2FExpo32.bfntghy16:font%2FEXPON.fntaoR1i1R2i1659272757R3y40:ba8ecd55d9475ee0f9d20c9a5189fe6a9c9ff727R5y23:tmp%2Ffont%2FEXPON.bfntghy21:font%2FDomCasualD.fntaoR1i1R2i1659272757R3y40:ea40ffbf969a51d3e653a3d09b450143a814c7eeR5y28:tmp%2Ffont%2FDomCasualD.bfntghy24:font%2FDomCasual32px.fntaoR1i1R2i1626163037R3y40:f9ae7ff4e7b94f78bd6a050e51a9f92fbfdbb40cR5y31:tmp%2Ffont%2FDomCasual32px.bfntghy24:font%2FDomCasual24px.fntaoR1i1R2i1626163037R3y40:f5f86d351ba84a7e1a5f1a459463a4eaf66ca893R5y31:tmp%2Ffont%2FDomCasual24px.bfntghy24:font%2FArialBold14px.fntaoR1i1R2i1626163037R3y40:4f58a547a119d447806129c12b660d267212a382R5y31:tmp%2Ffont%2FArialBold14px.bfntghy18:font%2FArial14.fntaoR1i1R2i1626163037R3y40:5433840b11f487315b7372dd95a79eda5986d558R5y25:tmp%2Ffont%2FArial14.bfntghy23:font%2FArial%20Bold.fntaoR1i1R2i1659272757R3y40:dce4a5edf92262f9ea5540d55271f8423683d064R5y30:tmp%2Ffont%2FArial%20Bold.bfntghh by16:font%2Farial.fntaoy3:veri1y4:timei1659272757y4:hashy40:dc7f069d72e0d1b6b7edfd5b9e6af9c22f9c641cy3:outy23:tmp%2Ffont%2Farial.bfntghy21:font%2FMarkerFelt.fntaoR1i1R2i1672239219R3y40:eb239790210478413cc111da54400b3d38aba041R5y28:tmp%2Ffont%2FMarkerFelt.bfntghy27:font%2FLucida%20Console.fntaoR1i1R2i1672239804R3y40:b56483df1b8f3d8472856b51459d5ce8f3cdfa09R5y34:tmp%2Ffont%2FLucida%20Console.bfntghy16:font%2FEXPON.fntaoR1i1R2i1659272757R3y40:ba8ecd55d9475ee0f9d20c9a5189fe6a9c9ff727R5y23:tmp%2Ffont%2FEXPON.bfntghy21:font%2FDomCasualD.fntaoR1i1R2i1659272757R3y40:ea40ffbf969a51d3e653a3d09b450143a814c7eeR5y28:tmp%2Ffont%2FDomCasualD.bfntghy23:font%2FArial%20Bold.fntaoR1i1R2i1659272757R3y40:dce4a5edf92262f9ea5540d55271f8423683d064R5y30:tmp%2Ffont%2FArial%20Bold.bfntghy23:data%2Ffont%2Farial.fntaoR1i1R2i1659272757R3R4R5y37:data%2Ftmp%2Fdata%2Ffont%2Farial.bfntghy28:data%2Ffont%2FMarkerFelt.fntaoR1i1R2i1672239219R3R8R5y42:data%2Ftmp%2Fdata%2Ffont%2FMarkerFelt.bfntghy34:data%2Ffont%2FLucida%20Console.fntaoR1i1R2i1672239804R3R11R5y48:data%2Ftmp%2Fdata%2Ffont%2FLucida%20Console.bfntghy23:data%2Ffont%2FEXPON.fntaoR1i1R2i1659272757R3R14R5y37:data%2Ftmp%2Fdata%2Ffont%2FEXPON.bfntghy28:data%2Ffont%2FDomCasualD.fntaoR1i1R2i1659272757R3R17R5y42:data%2Ftmp%2Fdata%2Ffont%2FDomCasualD.bfntghy30:data%2Ffont%2FArial%20Bold.fntaoR1i1R2i1659272757R3R20R5y44:data%2Ftmp%2Fdata%2Ffont%2FArial%20Bold.bfntghh

BIN
data/tmp/data/font/Arial Bold.bfnt Normal file
View file

Binary file not shown.

BIN
data/tmp/data/font/DomCasualD.bfnt Normal file
View file

Binary file not shown.

BIN
data/tmp/data/font/EXPON.bfnt Normal file
View file

Binary file not shown.

BIN
data/tmp/data/font/Lucida Console.bfnt Normal file
View file

Binary file not shown.

BIN
data/tmp/data/font/MarkerFelt.bfnt Normal file
View file

Binary file not shown.

BIN
data/tmp/data/font/arial.bfnt Normal file
View file

Binary file not shown.

BIN
data/tmp/font/Arial14.bfnt
View file

Binary file not shown.

BIN
data/tmp/font/ArialBold14px.bfnt
View file

Binary file not shown.

BIN
data/tmp/font/DomCasual24px.bfnt
View file

Binary file not shown.

BIN
data/tmp/font/DomCasual32px.bfnt
View file

Binary file not shown.

BIN
data/tmp/font/Expo32.bfnt
View file

Binary file not shown.

BIN
data/tmp/font/Expo50.bfnt
View file

Binary file not shown.

BIN
data/tmp/font/Lucida Console.bfnt Normal file
View file

Binary file not shown.

BIN
data/tmp/font/MarkerFelt.bfnt
View file

Binary file not shown.

2
package-macos.sh
View file

@ -17,7 +17,7 @@ sed -i "" -e "s/@VERSION@/$1/" "macos-dist/MarbleBlast Platinum.app/Contents/Inf
# Copy binary # Copy binary
cp native/marblegame "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/marblegame" || exit $? cp native/marblegame "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/marblegame" || exit $?
# Copy data # Copy data
cp -r data "macos-dist/" || exit $? cp -r data "macos-dist/MarbleBlast Platinum.app/Contents/Resources/" || exit $?
cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/" cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/"
install_name_tool -change ui.hdll @rpath/ui.hdll \ install_name_tool -change ui.hdll @rpath/ui.hdll \

3
src/ResourceLoader.hx
View file

@ -24,7 +24,7 @@ import src.Console;
class ResourceLoader { class ResourceLoader {
#if (hl && !android) #if (hl && !android)
#if MACOS_BUNDLE #if MACOS_BUNDLE
public static var fileSystem:FileSystem = new TorqueFileSystem(Path.normalize(Path.join([Path.directory(Sys.programPath()), "..", "..", ".."])), null); public static var fileSystem:FileSystem = new TorqueFileSystem(Path.normalize(Path.join([Path.directory(Sys.programPath()), "..", "Resources"])), null);
#else #else
public static var fileSystem:FileSystem = new TorqueFileSystem(".", null); public static var fileSystem:FileSystem = new TorqueFileSystem(".", null);
#end #end
@ -49,6 +49,7 @@ class ResourceLoader {
public static function init(scene2d:h2d.Scene, onLoadedFunc:Void->Void) { public static function init(scene2d:h2d.Scene, onLoadedFunc:Void->Void) {
Console.log("Initializing filesystem"); Console.log("Initializing filesystem");
#if hl #if hl
@:privateAccess @:privateAccess cast(fileSystem, TorqueFileSystem).convert.tmpDir = "data/tmp/";
Console.log("Filesystem Path: " + @:privateAccess cast(fileSystem, TorqueFileSystem).baseDir); Console.log("Filesystem Path: " + @:privateAccess cast(fileSystem, TorqueFileSystem).baseDir);
#end #end
hxd.res.Resource.LIVE_UPDATE = false; // Disable live update to save frames hxd.res.Resource.LIVE_UPDATE = false; // Disable live update to save frames