diff --git a/README.md b/README.md index 4420640..6e8d2fc 100644 --- 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 b/assets/base/scripts/base_button_ql.shader similarity index 100% rename from assets/scripts/base_button_ql.shader rename to assets/base/scripts/base_button_ql.shader diff --git a/assets/scripts/base_door_ql.shader b/assets/base/scripts/base_door_ql.shader similarity index 100% rename from assets/scripts/base_door_ql.shader rename to assets/base/scripts/base_door_ql.shader diff --git a/assets/scripts/base_floor2_ql.shader b/assets/base/scripts/base_floor2_ql.shader similarity index 100% rename from assets/scripts/base_floor2_ql.shader rename to assets/base/scripts/base_floor2_ql.shader diff --git a/assets/scripts/base_floor_ql.shader b/assets/base/scripts/base_floor_ql.shader similarity index 100% rename from assets/scripts/base_floor_ql.shader rename to assets/base/scripts/base_floor_ql.shader diff --git a/assets/scripts/base_light_ql.shader b/assets/base/scripts/base_light_ql.shader similarity index 100% rename from assets/scripts/base_light_ql.shader rename to assets/base/scripts/base_light_ql.shader diff --git a/assets/scripts/base_object_ql.shader b/assets/base/scripts/base_object_ql.shader similarity index 100% rename from assets/scripts/base_object_ql.shader rename to assets/base/scripts/base_object_ql.shader diff --git a/assets/scripts/base_support_ql.shader b/assets/base/scripts/base_support_ql.shader similarity index 100% rename from assets/scripts/base_support_ql.shader rename to assets/base/scripts/base_support_ql.shader diff --git a/assets/scripts/base_trim_ql.shader b/assets/base/scripts/base_trim_ql.shader similarity index 100% rename from assets/scripts/base_trim_ql.shader rename to assets/base/scripts/base_trim_ql.shader diff --git a/assets/scripts/base_wall2_ql.shader b/assets/base/scripts/base_wall2_ql.shader similarity index 100% rename from assets/scripts/base_wall2_ql.shader rename to assets/base/scripts/base_wall2_ql.shader diff --git a/assets/scripts/base_wall_ql.shader b/assets/base/scripts/base_wall_ql.shader similarity index 100% rename from assets/scripts/base_wall_ql.shader rename to assets/base/scripts/base_wall_ql.shader diff --git a/assets/scripts/common_ql.shader b/assets/base/scripts/common_ql.shader similarity index 100% rename from assets/scripts/common_ql.shader rename to assets/base/scripts/common_ql.shader diff --git a/assets/scripts/ctf2_ql.shader b/assets/base/scripts/ctf2_ql.shader similarity index 100% rename from assets/scripts/ctf2_ql.shader rename to assets/base/scripts/ctf2_ql.shader diff --git a/assets/scripts/ctf_ql.shader b/assets/base/scripts/ctf_ql.shader similarity index 100% rename from assets/scripts/ctf_ql.shader rename to assets/base/scripts/ctf_ql.shader diff --git a/assets/scripts/extras.arena b/assets/base/scripts/extras.arena similarity index 100% rename from assets/scripts/extras.arena rename to assets/base/scripts/extras.arena diff --git a/assets/scripts/gothic_block_ql.shader b/assets/base/scripts/gothic_block_ql.shader similarity index 100% rename from assets/scripts/gothic_block_ql.shader rename to assets/base/scripts/gothic_block_ql.shader diff --git a/assets/scripts/gothic_button_ql.shader b/assets/base/scripts/gothic_button_ql.shader similarity index 100% rename from assets/scripts/gothic_button_ql.shader rename to assets/base/scripts/gothic_button_ql.shader diff --git a/assets/scripts/gothic_door_ql.shader b/assets/base/scripts/gothic_door_ql.shader similarity index 100% rename from assets/scripts/gothic_door_ql.shader rename to assets/base/scripts/gothic_door_ql.shader diff --git a/assets/scripts/gothic_floor2_ql.shader b/assets/base/scripts/gothic_floor2_ql.shader similarity index 100% rename from assets/scripts/gothic_floor2_ql.shader rename to assets/base/scripts/gothic_floor2_ql.shader diff --git a/assets/scripts/gothic_floor_ql.shader b/assets/base/scripts/gothic_floor_ql.shader similarity index 100% rename from assets/scripts/gothic_floor_ql.shader rename to assets/base/scripts/gothic_floor_ql.shader diff --git a/assets/scripts/gothic_light_ql.shader b/assets/base/scripts/gothic_light_ql.shader similarity index 100% rename from assets/scripts/gothic_light_ql.shader rename to assets/base/scripts/gothic_light_ql.shader diff --git a/assets/scripts/gothic_trim_ql.shader b/assets/base/scripts/gothic_trim_ql.shader similarity index 100% rename from assets/scripts/gothic_trim_ql.shader rename to assets/base/scripts/gothic_trim_ql.shader diff --git a/assets/scripts/gothic_wall_ql.shader b/assets/base/scripts/gothic_wall_ql.shader similarity index 100% rename from assets/scripts/gothic_wall_ql.shader rename to assets/base/scripts/gothic_wall_ql.shader diff --git a/assets/scripts/holiday.arena b/assets/base/scripts/holiday.arena similarity index 100% rename from assets/scripts/holiday.arena rename to assets/base/scripts/holiday.arena diff --git a/assets/scripts/models_players.shader b/assets/base/scripts/models_players.shader similarity index 100% rename from assets/scripts/models_players.shader rename to assets/base/scripts/models_players.shader diff --git a/assets/scripts/organics_ql.shader b/assets/base/scripts/organics_ql.shader similarity index 100% rename from assets/scripts/organics_ql.shader rename to assets/base/scripts/organics_ql.shader diff --git a/assets/scripts/proto2_ql.shader b/assets/base/scripts/proto2_ql.shader similarity index 100% rename from assets/scripts/proto2_ql.shader rename to assets/base/scripts/proto2_ql.shader diff --git a/assets/scripts/sfx2_ql.shader b/assets/base/scripts/sfx2_ql.shader similarity index 100% rename from assets/scripts/sfx2_ql.shader rename to assets/base/scripts/sfx2_ql.shader diff --git a/assets/scripts/sfx_ql.shader b/assets/base/scripts/sfx_ql.shader similarity index 100% rename from assets/scripts/sfx_ql.shader rename to assets/base/scripts/sfx_ql.shader diff --git a/assets/scripts/skies2_ql.shader b/assets/base/scripts/skies2_ql.shader similarity index 100% rename from assets/scripts/skies2_ql.shader rename to assets/base/scripts/skies2_ql.shader diff --git a/assets/scripts/skies_ql.shader b/assets/base/scripts/skies_ql.shader similarity index 100% rename from assets/scripts/skies_ql.shader rename to assets/base/scripts/skies_ql.shader diff --git a/assets/scripts/tim_ql.shader b/assets/base/scripts/tim_ql.shader similarity index 100% rename from assets/scripts/tim_ql.shader rename to assets/base/scripts/tim_ql.shader diff --git a/docs/darkmatter-changelog.txt b/assets/docs/darkmatter-changelog.txt similarity index 100% rename from docs/darkmatter-changelog.txt rename to assets/docs/darkmatter-changelog.txt diff --git a/docs/darkmatter-credits.txt b/assets/docs/darkmatter-credits.txt similarity index 100% rename from docs/darkmatter-credits.txt rename to assets/docs/darkmatter-credits.txt diff --git a/assets/docs/darkmatter-readme.txt b/assets/docs/darkmatter-readme.txt new file mode 100644 index 0000000..a35c0c8 --- /dev/null +++ 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. \ No newline at end of file diff --git a/docs/darkmatter-todo.txt b/assets/docs/darkmatter-todo.txt similarity index 100% rename from docs/darkmatter-todo.txt rename to assets/docs/darkmatter-todo.txt diff --git a/docs/quake3e/LinuxSupport/CHANGES-1.32.txt b/assets/docs/quake3e/LinuxSupport/CHANGES-1.32.txt similarity index 100% rename from docs/quake3e/LinuxSupport/CHANGES-1.32.txt rename to assets/docs/quake3e/LinuxSupport/CHANGES-1.32.txt diff --git a/docs/quake3e/LinuxSupport/INSTALL b/assets/docs/quake3e/LinuxSupport/INSTALL similarity index 100% rename from docs/quake3e/LinuxSupport/INSTALL rename to assets/docs/quake3e/LinuxSupport/INSTALL diff --git a/docs/quake3e/LinuxSupport/index.html b/assets/docs/quake3e/LinuxSupport/index.html similarity index 100% rename from docs/quake3e/LinuxSupport/index.html rename to assets/docs/quake3e/LinuxSupport/index.html diff --git a/docs/quake3e/LinuxSupport/udp_wide_README.txt b/assets/docs/quake3e/LinuxSupport/udp_wide_README.txt similarity index 100% rename from docs/quake3e/LinuxSupport/udp_wide_README.txt rename to assets/docs/quake3e/LinuxSupport/udp_wide_README.txt diff --git a/docs/quake3e/LinuxSupport/udp_wide_broadcast.patch b/assets/docs/quake3e/LinuxSupport/udp_wide_broadcast.patch similarity index 100% rename from docs/quake3e/LinuxSupport/udp_wide_broadcast.patch rename to assets/docs/quake3e/LinuxSupport/udp_wide_broadcast.patch diff --git a/docs/quake3e/README.Linux b/assets/docs/quake3e/README.Linux similarity index 100% rename from docs/quake3e/README.Linux rename to assets/docs/quake3e/README.Linux diff --git a/docs/quake3e/README.Q3Test b/assets/docs/quake3e/README.Q3Test similarity index 100% rename from docs/quake3e/README.Q3Test rename to assets/docs/quake3e/README.Q3Test diff --git a/docs/quake3e/filter.txt b/assets/docs/quake3e/filter.txt similarity index 100% rename from docs/quake3e/filter.txt rename to assets/docs/quake3e/filter.txt diff --git a/docs/quake3e/firewall/fw-openwrt.txt b/assets/docs/quake3e/firewall/fw-openwrt.txt similarity index 100% rename from docs/quake3e/firewall/fw-openwrt.txt rename to assets/docs/quake3e/firewall/fw-openwrt.txt diff --git a/docs/quake3e/firewall/fw-q3host.sh b/assets/docs/quake3e/firewall/fw-q3host.sh similarity index 100% rename from docs/quake3e/firewall/fw-q3host.sh rename to assets/docs/quake3e/firewall/fw-q3host.sh diff --git a/docs/quake3e/q3url_add.cmd b/assets/docs/quake3e/q3url_add.cmd similarity index 100% rename from docs/quake3e/q3url_add.cmd rename to assets/docs/quake3e/q3url_add.cmd diff --git a/docs/quake3e/q3url_rem.cmd b/assets/docs/quake3e/q3url_rem.cmd similarity index 100% rename from docs/quake3e/q3url_rem.cmd rename to assets/docs/quake3e/q3url_rem.cmd diff --git a/docs/quake3e/quake3e-FAQ.txt b/assets/docs/quake3e/quake3e-FAQ.txt similarity index 100% rename from docs/quake3e/quake3e-FAQ.txt rename to assets/docs/quake3e/quake3e-FAQ.txt diff --git a/docs/quake3e/quake3e-changes.txt b/assets/docs/quake3e/quake3e-changes.txt similarity index 100% rename from docs/quake3e/quake3e-changes.txt rename to assets/docs/quake3e/quake3e-changes.txt diff --git a/docs/quake3e/quake3e.htm b/assets/docs/quake3e/quake3e.htm similarity index 100% rename from docs/quake3e/quake3e.htm rename to assets/docs/quake3e/quake3e.htm diff --git a/assets/docs/reg/reg-q2-add.reg b/assets/docs/reg/reg-q2-add.reg new file mode 100644 index 0000000..f1608d3 --- /dev/null +++ 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 new file mode 100644 index 0000000..602fe54 --- /dev/null +++ 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 new file mode 100644 index 0000000..cb7640a --- /dev/null +++ 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 new file mode 100644 index 0000000..eabe6e1 --- /dev/null +++ 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] +)