diff --git a/desktop/content-builder/builder_osx/crashhandler.dylib b/desktop/content-builder/builder_osx/crashhandler.dylib index 35bc6ae7..a6c784bf 100755 Binary files a/desktop/content-builder/builder_osx/crashhandler.dylib and b/desktop/content-builder/builder_osx/crashhandler.dylib differ diff --git a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Breakpad b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Breakpad index 9cd52e4c..00ed1fcc 100755 Binary files a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Breakpad and b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Breakpad differ diff --git a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Info.plist b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Info.plist index 74040596..041e4a89 100755 --- a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Info.plist +++ b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14E7f + 15B42 CFBundleDevelopmentRegion English CFBundleExecutable @@ -18,12 +18,16 @@ FMWK CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1.0 DTCompiler com.apple.compilers.llvm.clang.1_0.compiler DTPlatformBuild - 6D2105 + 7B1005 DTPlatformVersion GM DTSDKBuild @@ -31,8 +35,8 @@ DTSDKName macosx10.9 DTXcode - 0632 + 0711 DTXcodeBuild - 6D2105 + 7B1005 diff --git a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Inspector b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Inspector index f3572e23..84d9e681 100755 Binary files a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Inspector and b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/Inspector differ diff --git a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib index be1883ee..3162e0cf 100755 Binary files a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib and b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib differ diff --git a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist index 28d5e281..a64bf66c 100755 --- a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist +++ b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14E7f + 15B42 CFBundleDevelopmentRegion English CFBundleDisplayName @@ -22,12 +22,16 @@ APPL CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1.0 DTCompiler com.apple.compilers.llvm.clang.1_0.compiler DTPlatformBuild - 6D2105 + 7B1005 DTPlatformVersion GM DTSDKBuild @@ -35,9 +39,9 @@ DTSDKName macosx10.9 DTXcode - 0632 + 0711 DTXcodeBuild - 6D2105 + 7B1005 LSHasLocalizedDisplayName NSMainNibFile diff --git a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender index 25260ed9..f7854531 100755 Binary files a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender and b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender differ diff --git a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib index 4a5d54f9..372305a0 100755 Binary files a/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib and b/desktop/content-builder/builder_osx/frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib differ diff --git a/desktop/content-builder/builder_osx/libaudio.dylib b/desktop/content-builder/builder_osx/libaudio.dylib index d1d53b79..c651ead2 100755 Binary files a/desktop/content-builder/builder_osx/libaudio.dylib and b/desktop/content-builder/builder_osx/libaudio.dylib differ diff --git a/desktop/content-builder/builder_osx/libtier0_s.dylib b/desktop/content-builder/builder_osx/libtier0_s.dylib index 0bea0eca..0ac38b74 100755 Binary files a/desktop/content-builder/builder_osx/libtier0_s.dylib and b/desktop/content-builder/builder_osx/libtier0_s.dylib differ diff --git a/desktop/content-builder/builder_osx/libvstdlib_s.dylib b/desktop/content-builder/builder_osx/libvstdlib_s.dylib index 9551a4be..549270c9 100755 Binary files a/desktop/content-builder/builder_osx/libvstdlib_s.dylib and b/desktop/content-builder/builder_osx/libvstdlib_s.dylib differ diff --git a/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed b/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed index a3e14b93..ca38652b 100644 --- a/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed +++ b/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed @@ -1,69 +1,69 @@ -crashhandler.dylib,279348;1447786394;3902860675 +crashhandler.dylib,318688;1454525474;1577567288 Frameworks/Breakpad.framework/Breakpad,-2;1416854152;1199629470 Frameworks/Breakpad.framework/Headers,-2;1416854152;2393740531 Frameworks/Breakpad.framework/Resources,-2;1416854152;2265073452 -Frameworks/Breakpad.framework/Versions/,-1;1437437974;0 -Frameworks/Breakpad.framework/Versions/A/,-1;1437437974;0 -Frameworks/Breakpad.framework/Versions/A/Breakpad,195740;1437437974;835510279 -Frameworks/Breakpad.framework/Versions/A/Headers/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/,-1;1450214442;0 +Frameworks/Breakpad.framework/Versions/A/,-1;1450214442;0 +Frameworks/Breakpad.framework/Versions/A/Breakpad,154844;1450214442;3587522437 +Frameworks/Breakpad.framework/Versions/A/Headers/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Headers/Breakpad.h,14831;1437437974;2482042494 Frameworks/Breakpad.framework/Versions/A/Headers/BreakpadDefines.h,3958;1437437974;963933939 -Frameworks/Breakpad.framework/Versions/A/Resources/,-1;1437437974;0 -Frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib,228860;1437437974;209348409 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/,-1;1437437974;0 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/,-1;1437437974;0 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist,1470;1437437974;2469926133 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/,-1;1437437974;0 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender,174604;1437437974;410442872 +Frameworks/Breakpad.framework/Versions/A/Resources/,-1;1450214442;0 +Frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib,200276;1450214442;3538926970 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/,-1;1450214442;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/,-1;1450214442;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist,1558;1450214442;3758020374 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/,-1;1450214442;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender,142184;1450214442;3966900743 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/PkgInfo,8;1416854152;1535771721 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/,-1;1437437974;0 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib,12668;1437437974;3540142285 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/,-1;1450214442;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib,12571;1450214442;2787304334 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/crash_report_sender.icns,170816;1416854152;915185259 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/da.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/da.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/da.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/da.lproj/Localizable.strings,2478;1416854152;654383998 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/de.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/de.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/de.lproj/InfoPlist.strings,196;1416854152;2366931700 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/de.lproj/Localizable.strings,2796;1416854152;3396540296 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/English.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/English.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/English.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Localizable.strings,2478;1416854152;1913686460 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/es.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/es.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/es.lproj/InfoPlist.strings,188;1416854152;1451028526 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/es.lproj/Localizable.strings,2628;1416854152;417724762 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/Localizable.strings,2744;1416854152;2241105537 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/goArrow.png,3591;1416854152;3106003257 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/it.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/it.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/it.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/it.lproj/Localizable.strings,2640;1416854152;787942299 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/Localizable.strings,1842;1416854152;2544048415 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/Localizable.strings,2596;1416854152;196822744 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/no.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/no.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/no.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/no.lproj/Localizable.strings,2534;1416854152;1646896514 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/InfoPlist.strings,188;1416854152;2672724807 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/Localizable.strings,2682;1416854152;2843672434 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/InfoPlist.strings,160;1416854152;4177083103 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/Localizable.strings,2638;1416854152;1197651611 -Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/,-1;1437437974;0 +Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/,-1;1450214442;0 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/InfoPlist.strings,172;1416854152;1805770543 Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/Localizable.strings,2480;1416854152;3918966399 -Frameworks/Breakpad.framework/Versions/A/Resources/Info.plist,1138;1437437974;573432830 -Frameworks/Breakpad.framework/Versions/A/Resources/Inspector,84312;1437437974;2362423737 +Frameworks/Breakpad.framework/Versions/A/Resources/Info.plist,1226;1450214442;3314697932 +Frameworks/Breakpad.framework/Versions/A/Resources/Inspector,55676;1450214442;2198649636 Frameworks/Breakpad.framework/Versions/Current,-2;1416854152;3554254475 -libaudio.dylib,391556;1447786394;1866343963 +libaudio.dylib,391556;1454525474;748291032 libsteaminput.dylib,84960;1447207942;3573219844 -libtier0_s.dylib,448128;1447786394;1762325227 -libvstdlib_s.dylib,600304;1447786394;1087205092 -public/,-1;1447207980;0 +libtier0_s.dylib,448120;1454525474;3709506266 +libvstdlib_s.dylib,600304;1454525474;4047908936 +public/,-1;1453932618;0 public/steambootstrapper_brazilian.txt,7812;1447207980;1267217285 public/steambootstrapper_czech.txt,7848;1416854196;3862545155 public/steambootstrapper_danish.txt,7516;1416854196;1370321954 @@ -84,14 +84,15 @@ public/steambootstrapper_portuguese.txt,7684;1447207980;3851793832 public/steambootstrapper_romanian.txt,7747;1416854196;2676918546 public/steambootstrapper_russian.txt,9010;1416854196;2508297086 public/steambootstrapper_schinese.txt,7309;1431459354;2979630355 -public/steambootstrapper_spanish.txt,7864;1416854196;2724601073 +public/steambootstrapper_spanish.txt,7856;1449884636;2846073881 public/steambootstrapper_swedish.txt,7564;1416854196;3083583076 public/steambootstrapper_tchinese.txt,7291;1416854196;3793434074 -public/steambootstrapper_thai.txt,10039;1423165434;3746757362 +public/steambootstrapper_thai.txt,10071;1453932618;691206302 public/steambootstrapper_turkish.txt,7648;1447207980;1914433236 public/steambootstrapper_ukrainian.txt,9177;1416854196;4191800949 -steamclient.dylib,59111112;1447786396;246341124 -steamcmd,4485892;1447786396;2592025382 +steamclient.dylib,59654592;1454525474;614373629 +steamcmd,4495576;1454525474;3183853880 steamcmd.sh,1052;1418947006;1760865730 -steamconsole.dylib,551148;1447786396;3833314122 -SHA1=0DDB425517414C8CC4E1EB3089333D0E492627F7 +steamconsole.dylib,552372;1454525474;1198163794 +VERSION=3 +SHA1=621D8261B7749E33372F9AF0AC331CBFD5DFA8FA diff --git a/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest b/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest index f9958af7..57e07757 100644 --- a/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest +++ b/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest @@ -1,36 +1,36 @@ "osx" { - "version" "1447786708" + "version" "1454526220" "steamcmd_public_all" { - "file" "steamcmd_public_all.zip.76bb1a1de1425b226b85cf2353f39eb5e908d05a" - "checksum" "76bb1a1de1425b226b85cf2353f39eb5e908d05a" - "size" "57650" + "file" "steamcmd_public_all.zip.cc35b4ce0695e92f6f2595a74f2db18c5a7bd179" + "checksum" "cc35b4ce0695e92f6f2595a74f2db18c5a7bd179" + "size" "57670" } "steamcmd_bins_osx" { - "file" "steamcmd_bins_osx.zip.840803f8437d46ed1cf40eebbf08c40b76596e4d" - "checksum" "840803f8437d46ed1cf40eebbf08c40b76596e4d" - "size" "16641665" - "zipvz" "steamcmd_bins_osx.zip.vz.078e511b4b43e16bfb447608b7617ace5310b4c7_9960128" + "file" "steamcmd_bins_osx.zip.8c280445c2ef3553907e08b5edcb12ef7f5b72ea" + "checksum" "8c280445c2ef3553907e08b5edcb12ef7f5b72ea" + "size" "16809906" + "zipvz" "steamcmd_bins_osx.zip.vz.c2149b7f86a23c1d9e8741339aa9fc9db3defab6_10043102" } "steamcmd_breakpad_osx" { - "file" "steamcmd_breakpad_osx.zip.8b1c35f31ef2cf5a4bb819f8c68ea98c1e3c25cb" - "checksum" "8b1c35f31ef2cf5a4bb819f8c68ea98c1e3c25cb" - "size" "414313" - "zipvz" "steamcmd_breakpad_osx.zip.vz.a8aa1057a1616cf52fff53f1cf9abd70d5701f24_311677" + "file" "steamcmd_breakpad_osx.zip.e852c262045d9da776f82edaef1dbfbe2cc068b6" + "checksum" "e852c262045d9da776f82edaef1dbfbe2cc068b6" + "size" "373590" + "zipvz" "steamcmd_breakpad_osx.zip.vz.2958df1d77a0eb5391f3b48b6f2cbc9617d0898d_295817" } "steamcmd_osx" { - "file" "steamcmd_osx.zip.be41d97b2dd2d5fb8a3787db4841db788bdb60e2" - "checksum" "be41d97b2dd2d5fb8a3787db4841db788bdb60e2" - "size" "1557893" - "zipvz" "steamcmd_osx.zip.vz.0dde5c28c3a7f5b09126507ab21ac9825cf4ca33_1154941" + "file" "steamcmd_osx.zip.1c457d091b53cb3e909e48632841ffdb89e6bc7e" + "checksum" "1c457d091b53cb3e909e48632841ffdb89e6bc7e" + "size" "1559901" + "zipvz" "steamcmd_osx.zip.vz.4b757b0693fb3bf2e3e27ac2ec37b4e2e9523da6_1156582" "IsBootstrapperPackage" "1" } } "kvsignatures" { - "osx" "8875ec1e9a93f5beb04a65e0548476d58a7945f7141de4e8a3ff70e86fe66c99f1d76e0193171df9eac3d7ea4988dca703919bf9dea842a93572bfd1540e4926b84819714db6162c56d68de132568dafc7d039b30e744c83a8e1e4c69b36082ab4de40cf974bd08a6d3e14f4f809bbf71eeabcaa69f8fb80d6ae9f74c934eb99" + "osx" "677c159dae6bdceaf83a691009e016b14102d2f22bffa482bd74d87c04cf10f5346a945bcad8fd282a6bfd6b081edceabeb22a595e97345f9b76b396a115bdbec2662de7b18d46108734243b75d140bcc932ab072b9b563c82a7d6e1676401c8603e050405d491e8011615a1c49dddbee86a854846ada2ab540f37a6dfc553e1" } diff --git a/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.078e511b4b43e16bfb447608b7617ace5310b4c7_9960128 b/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.078e511b4b43e16bfb447608b7617ace5310b4c7_9960128 deleted file mode 100644 index bd608886..00000000 Binary files a/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.078e511b4b43e16bfb447608b7617ace5310b4c7_9960128 and /dev/null differ diff --git a/desktop/content-builder/builder_osx/package/steamcmd_breakpad_osx.zip.vz.a8aa1057a1616cf52fff53f1cf9abd70d5701f24_311677 b/desktop/content-builder/builder_osx/package/steamcmd_breakpad_osx.zip.vz.a8aa1057a1616cf52fff53f1cf9abd70d5701f24_311677 deleted file mode 100644 index 12f46599..00000000 Binary files a/desktop/content-builder/builder_osx/package/steamcmd_breakpad_osx.zip.vz.a8aa1057a1616cf52fff53f1cf9abd70d5701f24_311677 and /dev/null differ diff --git a/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.0dde5c28c3a7f5b09126507ab21ac9825cf4ca33_1154941 b/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.0dde5c28c3a7f5b09126507ab21ac9825cf4ca33_1154941 deleted file mode 100644 index 39514d9f..00000000 Binary files a/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.0dde5c28c3a7f5b09126507ab21ac9825cf4ca33_1154941 and /dev/null differ diff --git a/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.76bb1a1de1425b226b85cf2353f39eb5e908d05a b/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.76bb1a1de1425b226b85cf2353f39eb5e908d05a deleted file mode 100644 index 33060c79..00000000 Binary files a/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.76bb1a1de1425b226b85cf2353f39eb5e908d05a and /dev/null differ diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt index 0cd994e2..e5e5e86d 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt @@ -37,9 +37,9 @@ "[english]SteamBootstrapper_UpdateChecking" "Checking for available updates..." "SteamBootstrapper_UpdatePrepare" "Preparando para actualizar..." "[english]SteamBootstrapper_UpdatePrepare" "Preparing to update..." -"SteamBootstrapper_UpdateDownload" "Descargando actualización..." +"SteamBootstrapper_UpdateDownload" "Bajando actualización..." "[english]SteamBootstrapper_UpdateDownload" "Downloading update..." -"SteamBootstrapper_UpdateDownloading" "Descargando actualización (%bytes% de %size% KB)..." +"SteamBootstrapper_UpdateDownloading" "Bajando actualización (%bytes% de %size% KB)..." "[english]SteamBootstrapper_UpdateDownloading" "Downloading update (%bytes% of %size% KB)..." "SteamBootstrapper_UpdateExtractingPackage" "Extrayendo paquete..." "[english]SteamBootstrapper_UpdateExtractingPackage" "Extracting package..." diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt index 3c5245bd..0b7c796b 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt @@ -9,7 +9,7 @@ "[english]SteamBootstrapper_ReadOnlyInstallOSX" "%appname% is unable to write to its folder. Make sure you're not trying to run from the disk image." "SteamBootstrapper_ReadOnlyInstall" "%appname% ไม่สามารถเขียนในไดเรกทอรีที่ติดตั้งได้" "[english]SteamBootstrapper_ReadOnlyInstall" "%appname% is unable to write to its folder." -"SteamBootstrapper_InsufficientDiskSpace" "%appname% ต้องการพื้นที่ว่างในดิสก์ %nMegaBytes%MB เพื่ออัปเดต" +"SteamBootstrapper_InsufficientDiskSpace" "%appname% ต้องการพื้นที่ว่างบนดิสก์ %nMegaBytes%MB เพื่ออัปเดต" "[english]SteamBootstrapper_InsufficientDiskSpace" "%appname% needs %nMegaBytes%MB of free disk space to update." "SteamBootstrapper_FailedManifestLoad" "ล้มเหลวในการโหลดมานิเฟสต์ของแพ็กเกจ" "[english]SteamBootstrapper_FailedManifestLoad" "Failed to load package manifest." @@ -23,7 +23,7 @@ "[english]SteamBootstrapper_CorruptPackageFile" "Corrupt package file (%pkgName%)." "SteamBootstrapper_FailedPackageUnzip" "การแตกแพ็กเกจ (%pkgName%) ล้มเหลว" "[english]SteamBootstrapper_FailedPackageUnzip" "Failed to unzip package (%pkgName%)." -"SteamBootstrapper_UpdateApplyFail" "การใช้อัปเดตล้มเหลว, กำลังย้อนกลับ..." +"SteamBootstrapper_UpdateApplyFail" "ล้มเหลวในการปรับใช้การอัปเดต กำลังคืนค่าเดิม..." "[english]SteamBootstrapper_UpdateApplyFail" "Failed to apply update, reverting..." "SteamBootstrapper_UpdateCleanup" "กำลังล้างข้อมูล..." "[english]SteamBootstrapper_UpdateCleanup" "Cleaning up..." diff --git a/desktop/content-builder/builder_osx/steamclient.dylib b/desktop/content-builder/builder_osx/steamclient.dylib index efeab089..46af3742 100755 Binary files a/desktop/content-builder/builder_osx/steamclient.dylib and b/desktop/content-builder/builder_osx/steamclient.dylib differ diff --git a/desktop/content-builder/builder_osx/steamcmd b/desktop/content-builder/builder_osx/steamcmd index bab6d324..6d3b514f 100755 Binary files a/desktop/content-builder/builder_osx/steamcmd and b/desktop/content-builder/builder_osx/steamcmd differ diff --git a/desktop/content-builder/builder_osx/steamconsole.dylib b/desktop/content-builder/builder_osx/steamconsole.dylib index 6ce406b0..30e20a9f 100755 Binary files a/desktop/content-builder/builder_osx/steamconsole.dylib and b/desktop/content-builder/builder_osx/steamconsole.dylib differ diff --git a/desktop/last-release b/desktop/last-release index 425151f3..87523dd7 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -40 +41 diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index d1d4e158..ab7b8221 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -365,7 +365,9 @@ (actions/talk entities :ego "I guess I'm doomed to be a gravedigger.") (actions/play-animation entities :ego :sigh) (actions/play-animation entities :ego :reach-start :stop? false) - (describe-shovel entities) + (if (get-in @entities [:room :entities :fairy-godfather :distracted?]) + (Thread/sleep 1000) + (describe-shovel entities)) (actions/play-animation entities :ego :reach-stop :stop? true) (actions/do-dialogue entities :ego "I can't bring myself to do it." @@ -376,7 +378,10 @@ (actions/talk entities :ego "I guess I'm doomed to be a janitor.") (actions/play-animation entities :ego :sigh) (actions/play-animation entities :ego :reach-start :stop? false) - (describe-broom entities) + (if (get-in @entities [:room :entities :fairy-godfather :distracted?]) + (Thread/sleep 1000) + + (describe-broom entities)) (actions/play-animation entities :ego :reach-stop :stop? true) (actions/do-dialogue entities :ego "I can't bring myself to do it." @@ -524,11 +529,17 @@ (actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.") (talk-to-fairy entities))) :scripts {:shovel (actions/get-script entities - (describe-shovel entities) - (actions/play-animation entities :ego :sigh)) + (if (get-in @entities [:room :entities :fairy-godfather :distracted?]) + (actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.") + (do + (describe-shovel entities) + (actions/play-animation entities :ego :sigh)))) :broom (actions/get-script entities - (describe-broom entities) - (actions/play-animation entities :ego :sigh))})} + (if (get-in @entities [:room :entities :fairy-godfather :distracted?]) + (actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.") + (do + (describe-broom entities) + (actions/play-animation entities :ego :sigh))))})} :collision "dream/collision.png" :scale-fn (utils/scaler-fn-from-image "dream/scale.png" 0.1 1.3)