Merge prediction features from Iceman12k repo

ezQuake.vcxproj

@@ -61,7 +61,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5147CA71-1D3D-4F61-9847-87B36421C323}</ProjectGuid>
     <RootNamespace>ezQuake</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <ProjectName>ezQuake</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -2848,6 +2848,7 @@ msversion.bat</Command>
     <ClInclude Include="src\anorms.h" />
     <ClInclude Include="src\anorm_dots.h" />
     <ClInclude Include="src\central.h" />
+    <ClInclude Include="src\cl_tent.h" />
     <ClInclude Include="src\cmdline_params.h" />
     <ClInclude Include="src\cmdline_params_ids.h" />
     <ClInclude Include="src\fonts.h" />

ezQuake.vcxproj.filters

@@ -1680,6 +1680,8 @@
     </ClInclude>
     <ClInclude Include="src\.msversion.h">
       <Filter>Header Files\Generated</Filter>
+    <ClInclude Include="cl_tent.h">
+      <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

help_variables.json

@@ -2259,6 +2259,22 @@
         }
       ]
     },
+    "cl_nopred_weapon": {
+      "default": "0",
+      "desc": "Disables weapon prediction for your character",
+      "group-id": "21",
+      "type": "boolean",
+      "values": [
+        {
+          "description": "Predict weapons",
+          "name": "false"
+        },
+        {
+          "description": "Don't predict weapons",
+          "name": "true"
+        }
+      ]
+    },
     "cl_novweps": {
       "default": "0",
       "desc": "If set, disables support for zquake vwep extension.",
@@ -2516,6 +2532,94 @@
         }
       ]
     },
+    "cl_predict_buffer": {
+      "default": "1",
+      "desc": "This variable controls how many frames will be buffered before weapon and sound prediction is used.\n\nHigher values will result in larger latency before seeing/hearing your weapon fire,\nbut with less prediction errors.",
+      "group-id": "21",
+      "type": "integer"
+    },
+    "cl_predict_jump": {
+      "default": "0",
+      "desc": "This variable controls if jump sounds will be predicted.",
+      "group-id": "21",
+      "type": "boolean"
+    },
+    "cl_predict_beam": {
+      "default": "1",
+      "desc": "This variable controls if shaft beam will be predicted, which can misbehave in water.",
+      "group-id": "21",
+      "type": "boolean"
+    },
+    "cl_predict_projectiles": {
+      "default": "0",
+      "desc": "This variable controls if projectiles will be predicted, which can cause confusion if you die at the same time you shoot.",
+      "group-id": "21",
+      "type": "boolean"
+    },
+    "cl_predict_smoothview": {
+      "default": "1",
+      "desc": "This variable determines how smoothly predicted and true positions will be blended when desynchronized from knockback or packet-loss.",
+      "group-id": "21",
+      "type": "float",
+      "values": [
+        {
+          "description": "disables smoothing (behavior prior to EzQuake 3.6)",
+          "name": "0"
+        },
+        {
+          "description": "enables smoothing, higher is smoother, lower is closer to true position on the server.",
+          "name": "0.1 to 2"
+        }
+      ]
+    },
+    "cl_predict_weaponsound": {
+      "default": "1",
+      "desc": "This variable controls if (or which) weapon sounds will be predicted.\nFor choosing specific weapons to disable, add up all desired binary flags.",
+      "group-id": "21",
+      "type": "integer",
+      "values": [
+        {
+          "description": "disable all weapon sound prediction",
+          "name": "0"
+        },
+        {
+          "description": "enable all weapon sound prediction",
+          "name": "1"
+        },
+        {
+          "description": "disable for AXE",
+          "name": "2"
+        },
+        {
+          "description": "disable for SG",
+          "name": "4"
+        },
+        {
+          "description": "disable for SSG",
+          "name": "8"
+        },
+        {
+          "description": "disable for NG",
+          "name": "16"
+        },
+        {
+          "description": "disable for SNG",
+          "name": "32"
+        },
+        {
+          "description": "disable for GL",
+          "name": "64"
+        },
+        {
+          "description": "disable for RL",
+          "name": "128"
+        },
+        {
+          "description": "disable for LG",
+          "name": "256"
+        }
+      ]
+    },
     "cl_proxyaddr": {
       "default": "",
       "desc": "IP address of the proxy server to use while connecting to servers.",
@@ -15128,7 +15232,7 @@
       "system-generated": true
     },
     "qws_version": {
-      "default": "0.34-beta",
+      "default": "0.34-beta-RekiFork",
       "group-id": "0",
       "system-generated": true
     },

misc/vstudio/txt2c/txt2c.vcxproj

@@ -22,7 +22,7 @@
     <ProjectGuid>{5887F9F1-8E68-4A08-9FB1-4633A8F701F1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>txt2c</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">