id-software/DoomRTX
1
0
Fork 0
mirror of https://github.com/jmarshall23/DoomRTX.git synced 2026-08-21 05:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Quake 4 integrated with DoomRTX

Browse Source
This commit is contained in:
Justin Marshall
2026-05-09 22:10:40 -07:00
parent 8c4a087aa9
commit d37f87e493
436 changed files with 277587 additions and 10254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neo/prey/PreyGame.vcxproj
+61
View File
@@ -25,6 +25,10 @@
<Configuration>Prey Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Q4 Debug|x64">
<Configuration>Q4 Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -68,6 +72,11 @@
<PlatformToolset>v145</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v145</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v145</PlatformToolset>
@@ -100,6 +109,10 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
@@ -111,6 +124,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
@@ -169,6 +185,46 @@
<Command>copy "$(TargetDir)\gamex86.lib" "$(OutDir)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_D3SDK;__DOOM__;GAME_DLL;WIN32;_DEBUG;_WINDOWS;HUMANHEAD;_DOTNET_2005;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)game.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
<BrowseInformationFile>$(IntDir)</BrowseInformationFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
<AdditionalOptions>/FIXED:no %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;dbghelp.lib;./DebugDLL/idLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>./DebugDLL/gamex86.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gamex86.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<MapFileName>$(OutDir)gamex86.map</MapFileName>
<SubSystem>NotSet</SubSystem>
<StackReserveSize>16000000</StackReserveSize>
<StackCommitSize>16000000</StackCommitSize>
<SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>
</Link>
<PostBuildEvent>
<Message>Copying gamex86.lib</Message>
<Command>copy "$(TargetDir)\gamex86.lib" "$(OutDir)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -455,8 +511,10 @@
<ItemGroup>
<ClCompile Include="..\engine\idlib\precompiled.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">precompiled.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'">precompiled.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'">precompiled.h</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|x64'">precompiled.h</PrecompiledHeaderFile>
@@ -475,6 +533,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with inlines and memory log|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Dedicated Debug with Inlines|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Dedicated Release|x64'">Use</PrecompiledHeader>
@@ -572,7 +631,9 @@
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|x64'">prey_local.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|x64'">$(OutDir)prey.pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">prey_local.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'">prey_local.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)prey.pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Q4 Debug|x64'">$(OutDir)prey.pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">prey_local.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)prey.pch</PrecompiledHeaderOutputFile>
</ClCompile>
neo/prey/cm/CollisionModel_contacts.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"
neo/prey/cm/CollisionModel_contents.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"
neo/prey/cm/CollisionModel_debug.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"
@@ -372,7 +372,7 @@ static int num_rotation = 0;
static idVec3 start;
static idVec3 *testend;
#include "../sys/sys_public.h"
#include "../../engine/sys/sys_public.h"
void idCollisionModelManagerLocal::DebugOutput( const idVec3 &origin ) {
int i, k, t;
neo/prey/cm/CollisionModel_files.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"
neo/prey/cm/CollisionModel_load.cpp
+2 -2
View File
@@ -18,7 +18,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"
@@ -3544,7 +3544,7 @@ void idCollisionModelManagerLocal::BuildModels( const idMapFile *mapFile ) {
// write the collision models to a file
// HUMANHEAD pdm: Support for level appending
#if DEATHWALK_AUTOLOAD
bool bAppending = session->ShouldAppendLevel() && !idStr::Icmp(mapFile->GetName(), session->GetDeathwalkMapName());
bool bAppending = false; //jmarshall session->ShouldAppendLevel() && !idStr::Icmp(mapFile->GetName(), session->GetDeathwalkMapName());
if (bAppending) {
common->Printf("Appending collision data\n");
// Rename the world collision model
neo/prey/cm/CollisionModel_rotate.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"
neo/prey/cm/CollisionModel_trace.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"
neo/prey/cm/CollisionModel_translate.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
===============================================================================
*/
#include "../idlib/precompiled.h"
#include "precompiled.h"
#pragma hdrstop
#include "CollisionModel_local.h"