Fix rpojectile models/shader for vehicles, disable upforce case in racer_frame as...

diff --git a/models/vehicles/bomblet.md3 b/models/vehicles/bomblet.md3
index a45d24af17c44f95a7537ed04ee3b05f7ba6e301..69f2195dbb6229b04bc59e3402379790b425072e 100644 (file)
Binary files a/models/vehicles/bomblet.md3 and b/models/vehicles/bomblet.md3 differ

diff --git a/models/vehicles/clusterbomb.md3 b/models/vehicles/clusterbomb.md3
index 5481c574afa363cc364cca8e0b5d5de5c6b2f1c9..c0842dfeefc56f505405022e357d565b3e763f46 100644 (file)
Binary files a/models/vehicles/clusterbomb.md3 and b/models/vehicles/clusterbomb.md3 differ

diff --git a/models/vehicles/clusterbomb_fragment.md3 b/models/vehicles/clusterbomb_fragment.md3
index c2c63c2e0679ee7015fad550d67eb7f0ce478b29..516da16244c7b9bb11098f9ca725f648eb8b6d27 100644 (file)
Binary files a/models/vehicles/clusterbomb_fragment.md3 and b/models/vehicles/clusterbomb_fragment.md3 differ

diff --git a/models/vehicles/rocket01.md3 b/models/vehicles/rocket01.md3
index 329f27730db191fe9be2cf45fb5d2281b5ffe3a2..1d9aab939234f8f3eb6bd8c59db43e151c753aac 100644 (file)
Binary files a/models/vehicles/rocket01.md3 and b/models/vehicles/rocket01.md3 differ

diff --git a/models/vehicles/rocket02.md3 b/models/vehicles/rocket02.md3
index ab408796dff0975666283e9210eeb5fd0b6bdb36..0a3eef049645ab7f5ce52a8398f0bffb8979241a 100644 (file)
Binary files a/models/vehicles/rocket02.md3 and b/models/vehicles/rocket02.md3 differ

diff --git a/models/vehicles/rockets.tga b/models/vehicles/rockets.tga
index 553fdf0e74a2887c9bbde6337d03ada9023264fb..a6b873c4d9f63372246372b445a862027e6645f4 100644 (file)
Binary files a/models/vehicles/rockets.tga and b/models/vehicles/rockets.tga differ

diff --git a/models/vehicles/rockets_gloss.tga b/models/vehicles/rockets_gloss.tga
index d62e764a2eb944acdbed0f1e17b0027b08bb917f..22616da9b145c4af9194125aeaf538b757970534 100644 (file)
Binary files a/models/vehicles/rockets_gloss.tga and b/models/vehicles/rockets_gloss.tga differ

diff --git a/models/vehicles/rockets_reflect.tga b/models/vehicles/rockets_reflect.tga
index 0c1616657b831fb5f75a896b628b5fd8870c421f..3cad23f56d7a30fc5fc472f9f17f792a15a98c20 100644 (file)
Binary files a/models/vehicles/rockets_reflect.tga and b/models/vehicles/rockets_reflect.tga differ

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 70611e50b0bce48651a23df42a2a85afceb733d3..56db32dee7a852bd4e1aee24de281af09178256a 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -327,9 +327,11 @@ float racer_frame()
     }
 
     racer_align4point();
-    // Move abt crosshir insted of v_angle. this allows custom chase camera.
+
     crosshair_trace(player);
+
 #if VEHICLES_VIEWROTATE_CROSSHAIR
+    // Move abt crosshir insted of v_angle. this allows custom chase camera.
     racer.angles_x *= -1;
     df = vectoangles(normalize(trace_endpos - self.origin + '0 0 32'));
     if(df_x > 180)  df_x -= 360;
@@ -338,7 +340,7 @@ float racer_frame()
     if(df_y < -180) df_y += 360;
 
     // Yaw
-    ftmp = autocvar_g_vehicle_racer_turnspeed * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_turnspeed * frametime;
     ftmp2 = ftmp * -1;
 
     ftmp = bound(ftmp2, shortangle_f(df_y - racer.angles_y, racer.angles_y), ftmp);
@@ -353,7 +355,7 @@ float racer_frame()
     racer.angles_y = ftmp2;
 
     // Pitch
-    ftmp = autocvar_g_vehicle_racer_pitchspeed * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_pitchspeed * frametime;
     ftmp2 = ftmp * -1;
 
     ftmp = bound(ftmp2, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp);
@@ -365,15 +367,15 @@ float racer_frame()
     racer.angles_x *= -1;
 
     // Yaw
-    ftmp = autocvar_g_vehicle_racer_turnspeed * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_turnspeed * frametime;
     ftmp = bound(-ftmp, shortangle_f(player.v_angle_y - racer.angles_y, racer.angles_y), ftmp);
     racer.angles_y = anglemods(racer.angles_y + ftmp);
 
     // Roll
-    racer.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * sys_frametime;
+    racer.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * frametime;
 
     // Pitch
-    ftmp = autocvar_g_vehicle_racer_pitchspeed  * sys_frametime;
+    ftmp = autocvar_g_vehicle_racer_pitchspeed  * frametime;
     ftmp = bound(-ftmp, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp);
     racer.angles_x = bound(-30, anglemods(racer.angles_x + ftmp), 30);
 
@@ -400,8 +402,8 @@ float racer_frame()
     }
 
     // limit _z to avoid flying on normal thrust
-    if(df_z > 0)
-        df_z = min(df_z, 700);
+    //if(df_z > 0)
+    //    df_z = min(df_z, 700);
 
     // Afterburn
     if (player.BUTTON_JUMP)

diff --git a/scripts/vrockets.shader b/scripts/vrockets.shader
index 84d071f850e7e27aa0b05bbac0398578ff0e3ffc..aa17a993b71f9b894a98a171eaaeefcfcd13c903 100644 (file)
--- a/scripts/vrockets.shader
+++ b/scripts/vrockets.shader
@@ -1,8 +1,8 @@
 models/vehicles/rockets
 {
-       dpreflectcube textures/cubemap/sky
- {
-       models/vehicles/rockets.tga
-       rgbgen vertex
- }
+       dpreflectcube cubemaps/default/sky
+       {
+               map models/vehicles/rockets.tga
+               rgbgen lightingDiffuse
+       }
 }
\ No newline at end of file