diff --git a/source/README.txt b/source/README.txt index 903ea7ea..58e508c7 100644 --- a/source/README.txt +++ b/source/README.txt @@ -10,10 +10,8 @@ and other sources. AssaultCube Authors ================== -Adrian 'driAn' Henke drian at sprintf.org -Andrew 'Arghvark' Davis arghvark at gmail.com -Lee 'Eihrul' Salzman -stef +Please see the the credits in the in-game "about" menu. +Please see the AssaultCube history here https://assault.cubers.net/docs/history.html Cube Engine Authors diff --git a/source/vcpp/buildEnv/ac.nsi b/source/vcpp/buildEnv/ac.nsi index fdfbd31d..92072d4b 100644 --- a/source/vcpp/buildEnv/ac.nsi +++ b/source/vcpp/buildEnv/ac.nsi @@ -53,13 +53,13 @@ SetCompressor /SOLID lzma !define CURPATH ".\" ; must include the installer graphics and the AC_NEWVERSIONDIR directory -!define AC_FULLVERSIONINT "1.2.0.2_hotfix1" +!define AC_FULLVERSIONINT "1.3.0.0" !define AC_FULLVERSION "v${AC_FULLVERSIONINT}" !define AC_SHORTNAME "AssaultCube ${AC_FULLVERSIONINT}" !define AC_FULLNAME "AssaultCube ${AC_FULLVERSIONINT}" !define AC_URLPROTOCOL "assaultcube" !define AC_MAJORVERSIONINT 1 -!define AC_MINORVERSIONINT 2 +!define AC_MINORVERSIONINT 3 !define AC_NEWVERSIONDIR "AC" ; directory with prepared new AC version ; path to profile folder in "MYDOCUMENTS" directory, should be the same as in assaultcube.bat !define AC_PROFILEPATH "My Games\AssaultCube\v${AC_MAJORVERSIONINT}.${AC_MINORVERSIONINT}" @@ -67,7 +67,7 @@ SetCompressor /SOLID lzma Name "${AC_SHORTNAME}" VAR StartMenuFolder !define AC_STARTMENUFOLDER "$SMPROGRAMS\$StartMenuFolder" -OutFile "AssaultCube_v1.2.0.2_experimental_win10_hotfix_1.exe" +OutFile "AssaultCube_v1.3.0.0_LockdownEdition.exe" InstallDir "$PROGRAMFILES\${AC_SHORTNAME}" InstallDirRegKey HKLM "Software\${AC_SHORTNAME}" "" !define ARP "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_SHORTNAME}" diff --git a/source/vcpp/buildEnv/build_1_exportACdev.bat b/source/vcpp/buildEnv/build_1_exportACdev.bat index 1791b8e3..a94eec8e 100644 --- a/source/vcpp/buildEnv/build_1_exportACdev.bat +++ b/source/vcpp/buildEnv/build_1_exportACdev.bat @@ -17,7 +17,6 @@ git archive --format zip --output source\vcpp\buildEnv\%ACDIR%\%NEWACTAG%.zip re cd source\vcpp\buildEnv\%ACDIR% 7z x %NEWACTAG%.zip 7z x %NEWACTAG%.zip -o..\%ACDIRTESTING% -del ..\%ACDIRTESTING%\assaultcube.bat del %NEWACTAG%.zip rem get documentation files from latest remote release tag diff --git a/source/vcpp/buildEnv/build_2_prepareACdirectory.bat b/source/vcpp/buildEnv/build_2_prepareACdirectory.bat index 4bebd002..e6c05bf4 100644 --- a/source/vcpp/buildEnv/build_2_prepareACdirectory.bat +++ b/source/vcpp/buildEnv/build_2_prepareACdirectory.bat @@ -2,7 +2,9 @@ set ACDIR=AC set ACDIRTESTING=AC_testing -echo make sure, that you compiled new binaries in %ACDIRTESTING% folder, tested them and generated fresh config\mapmodelattributes.cfg file (/loadallmapmodels) +echo 1. copy your newly compiled binaries to %ACDIRTESTING%\bin_win32\ +echo 2. edit %ACDIRTESTING%\assaultcube.bat and change the profile path to the local directory i.e. "--home=" +echo 3. launch %ACDIRTESTING%\assaultcube.bat and execute /loadallmapmodels then quit AC pause rem copy binaries