diff --git a/.gitignore b/.gitignore
index b3b1eef..bb3b6f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,6 @@
*.ncb
*.sdf
*.opensdf
-*.pdb
-*.ilk
-*.exp
*.idb
UpgradeLog*.htm
_UpgradeReport_Files/
@@ -16,10 +13,13 @@ Backup/
# Build output directories
Debug/
+Debug_TA/
Release/
Release_TA/
x64/
*___Win32_*/
+ReleaseAXP/
+DebugAxp/
# Intermediate build files
*.obj
@@ -27,12 +27,9 @@ x64/
*.res
*.sbr
*.bsc
+*.pdb
+*.ilk
+*.exp
-# Compiled outputs
-*.exe
-*.dll
-*.lib
-*.map
-
-# Working directory (build outputs + game data)
+# Working directory (game runtime + copied build outputs)
workdir/
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 24acc5b..b4fee79 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -45,8 +45,8 @@ int demo_protocols[] =
#define DEF_COMHUNKMEGS "64"
#define DEF_COMZONEMEGS "24"
#else
-#define DEF_COMHUNKMEGS "56"
-#define DEF_COMZONEMEGS "16"
+#define DEF_COMHUNKMEGS "512"
+#define DEF_COMZONEMEGS "384"
#endif
int com_argc;
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index f27d2f2..4c325bb 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -2753,7 +2753,7 @@ static void FS_Startup( const char *gameName ) {
homePath = fs_basepath->string;
}
fs_homepath = Cvar_Get ("fs_homepath", homePath, CVAR_INIT );
- fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
+ fs_gamedirvar = Cvar_Get ("fs_game", "missionpack", CVAR_INIT|CVAR_SYSTEMINFO );
fs_restrict = Cvar_Get ("fs_restrict", "", CVAR_INIT );
// add search path elements in reverse priority order
diff --git a/code/quake3.sln b/code/quake3.sln
index 0c2c4a9..9ba1a26 100644
--- a/code/quake3.sln
+++ b/code/quake3.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
-VisualStudioVersion = 17.14.36908.2 d17.14
+VisualStudioVersion = 17.14.36908.2
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "splines\Splines.vcxproj", "{DBAF2C53-3858-455D-A1AE-3FC093515314}"
EndProject
@@ -10,8 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame\cgame.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game\game.vcxproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui\q3_ui.vcxproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcxproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcxproj", "{AB424155-FBED-4D8D-B007-5B6CF93EA395}"
@@ -58,12 +56,6 @@ Global
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|x86.Build.0 = Release TA|Win32
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|x86.ActiveCfg = Release|Win32
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|x86.Build.0 = Release|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|x86.ActiveCfg = Debug TA|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|x86.ActiveCfg = Debug|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|x86.Build.0 = Debug|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|x86.ActiveCfg = Release TA|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|x86.ActiveCfg = Release|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|x86.Build.0 = Release|Win32
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|x86.ActiveCfg = Debug TA|Win32
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|x86.Build.0 = Debug TA|Win32
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|x86.ActiveCfg = Debug|Win32
diff --git a/code/quake3.vcxproj b/code/quake3.vcxproj
index d306c62..340ba18 100644
--- a/code/quake3.vcxproj
+++ b/code/quake3.vcxproj
@@ -101,6 +101,7 @@
<_ProjectFileVersion>17.0.36804.4
+ quake3live
.\Release_TA\
@@ -146,7 +147,7 @@
MaxSpeed
AnySuitable
- _WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ DLL_ONLY;_WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
MultiThreaded
true
@@ -161,7 +162,7 @@
dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)
- .\Release_TA/quake3.exe
+ .\Release_TA/quake3live.exe
true
Release_TA/quake3.pdb
true
@@ -205,7 +206,7 @@
dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)
- .\Debug/quake3.exe
+ .\Debug/quake3live.exe
true
true
.\Debug/quake3.pdb
@@ -252,7 +253,7 @@
dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)
- .\quake3___Win32_Release_TA_DEMO/quake3.exe
+ .\quake3___Win32_Release_TA_DEMO/quake3live.exe
true
true
Release_TA/quake3.pdb
@@ -293,7 +294,7 @@
dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)
- .\Release/quake3.exe
+ .\Release/quake3live.exe
true
true
.\Release/quake3.pdb
@@ -334,7 +335,7 @@
dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)
- .\quake3___Win32_Debug_TA_DEMO/quake3.exe
+ .\quake3___Win32_Debug_TA_DEMO/quake3live.exe
true
true
.\quake3___Win32_Debug_TA_DEMO/quake3.pdb
@@ -378,7 +379,7 @@
dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)
- .\quake3___Win32_vector0/quake3.exe
+ .\quake3___Win32_vector0/quake3live.exe
true
true
Release_TA/quake3.pdb
@@ -404,7 +405,7 @@
Disabled
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ DLL_ONLY;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
MultiThreadedDebug
.\Debug_TA/quake3.pch
@@ -419,7 +420,7 @@
dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)
- .\Debug_TA/quake3.exe
+ .\Debug_TA/quake3live.exe
true
true
.\Debug_TA/quake3.pdb
diff --git a/code/ui/ui.vcxproj b/code/ui/ui.vcxproj
index f644c4e..7230982 100644
--- a/code/ui/ui.vcxproj
+++ b/code/ui/ui.vcxproj
@@ -560,4 +560,24 @@
+
+ <_CopyOutputFile>$(SolutionDir)Debug\uix86_new.dll
+ <_CopyOutputDir>$(SolutionDir)..\workdir\baseq3\
+
+
+ <_CopyOutputFile>$(SolutionDir)Debug_TA\uix86.dll
+ <_CopyOutputDir>$(SolutionDir)..\workdir\missionpack\
+
+
+ <_CopyOutputFile>$(SolutionDir)Release\uix86_new.dll
+ <_CopyOutputDir>$(SolutionDir)..\workdir\baseq3\
+
+
+ <_CopyOutputFile>$(SolutionDir)Release_TA\uix86.dll
+ <_CopyOutputDir>$(SolutionDir)..\workdir\missionpack\
+
+
+
+
+
\ No newline at end of file