diff --git a/.gitignore b/.gitignore index 16ba4891..0ae42b62 100644 --- a/.gitignore +++ b/.gitignore @@ -400,4 +400,6 @@ test.cpp /x64/Release/Adventures in Lestoria.zip /x64/Release/Adventures in Lestoria_web.zip /x64/Release/AdventuresInLestoria_web.zip -packkey.cpp \ No newline at end of file +packkey.cpp +desktop.ini +.tmp.driveupload \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index dca7cc7f..45bb2936 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 2 -#define VERSION_BUILD 8952 +#define VERSION_BUILD 8953 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/distribute.ps1 b/distribute.ps1 index a85334c7..439aec67 100644 --- a/distribute.ps1 +++ b/distribute.ps1 @@ -1,14 +1,12 @@ git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp" +$ErrorActionPreference= 'silentlycontinue' rm -R bin mkdir bin mkdir bin/assets -$ErrorActionPreference = "Stop" cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets cp -R "Adventures in Lestoria/assets/config" bin/assets cp -R "Adventures in Lestoria/assets/maps" bin/assets cp -R "Adventures in Lestoria/assets/backgrounds" bin/assets -rm -R bin/assets/backgrounds/commercial_assets -rm -R bin/assets/maps/commercial_assets cp -R "Adventures in Lestoria/assets/monsters" bin/assets cp -R "Adventures in Lestoria/assets/music" bin/assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets @@ -18,6 +16,11 @@ cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets cp -R "Adventures in Lestoria/assets/*.ttf" bin/assets cp -R "Adventures in Lestoria/controller_config" bin +rm -R bin/assets/backgrounds/commercial_assets +rm -R bin/assets/maps/commercial_assets +rm -R bin/assets/monsters/commercial_assets cp -R "x64/Release/*" bin -rm bin/*.pdb \ No newline at end of file +rm bin/*.pdb +Write-Host -NoNewLine 'Press any key to continue...'; +$null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown'); \ No newline at end of file diff --git a/emscripten_build.ps1 b/emscripten_build.ps1 index f05cdbc6..9421f9db 100755 --- a/emscripten_build.ps1 +++ b/emscripten_build.ps1 @@ -3,7 +3,7 @@ clear rm -R bin mkdir bin mkdir bin/assets -$ErrorActionPreference = "Stop" + cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets cp -R "Adventures in Lestoria/assets/config" bin/assets diff --git a/emscripten_debug_build.ps1 b/emscripten_debug_build.ps1 index c04d2c7d..a187eee9 100644 --- a/emscripten_debug_build.ps1 +++ b/emscripten_debug_build.ps1 @@ -3,7 +3,7 @@ clear rm -R bin mkdir bin mkdir bin/assets -$ErrorActionPreference = "Stop" + cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets cp -R "Adventures in Lestoria/assets/config" bin/assets diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 17802fc7..fc490e9d 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ