From 24095b672b13f7aabe7fb666690a12ac587f7296 Mon Sep 17 00:00:00 2001 From: Niklas K Date: Sun, 3 Feb 2019 17:59:53 +0100 Subject: [PATCH] update to v1.11 --- .gitignore | 1 + content/CCPatch-README.txt | 8 +++++++- content/languagebarrier/patchdef.json | 4 ++-- installer/noidget | 2 +- installer/userdata/README.txt | 8 +++++++- installer/userdata/product.json | 4 ++-- launcher/realboot | 2 +- terribuild.ps1 | 9 +++++++-- 8 files changed, 28 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e3a168a..af309de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ config.ps1 temp/ DIST/ +symbols/ cc-edited-images/* !cc-edited-images/.gitkeep script_archive_v101/* diff --git a/content/CCPatch-README.txt b/content/CCPatch-README.txt index eef798f..866f962 100644 --- a/content/CCPatch-README.txt +++ b/content/CCPatch-README.txt @@ -1,6 +1,6 @@ CHAOS;CHILD Steam Patch Committee of Zero -Version 1.1 - February 2, 2019 +Version 1.11 - February 3, 2019 ============================== http://sonome.dareno.me https://twitter.com/CommitteeOf0 @@ -12,6 +12,12 @@ See http://sonome.dareno.me/projects/chaoschild-steam.html for details, contact For troubleshooting, please come to our Discord. You can always find the latest version of the patch at https://github.com/CommitteeOfZero/cc-patch/releases +============================== +Changes from 1.1: +============================== + +* Fixed an issue where the installer would crash on pre-AVX CPUs. + ============================== Changes from 1.0: ============================== diff --git a/content/languagebarrier/patchdef.json b/content/languagebarrier/patchdef.json index 48d44c8..1de0c45 100644 --- a/content/languagebarrier/patchdef.json +++ b/content/languagebarrier/patchdef.json @@ -1,8 +1,8 @@ { "__schema_version": 2, "appdatadir": "Committee of Zero\\CCSteam", - "patchName": "[CoZ] CHAOS;CHILD Steam Patch (1.1)", - "patchVersion": "1.1", + "patchName": "[CoZ] CHAOS;CHILD Steam Patch (1.11)", + "patchVersion": "1.11", "base": { "hookText": true, "improveDialogueOutlines": false, diff --git a/installer/noidget b/installer/noidget index d53e34c..c0c4e38 160000 --- a/installer/noidget +++ b/installer/noidget @@ -1 +1 @@ -Subproject commit d53e34c4df8adf509dbae0ab9acfcc1c5eb724c5 +Subproject commit c0c4e386dedc0710b287adf81c334955c3480a5a diff --git a/installer/userdata/README.txt b/installer/userdata/README.txt index eef798f..866f962 100644 --- a/installer/userdata/README.txt +++ b/installer/userdata/README.txt @@ -1,6 +1,6 @@ CHAOS;CHILD Steam Patch Committee of Zero -Version 1.1 - February 2, 2019 +Version 1.11 - February 3, 2019 ============================== http://sonome.dareno.me https://twitter.com/CommitteeOf0 @@ -12,6 +12,12 @@ See http://sonome.dareno.me/projects/chaoschild-steam.html for details, contact For troubleshooting, please come to our Discord. You can always find the latest version of the patch at https://github.com/CommitteeOfZero/cc-patch/releases +============================== +Changes from 1.1: +============================== + +* Fixed an issue where the installer would crash on pre-AVX CPUs. + ============================== Changes from 1.0: ============================== diff --git a/installer/userdata/product.json b/installer/userdata/product.json index 0473c1a..09beafd 100644 --- a/installer/userdata/product.json +++ b/installer/userdata/product.json @@ -25,7 +25,7 @@ ], "uninstallProductKey": "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ChaosChildSteamPatch", "uninstallProductDisplayName": "Chaos;Child Steam Patch", - "uninstallProductDisplayVersion": "1.1", + "uninstallProductDisplayVersion": "1.11", "uninstallProductVersionMajor": 1, "uninstallProductVersionMinor": 1, "uninstallProductUninstallString": "\"%GAME_PATH%/nguninstall.exe\"", @@ -41,7 +41,7 @@ }, "playShortcut": { "displayName": "Chaos;Child (Steam Patch)", - "version": "1.1", + "version": "1.11", "targetPath": "%LAUNCHERENG_PATH%", "workingDir": "%GAME_PATH%", "tooltip": "Play Chaos;Child (Steam Patch)", diff --git a/launcher/realboot b/launcher/realboot index 6f02f65..1b5d951 160000 --- a/launcher/realboot +++ b/launcher/realboot @@ -1 +1 @@ -Subproject commit 6f02f65e17b889510e327b536f866a93348e4ed1 +Subproject commit 1b5d95175b7d4971c93a473467eab98fa99639ba diff --git a/terribuild.ps1 b/terribuild.ps1 index bd5797e..427689f 100644 --- a/terribuild.ps1 +++ b/terribuild.ps1 @@ -9,7 +9,7 @@ try { } # EXE metadata configuration -$version_string = "1.1" +$version_string = "1.11" $tool_icon = "CoZIcon.ico" $game_icon = "LauncherIcon.ico" $publisher = "Committee of Zero" @@ -121,12 +121,15 @@ Remove-Item -Force -Recurse -ErrorAction SilentlyContinue .\DIST New-Item -ItemType directory -Path .\DIST | Out-Null Remove-Item -Force -Recurse -ErrorAction SilentlyContinue .\temp New-Item -ItemType directory -Path .\temp | Out-Null +Remove-Item -Force -Recurse -ErrorAction SilentlyContinue .\symbols +New-Item -ItemType directory -Path .\symbols | Out-Null PrintSection "Building LanguageBarrier as $languagebarrier_configuration" & "$msbuild" "$languagebarrier_dir\LanguageBarrier\LanguageBarrier.vcxproj" "/p:Configuration=$languagebarrier_configuration" PrintSection "Copying LanguageBarrier to DIST" Copy-Item $languagebarrier_dir\languagebarrier\$languagebarrier_configuration\*.dll .\DIST +Copy-Item $languagebarrier_dir\languagebarrier\$languagebarrier_configuration\*.pdb .\symbols Copy-Item -Recurse $languagebarrier_dir\languagebarrier\$languagebarrier_configuration\languagebarrier .\DIST New-Item -ItemType directory -Path .\DIST\CHILD | Out-Null # TODO how does wine handle this? @@ -200,6 +203,7 @@ cd launcher cd .. SetRealbootExeMetadata .\launcher\deploy\LauncherC0.exe Copy-Item -Recurse -Force .\launcher\deploy\* .\DIST +Copy-Item -Recurse -Force .\launcher\build\release\*.pdb .\symbols PrintSection "Building noidget" cd installer @@ -207,6 +211,7 @@ cd installer cd .. SetInstallerExeMetadata .\installer\deploy\noidget.exe SetUninstallerExeMetadata .\installer\deployUninstaller\noidget.exe +Copy-Item -Recurse -Force .\installer\build\release\*.pdb .\symbols PrintSection "Packing uninstaller" cd installer\deployUninstaller @@ -244,7 +249,7 @@ Move-Item -Force ..\merged_patches_c . Move-Item -Force ..\..\installer\deploy\* . Move-Item -Force .\noidget.exe .\CCPatch-Installer.exe cd ..\..\DIST -Compress-Archive -Path "..\temp\$patchFolderName" -DestinationPath "$patchFolderName.zip" -CompressionLevel Optimal +7z a -mx=5 "$patchFolderName.zip" "..\temp\$patchFolderName" cd .. PrintSection "Removing temp"