Altered asset structure, reg files

themuffinator · Feb 20, 2021 · 140d245 · 140d245
1 parent ab3b427
commit 140d245
Show file tree

Hide file tree

Showing 55 changed files with 95 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ DarkMatter is a project that ultimately aims to provide a unified platform for e
 * Detailed cvar descriptions straight from the console, min and max values for all appropriate cvars
 * A number of added cvars and commands providing more customization and control
 
-More details available in the docs directory.
+More information including features and installation available in the assets/docs directory.
 
 **Quake3e features**:
 

diff --git a/assets/scripts/base_button_ql.shader → assets/base/scripts/base_button_ql.shader b/assets/scripts/base_button_ql.shader → assets/base/scripts/base_button_ql.shader
diff --git a/assets/scripts/base_door_ql.shader → assets/base/scripts/base_door_ql.shader b/assets/scripts/base_door_ql.shader → assets/base/scripts/base_door_ql.shader
diff --git a/assets/scripts/base_floor2_ql.shader → assets/base/scripts/base_floor2_ql.shader b/assets/scripts/base_floor2_ql.shader → assets/base/scripts/base_floor2_ql.shader
diff --git a/assets/scripts/base_floor_ql.shader → assets/base/scripts/base_floor_ql.shader b/assets/scripts/base_floor_ql.shader → assets/base/scripts/base_floor_ql.shader
diff --git a/assets/scripts/base_light_ql.shader → assets/base/scripts/base_light_ql.shader b/assets/scripts/base_light_ql.shader → assets/base/scripts/base_light_ql.shader
diff --git a/assets/scripts/base_object_ql.shader → assets/base/scripts/base_object_ql.shader b/assets/scripts/base_object_ql.shader → assets/base/scripts/base_object_ql.shader
diff --git a/assets/scripts/base_support_ql.shader → assets/base/scripts/base_support_ql.shader b/assets/scripts/base_support_ql.shader → assets/base/scripts/base_support_ql.shader
diff --git a/assets/scripts/base_trim_ql.shader → assets/base/scripts/base_trim_ql.shader b/assets/scripts/base_trim_ql.shader → assets/base/scripts/base_trim_ql.shader
diff --git a/assets/scripts/base_wall2_ql.shader → assets/base/scripts/base_wall2_ql.shader b/assets/scripts/base_wall2_ql.shader → assets/base/scripts/base_wall2_ql.shader
diff --git a/assets/scripts/base_wall_ql.shader → assets/base/scripts/base_wall_ql.shader b/assets/scripts/base_wall_ql.shader → assets/base/scripts/base_wall_ql.shader
diff --git a/assets/scripts/common_ql.shader → assets/base/scripts/common_ql.shader b/assets/scripts/common_ql.shader → assets/base/scripts/common_ql.shader
diff --git a/assets/scripts/ctf2_ql.shader → assets/base/scripts/ctf2_ql.shader b/assets/scripts/ctf2_ql.shader → assets/base/scripts/ctf2_ql.shader
diff --git a/assets/scripts/ctf_ql.shader → assets/base/scripts/ctf_ql.shader b/assets/scripts/ctf_ql.shader → assets/base/scripts/ctf_ql.shader
diff --git a/assets/scripts/extras.arena → assets/base/scripts/extras.arena b/assets/scripts/extras.arena → assets/base/scripts/extras.arena
diff --git a/assets/scripts/gothic_block_ql.shader → assets/base/scripts/gothic_block_ql.shader b/assets/scripts/gothic_block_ql.shader → assets/base/scripts/gothic_block_ql.shader
diff --git a/assets/scripts/gothic_button_ql.shader → assets/base/scripts/gothic_button_ql.shader b/assets/scripts/gothic_button_ql.shader → assets/base/scripts/gothic_button_ql.shader
diff --git a/assets/scripts/gothic_door_ql.shader → assets/base/scripts/gothic_door_ql.shader b/assets/scripts/gothic_door_ql.shader → assets/base/scripts/gothic_door_ql.shader
diff --git a/assets/scripts/gothic_floor2_ql.shader → assets/base/scripts/gothic_floor2_ql.shader b/assets/scripts/gothic_floor2_ql.shader → assets/base/scripts/gothic_floor2_ql.shader
diff --git a/assets/scripts/gothic_floor_ql.shader → assets/base/scripts/gothic_floor_ql.shader b/assets/scripts/gothic_floor_ql.shader → assets/base/scripts/gothic_floor_ql.shader
diff --git a/assets/scripts/gothic_light_ql.shader → assets/base/scripts/gothic_light_ql.shader b/assets/scripts/gothic_light_ql.shader → assets/base/scripts/gothic_light_ql.shader
diff --git a/assets/scripts/gothic_trim_ql.shader → assets/base/scripts/gothic_trim_ql.shader b/assets/scripts/gothic_trim_ql.shader → assets/base/scripts/gothic_trim_ql.shader
diff --git a/assets/scripts/gothic_wall_ql.shader → assets/base/scripts/gothic_wall_ql.shader b/assets/scripts/gothic_wall_ql.shader → assets/base/scripts/gothic_wall_ql.shader
diff --git a/assets/scripts/holiday.arena → assets/base/scripts/holiday.arena b/assets/scripts/holiday.arena → assets/base/scripts/holiday.arena
diff --git a/assets/scripts/models_players.shader → assets/base/scripts/models_players.shader b/assets/scripts/models_players.shader → assets/base/scripts/models_players.shader
diff --git a/assets/scripts/organics_ql.shader → assets/base/scripts/organics_ql.shader b/assets/scripts/organics_ql.shader → assets/base/scripts/organics_ql.shader
diff --git a/assets/scripts/proto2_ql.shader → assets/base/scripts/proto2_ql.shader b/assets/scripts/proto2_ql.shader → assets/base/scripts/proto2_ql.shader
diff --git a/assets/scripts/sfx2_ql.shader → assets/base/scripts/sfx2_ql.shader b/assets/scripts/sfx2_ql.shader → assets/base/scripts/sfx2_ql.shader
diff --git a/assets/scripts/sfx_ql.shader → assets/base/scripts/sfx_ql.shader b/assets/scripts/sfx_ql.shader → assets/base/scripts/sfx_ql.shader
diff --git a/assets/scripts/skies2_ql.shader → assets/base/scripts/skies2_ql.shader b/assets/scripts/skies2_ql.shader → assets/base/scripts/skies2_ql.shader
diff --git a/assets/scripts/skies_ql.shader → assets/base/scripts/skies_ql.shader b/assets/scripts/skies_ql.shader → assets/base/scripts/skies_ql.shader
diff --git a/assets/scripts/tim_ql.shader → assets/base/scripts/tim_ql.shader b/assets/scripts/tim_ql.shader → assets/base/scripts/tim_ql.shader
diff --git a/docs/darkmatter-changelog.txt → assets/docs/darkmatter-changelog.txt b/docs/darkmatter-changelog.txt → assets/docs/darkmatter-changelog.txt
diff --git a/docs/darkmatter-credits.txt → assets/docs/darkmatter-credits.txt b/docs/darkmatter-credits.txt → assets/docs/darkmatter-credits.txt
diff --git a/assets/docs/darkmatter-readme.txt b/assets/docs/darkmatter-readme.txt
@@ -0,0 +1,8 @@
+DarkMatter, Win x86_64
+--------------------------------------------
+
+INSTALLATION:
+-------------
+DarkMatter can automatically detect your game installation path, subject to registry settings. If it cannot detect your paths, there are registry files to correct this (modify the files in a text editor to your correct paths.)
+
+DarkMatter can also detect an installation path if run from it - it will search for both the original game executable in current folder and main pak file and appropriate subfolder.
diff --git a/docs/darkmatter-todo.txt → assets/docs/darkmatter-todo.txt b/docs/darkmatter-todo.txt → assets/docs/darkmatter-todo.txt
diff --git a/docs/quake3e/LinuxSupport/CHANGES-1.32.txt → ...ocs/quake3e/LinuxSupport/CHANGES-1.32.txt b/docs/quake3e/LinuxSupport/CHANGES-1.32.txt → ...ocs/quake3e/LinuxSupport/CHANGES-1.32.txt
diff --git a/docs/quake3e/LinuxSupport/INSTALL → assets/docs/quake3e/LinuxSupport/INSTALL b/docs/quake3e/LinuxSupport/INSTALL → assets/docs/quake3e/LinuxSupport/INSTALL
diff --git a/docs/quake3e/LinuxSupport/index.html → assets/docs/quake3e/LinuxSupport/index.html b/docs/quake3e/LinuxSupport/index.html → assets/docs/quake3e/LinuxSupport/index.html
diff --git a/.../quake3e/LinuxSupport/udp_wide_README.txt → .../quake3e/LinuxSupport/udp_wide_README.txt b/.../quake3e/LinuxSupport/udp_wide_README.txt → .../quake3e/LinuxSupport/udp_wide_README.txt
diff --git a/...e3e/LinuxSupport/udp_wide_broadcast.patch → ...e3e/LinuxSupport/udp_wide_broadcast.patch b/...e3e/LinuxSupport/udp_wide_broadcast.patch → ...e3e/LinuxSupport/udp_wide_broadcast.patch
diff --git a/docs/quake3e/README.Linux → assets/docs/quake3e/README.Linux b/docs/quake3e/README.Linux → assets/docs/quake3e/README.Linux
diff --git a/docs/quake3e/README.Q3Test → assets/docs/quake3e/README.Q3Test b/docs/quake3e/README.Q3Test → assets/docs/quake3e/README.Q3Test
diff --git a/docs/quake3e/filter.txt → assets/docs/quake3e/filter.txt b/docs/quake3e/filter.txt → assets/docs/quake3e/filter.txt
diff --git a/docs/quake3e/firewall/fw-openwrt.txt → assets/docs/quake3e/firewall/fw-openwrt.txt b/docs/quake3e/firewall/fw-openwrt.txt → assets/docs/quake3e/firewall/fw-openwrt.txt
diff --git a/docs/quake3e/firewall/fw-q3host.sh → assets/docs/quake3e/firewall/fw-q3host.sh b/docs/quake3e/firewall/fw-q3host.sh → assets/docs/quake3e/firewall/fw-q3host.sh
diff --git a/docs/quake3e/q3url_add.cmd → assets/docs/quake3e/q3url_add.cmd b/docs/quake3e/q3url_add.cmd → assets/docs/quake3e/q3url_add.cmd
diff --git a/docs/quake3e/q3url_rem.cmd → assets/docs/quake3e/q3url_rem.cmd b/docs/quake3e/q3url_rem.cmd → assets/docs/quake3e/q3url_rem.cmd
diff --git a/docs/quake3e/quake3e-FAQ.txt → assets/docs/quake3e/quake3e-FAQ.txt b/docs/quake3e/quake3e-FAQ.txt → assets/docs/quake3e/quake3e-FAQ.txt
diff --git a/docs/quake3e/quake3e-changes.txt → assets/docs/quake3e/quake3e-changes.txt b/docs/quake3e/quake3e-changes.txt → assets/docs/quake3e/quake3e-changes.txt
diff --git a/docs/quake3e/quake3e.htm → assets/docs/quake3e/quake3e.htm b/docs/quake3e/quake3e.htm → assets/docs/quake3e/quake3e.htm
diff --git a/assets/docs/reg/reg-q2-add.reg b/assets/docs/reg/reg-q2-add.reg
@@ -0,0 +1,31 @@
+Windows Registry Editor Version 5.00
+
+; Quake 2 registry
+; Generated by RegFiles.net
+; https://www.regfiles.net/registry/quake-2-registry
+
+@echo OFF
+
+reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT
+
+if %OS%==32BIT (
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Activision\Quake II]
+ "FTP"="Q2W95"
+ "EXE"="Quake2_exe"
+
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Activision\Quake II\1.0]
+
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\Quake2_exe]
+ "Path"="C:\\Program Files\\Quake2"
+ @="C:\\Program Files\\Quake2\\Quake2.exe"
+) else (
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Activision\Quake II]
+ "FTP"="Q2W95"
+ "EXE"="Quake2_exe"
+
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Activision\Quake II\1.0]
+
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\Quake2_exe]
+ "Path"="C:\\Program Files (x86)\\Quake2"
+ @="C:\\Program Files (x86)\\Quake2\\Quake2.exe"
+)
diff --git a/assets/docs/reg/reg-q2-remove.reg b/assets/docs/reg/reg-q2-remove.reg
@@ -0,0 +1,19 @@
+Windows Registry Editor Version 5.00
+
+; Quake 2 registry
+; Generated by RegFiles.net
+; https://www.regfiles.net/registry/quake-2-registry
+
+@echo OFF
+
+reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT
+
+if %OS%==32BIT (
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Activision\Quake II]
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Activision\Quake II\1.0]
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\Quake2_exe]
+) else (
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Activision\Quake II]
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Activision\Quake II\1.0]
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\Quake2_exe]
+)
diff --git a/assets/docs/reg/reg-q3a-add.reg b/assets/docs/reg/reg-q3a-add.reg
@@ -0,0 +1,21 @@
+Windows Registry Editor Version 5.00
+
+; Quake III: Arena registry
+; Generated by RegFiles.net
+; https://www.regfiles.net/registry/quake-iii-arena-registry
+
+@echo OFF
+
+reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT
+
+if %OS%==32BIT (
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Id\Quake III Arena]
+ "CD"="D:\\setup\\"
+ "INSTALLPATH"="C:\\Program Files\\Quake III Arena"
+ "INSTALLEXEPATH"="C:\\Program Files\\Quake III Arena\\quake3.exe"
+) else (
+ [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Id\Quake III Arena]
+ "CD"="D:\\setup\\"
+ "INSTALLPATH"="C:\\Program Files (x86)\\Quake III Arena"
+ "INSTALLEXEPATH"="C:\\Program Files (x86)\\Quake III Arena\\quake3.exe"
+)
diff --git a/assets/docs/reg/reg-q3a-remove.reg b/assets/docs/reg/reg-q3a-remove.reg
@@ -0,0 +1,15 @@
+Windows Registry Editor Version 5.00
+
+; Quake III: Arena registry
+; Generated by RegFiles.net
+; https://www.regfiles.net/registry/quake-iii-arena-registry
+
+@echo OFF
+
+reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT
+
+if %OS%==32BIT (
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Id\Quake III Arena]
+) else (
+ [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Id\Quake III Arena]
+)