Merge branch 'release/1.7'

CHANGELOG.txt

@@ -1,3 +1,18 @@
+**** v1.7 (Apr 2018)
+
+- Included Simple Quake Launcher 2 instead of the original Simple Quake Launcher 1.x, and changed the readme-files discussion to be appropriate for SQL2. Note that this new version now requires the .Net Framework 4.5 instead of 3.5.
+
+- Changed the installer to do Arcane Dimensions 1.7 rather than 1.5. Note that 1.7 will go into a different folder than 1.5, so if you want to clean up an existing 1.5 install you will have to handle that manually.
+
+- Fixed the installation of the Arcanum mod to also include the required Drake mod in the same folder.
+
+- Added 30 or so additional things to install, as a result of re-interpreting "highly rated" and also picking up newer releases.
+
+- Added the ability to launch into Quake directly from the installer.
+
+- Documented r_viewmodel_quake in autoexec.cfg.example. Works for both Mark V and Quakespasm.
+
+
 **** v1.6 (Sep 2017)
 
 - Updated some minor comments here and there.

README.md

@@ -1,3 +1,3 @@
 Check the README_FIRST.txt file to see what is going on here.
 
-A "release" of this is made by zipping up all of the files in this repo (except for this file) along with the latest releases of Simple Quake Launcher and the Mark V Quake engine.
+A "release" of this is made by zipping up all of the files in this repo (except for this file) along with the latest stable releases of Simple Quake Launcher 2 and the Mark V Quake engine.

README_FIRST.txt

@@ -2,11 +2,11 @@
 
 This package is one way to get going with the "state of the art" in Quake singleplayer. It's meant to be a convenient bundle of useful tools and explanations. The tools included in here are:
 
-- The Simple Quake Launcher by "MaxEd", from https://sourceforge.net/projects/simplequakelauncher/ .
+- Simple Quake Launcher 2 by "MaxEd", from https://github.com/m-x-d/Simple-Quake-Launcher-2/releases/latest
 
 - The Mark V "Quake engine" (Quake-playing program) by "Baker" and other contributors, from http://quakeone.com/markv/ . The Mark V website has additional info about the engine, more credits info, and links to other stuff you might want to download. Also note that there are several other Quake engines out there; see the "quake_engines.txt" file in the "readmes\other_stuff" folder if you're curious.
 
-- An installer to help set up the Quake game data files and soundtrack, and a few of the many custom singleplayer addons for Quake.
+- An installer to help set up the Quake game data files and soundtrack, and some of the many custom singleplayer addons for Quake. The installer can also help launch and play those addons once they are installed.
 
 You might want to keep an eye out in the future for a newer release of Mark V. You can just drop new Mark V files in here and replace the older versions.
 
@@ -15,7 +15,7 @@ You might want to keep an eye out in the future for a newer release of Mark V. Y
 
 The included version of Mark V is build 1036 from January 2017.
 
-As for this whole package of stuff, it's version 1.6. If you want to see what has changed since the previous releases, see CHANGELOG.txt. If you've been using a previous version of this package, you can overwrite those files with the ones from this new release; that won't hurt whatever Quake configuration you've set up.
+As for this whole package of stuff, it's version 1.7. If you want to see what has changed since the previous releases, see "CHANGELOG.txt". If you've been using a previous version of this package, you can overwrite those files with the ones from this new release; that won't hurt whatever Quake configuration you've set up.
 
 
 *** How to use this
@@ -26,15 +26,17 @@ You can also just use this package as a new Quake installation starting from scr
 
 Things to do:
 
+- Note that Simple Quake Launcher 2 and some aspects of the installer make use of Microsoft .Net Framework version 4.5 or later. If you are on Windows 8 or 10, you are probably fine. For more details, especially if you are on Windows 7 or Vista, see the "1_setup.txt" file in the "readmes\basic" folder.
+
 - If you're starting a new Quake installation from scratch here, you need to move or copy your "pak0.pak" and "pak1.pak" files (Quake game data) into the "id1" folder. If you already have another Quake installation on your computer somewhere, you can try running the "installer" batch file and choosing the first menu option; this can usually automatically find and copy those pak files for you.
 
-- Also in the "installer" menu, you can pick the second option to install the Quake soundtrack.
+- Also in the installer menu, you can pick the second option to install the Quake soundtrack.
 
-- Explore other options in the "installer" menu for some selected user-created addons. The "Episodes released in 2016" option is a good way to get started with some recent stuff.
+- Quit out of the installer and run mark_v.exe just to make sure stuff works, and get your desired configuration set up. The menus are sufficient for normal setup, but you can also get more "hands-on" and manually modify config files if you like. These readme files will provide more details about that if you want them.
 
-- Run Quake, using "mark_v_winquake.exe" (acts like WinQuake), or "mark_v.exe" (acts like GLQuake), or "dx9_mark_v.exe" (like "mark_v.exe", but uses DirectX instead of OpenGL). If you want to play missionpacks or other addons, it's easier if you use "SQLauncher.exe", the Simple Quake Launcher (which requires .Net 3.5 to be installed).
+- Quit out of Quake and launch the installer again. Explore the options in the installer menu to install and play some user-created addons.
 
-- Once you're in-game, use the Mark V menus to configure Quake the way you like it. The menus are sufficient for normal setup, but you can also get more "hands-on" and manually modify config files if you like.
+- Alternately you can use "SQLauncher2.exe", the Simple Quake Launcher 2, as another great way to manage launching Quake to play custom addons or official missionpacks or the original campaign.
 
 
 If you're a Quake veteran that's probably all you need to know.

id1/autoexec-cfg-example-annotated.txt

@@ -126,6 +126,16 @@
 //gl_texture_anisotropy 8
 
 
+// weapon rendering
+//-------------------------------------------------------------------
+
+// Set r_viewmodel_quake to a value of 1 to make the position of the held
+// weapon's model be more like it is in WinQuake.
+// Default is 0. Uncomment the following line to set some other value.
+
+//r_viewmodel_quake 1
+
+
 // particle shape (this doesn't apply to the winquake variant)
 //-------------------------------------------------------------------
 

id1/autoexec.cfg.example

@@ -62,6 +62,16 @@
 //gl_texture_anisotropy 8
 
 
+// weapon rendering
+//-------------------------------------------------------------------
+
+// Set r_viewmodel_quake to a value of 1 to make the position of the held
+// weapon's model be more like it is in WinQuake.
+// Default is 0. Uncomment the following line to set some other value.
+
+//r_viewmodel_quake 1
+
+
 // particle shape (this doesn't apply to the winquake variant)
 //-------------------------------------------------------------------
 

installer.bat

@@ -10,10 +10,11 @@ echo 1: Find ^& copy pak files ^(game data^) on this computer
 echo 2: Install soundtrack music files
 echo(
 echo Additional content:
-echo 3: Episodes released in 2016
-echo 4: "Modern" episodes from pre-2016
+echo 3: Latest episodes ^(released in 2016 or later^)
+echo 4: Modern episodes from pre-2016
 echo 5: Classic episodes
-echo 6: Other highly-rated maps up thru 2016
+echo 6: Other highly-rated maps ^(part 1^)
+echo 7: Other highly-rated maps ^(part 2^)
 echo(
 set menu_choice=eof
 set /p menu_choice=choose a number or just press Enter to exit:
@@ -43,3 +44,7 @@ goto :menu
 :6
 call "installers/install_other_picks.bat"
 goto :menu
+
+:7
+call "installers/install_other_picks_2.bat"
+goto :menu

installers/_mod_install.cmd

@@ -80,4 +80,5 @@ set %gamedir%_success=true
 
 REM finally restore original working dir to be nice
 :exit
+echo(
 popd

installers/_mod_launch.cmd

@@ -0,0 +1,76 @@
+REM save working dir and change to dir that holds this script
+pushd "%~dp0"
+
+REM capture map and other commandline args
+if "%1"=="" (
+  echo Missing the command-line args for base game, gamedir, and startmap.
+  echo FYI:
+  echo Usually you wouldn't run this file directly; it's used by other
+  echo batch files.
+  goto :N
+)
+set game_arg= -game "%~1"
+set start_map=%~2
+set base_game=%~3
+
+REM CD up to Quake engine dir if necessary
+if "%quake_exe%"=="" (
+  set quake_exe=mark_v.exe
+)
+if not exist "%quake_exe%" (
+  cd ..
+  if not exist "%quake_exe%" (
+    echo Couldn't find "%quake_exe%" in this folder or parent folder.
+    goto :N
+  )
+)
+
+echo Do you want to launch Quake now with "%~1" loaded?
+
+if "%start_map%"=="" (
+  set start_map_arg=
+  echo Since there is no specific "start map" for this mod, you will have to
+  echo handle map selection on your own ^(through the console, or through the
+  echo Single Player Levels menu of Mark V^).
+  echo Do NOT just start a New Game through the Single Player menu.
+) else (
+  set start_map_arg= +map "%start_map%"
+  echo You will begin in its map "%start_map%" ^(which may or may not provide
+  echo for in-map skill selection^).
+)
+
+if "%base_game%"=="" (
+  set base_game_arg=
+) else (
+  set base_game_arg= -%base_game%
+)
+
+echo(
+echo Launch options:
+echo y: launch without explicitly setting a skill
+echo n: do not launch
+echo 0-3: launch and set a default initial skill
+echo(
+set skill_arg=
+set launch_choice=y
+set /p launch_choice=choose an option, or just press Enter to launch:
+goto %launch_choice%
+
+:0
+:1
+:2
+:3
+set skill_arg= +skill %launch_choice%
+
+:y
+:Y
+set quake_command=".\%quake_exe%"%base_game_arg%%game_arg%%skill_arg%%start_map_arg%
+echo(
+echo running: %quake_command%
+start "" /b /wait %quake_command%
+
+:n
+:N
+REM finally restore original working dir to be nice
+echo(
+popd

installers/_mod_patch_install.cmd

@@ -113,4 +113,5 @@ set %temp_gamedir%_success=true
 
 REM finally restore original working dir to be nice
 :exit
+echo(
 popd