From: Rudolf Polzer Date: Tue, 25 May 2010 14:55:31 +0000 (+0200) Subject: Merge remote branches 'origin/diabolik/exteriorweaponposition', 'origin/diabolik... X-Git-Tag: xonotic-v0.1.0preview~553^2~5 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=616c74840d75417a886e4b4150a92065b4e90f5e;hp=db9e03303608ce0fd78a36af207b3bb52aa542c5;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branches 'origin/diabolik/exteriorweaponposition', 'origin/diabolik/ignisplayermodel', 'origin/diabolik/pyriaplayermodel', 'origin/diabolik/umbraplayermodel' and 'origin/diabolik/weaponscale' into divVerent/speedlimit --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 6a01ba59a..a30856168 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1751,7 +1751,7 @@ seta cl_noantilag 0 "turn this on if you believe antilag is bad" set sv_pitch_min -35 "minimum aiming angle for shooting direction display of the gun" set sv_pitch_max 35 "maximum aiming angle for shooting direction display of the gun" -set sv_pitch_fixyaw 1 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0" +set sv_pitch_fixyaw 0 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0" set rescan_pending 0 "set to 1 to schedule a fs_rescan at the end of this match" diff --git a/models/player/ignis.iqm b/models/player/ignis.iqm new file mode 100644 index 000000000..aefdc83ad Binary files /dev/null and b/models/player/ignis.iqm differ diff --git a/models/player/ignis.iqm.framegroups b/models/player/ignis.iqm.framegroups new file mode 100644 index 000000000..71128c6c8 --- /dev/null +++ b/models/player/ignis.iqm.framegroups @@ -0,0 +1,23 @@ +0 36 15.000000 0 // dieone +36 20 15.000000 0 // dietwo +56 15 15.000000 1 // draw +71 20 15.000000 1 // duck +91 21 30.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 5.000000 1 // duckidle +143 41 5.000000 1 // idle +184 21 25.000000 0 // jump +205 15 15.000000 0 // painone +220 17 15.000000 0 // paintwo +237 3 15.000000 1 // shoot +240 21 15.000000 1 // taunt +261 21 35.000000 1 // run +282 21 35.000000 1 // runbackwards +303 21 35.000000 1 // strafeleft +324 21 35.000000 1 // straferight +345 2 15.000000 0 // deadone +347 2 15.000000 0 // deadtwo +349 21 35.000000 1 // forwardright +370 21 35.000000 1 // forwardleft +391 21 35.000000 1 // backright +412 21 30.000000 1 // backleft diff --git a/models/player/ignis.iqm_0.tga b/models/player/ignis.iqm_0.tga new file mode 100644 index 000000000..177b4a696 Binary files /dev/null and b/models/player/ignis.iqm_0.tga differ diff --git a/models/player/ignis.iqm_0.txt b/models/player/ignis.iqm_0.txt new file mode 100644 index 000000000..7597e410a --- /dev/null +++ b/models/player/ignis.iqm_0.txt @@ -0,0 +1,7 @@ +name Ignis +species human +sex Male +weight 88 +age 31 + +Heavyweight Xonotic Solider diff --git a/models/player/ignishalfmasked.iqm b/models/player/ignishalfmasked.iqm new file mode 100644 index 000000000..017485a4d Binary files /dev/null and b/models/player/ignishalfmasked.iqm differ diff --git a/models/player/ignishalfmasked.iqm.framegroups b/models/player/ignishalfmasked.iqm.framegroups new file mode 100644 index 000000000..71128c6c8 --- /dev/null +++ b/models/player/ignishalfmasked.iqm.framegroups @@ -0,0 +1,23 @@ +0 36 15.000000 0 // dieone +36 20 15.000000 0 // dietwo +56 15 15.000000 1 // draw +71 20 15.000000 1 // duck +91 21 30.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 5.000000 1 // duckidle +143 41 5.000000 1 // idle +184 21 25.000000 0 // jump +205 15 15.000000 0 // painone +220 17 15.000000 0 // paintwo +237 3 15.000000 1 // shoot +240 21 15.000000 1 // taunt +261 21 35.000000 1 // run +282 21 35.000000 1 // runbackwards +303 21 35.000000 1 // strafeleft +324 21 35.000000 1 // straferight +345 2 15.000000 0 // deadone +347 2 15.000000 0 // deadtwo +349 21 35.000000 1 // forwardright +370 21 35.000000 1 // forwardleft +391 21 35.000000 1 // backright +412 21 30.000000 1 // backleft diff --git a/models/player/ignishalfmasked.iqm_0.tga b/models/player/ignishalfmasked.iqm_0.tga new file mode 100644 index 000000000..f1aecb284 Binary files /dev/null and b/models/player/ignishalfmasked.iqm_0.tga differ diff --git a/models/player/ignishalfmasked.iqm_0.txt b/models/player/ignishalfmasked.iqm_0.txt new file mode 100644 index 000000000..39c488c83 --- /dev/null +++ b/models/player/ignishalfmasked.iqm_0.txt @@ -0,0 +1,7 @@ +name Ignis - HalfMasked +species human +sex Male +weight 90 +age 31 + +Heavyweight Xonotic Solider diff --git a/models/player/ignishalfmasked_lod1.iqm b/models/player/ignishalfmasked_lod1.iqm new file mode 100644 index 000000000..c3b3fa487 Binary files /dev/null and b/models/player/ignishalfmasked_lod1.iqm differ diff --git a/models/player/ignishalfmasked_lod2.iqm b/models/player/ignishalfmasked_lod2.iqm new file mode 100644 index 000000000..3ad25e9c4 Binary files /dev/null and b/models/player/ignishalfmasked_lod2.iqm differ diff --git a/models/player/ignismasked.iqm b/models/player/ignismasked.iqm new file mode 100644 index 000000000..df34e3071 Binary files /dev/null and b/models/player/ignismasked.iqm differ diff --git a/models/player/ignismasked.iqm.framegroups b/models/player/ignismasked.iqm.framegroups new file mode 100644 index 000000000..71128c6c8 --- /dev/null +++ b/models/player/ignismasked.iqm.framegroups @@ -0,0 +1,23 @@ +0 36 15.000000 0 // dieone +36 20 15.000000 0 // dietwo +56 15 15.000000 1 // draw +71 20 15.000000 1 // duck +91 21 30.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 5.000000 1 // duckidle +143 41 5.000000 1 // idle +184 21 25.000000 0 // jump +205 15 15.000000 0 // painone +220 17 15.000000 0 // paintwo +237 3 15.000000 1 // shoot +240 21 15.000000 1 // taunt +261 21 35.000000 1 // run +282 21 35.000000 1 // runbackwards +303 21 35.000000 1 // strafeleft +324 21 35.000000 1 // straferight +345 2 15.000000 0 // deadone +347 2 15.000000 0 // deadtwo +349 21 35.000000 1 // forwardright +370 21 35.000000 1 // forwardleft +391 21 35.000000 1 // backright +412 21 30.000000 1 // backleft diff --git a/models/player/ignismasked.iqm_0.tga b/models/player/ignismasked.iqm_0.tga new file mode 100644 index 000000000..8e22e63c2 Binary files /dev/null and b/models/player/ignismasked.iqm_0.tga differ diff --git a/models/player/ignismasked.iqm_0.txt b/models/player/ignismasked.iqm_0.txt new file mode 100644 index 000000000..d1c85665f --- /dev/null +++ b/models/player/ignismasked.iqm_0.txt @@ -0,0 +1,7 @@ +name Ignis - Masked +species human +sex Male +weight 92 +age 31 + +Heavyweight Xonotic Solider diff --git a/models/player/pyria.iqm b/models/player/pyria.iqm index f1a0bd473..c4e75396f 100644 Binary files a/models/player/pyria.iqm and b/models/player/pyria.iqm differ diff --git a/models/player/pyria.iqm.framegroups b/models/player/pyria.iqm.framegroups index dc908e6b3..b98d0b981 100644 --- a/models/player/pyria.iqm.framegroups +++ b/models/player/pyria.iqm.framegroups @@ -1,23 +1,23 @@ -0 36 15.000000 0 // dieone -36 20 15.000000 0 // dietwo -56 15 15.000000 1 // draw -71 10 15.000000 1 // duck -81 11 15.000000 1 // duckwalk -92 16 15.000000 0 // duckjump -108 15 5.000000 1 // duckidle -123 16 5.000000 1 // idle -139 16 15.000000 0 // jump -155 15 15.000000 0 // painone -170 17 15.000000 0 // paintwo -187 3 15.000000 1 // shoot -190 35 15.000000 1 // taunt -225 12 20.000000 1 // run -237 12 20.000000 1 // runbackwards -249 12 20.000000 1 // strafeleft -261 12 20.000000 1 // straferight -273 2 15.000000 0 // deadone -275 2 15.000000 0 // deadtwo -277 12 20.000000 1 // forwardright -289 12 20.000000 1 // forwardleft -301 12 20.000000 1 // backright -313 12 20.000000 1 // backleft +0 36 20.000000 0 // dieone +36 27 20.000000 0 // dietwo +63 15 15.000000 1 // draw +78 20 15.000000 1 // duck +98 11 15.000000 1 // duckwalk +109 16 15.000000 0 // duckjump +125 15 5.000000 1 // duckidle +140 16 5.000000 1 // idle +156 16 15.000000 0 // jump +172 15 15.000000 0 // painone +187 17 15.000000 0 // paintwo +204 5 15.000000 1 // shoot +209 21 15.000000 1 // taunt +230 21 40.000000 1 // run +251 21 40.000000 1 // runbackwards +272 21 40.000000 1 // strafeleft +293 21 40.000000 1 // straferight +314 2 15.000000 0 // deadone +316 2 15.000000 0 // deadtwo +318 21 40.000000 1 // forwardright +339 21 40.000000 1 // forwardleft +360 21 40.000000 1 // backright +381 21 40.000000 1 // backleft diff --git a/models/player/pyria_lod1.iqm b/models/player/pyria_lod1.iqm new file mode 100644 index 000000000..5364a05ad Binary files /dev/null and b/models/player/pyria_lod1.iqm differ diff --git a/models/player/pyria_lod2.iqm b/models/player/pyria_lod2.iqm new file mode 100644 index 000000000..3179c714f Binary files /dev/null and b/models/player/pyria_lod2.iqm differ diff --git a/models/player/umbra.iqm b/models/player/umbra.iqm index 0bcbc9d85..2b53ad252 100644 Binary files a/models/player/umbra.iqm and b/models/player/umbra.iqm differ diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg index 742df8d0e..d20a12a3b 100644 --- a/physicsNoQWBunny.cfg +++ b/physicsNoQWBunny.cfg @@ -4,7 +4,7 @@ sv_maxspeed 400 sv_maxairspeed 400 sv_stopspeed 100 sv_accelerate 15 -sv_airaccelerate 1 +sv_airaccelerate 2 sv_friction 7 edgefriction 1 sv_stepheight 34 @@ -12,11 +12,11 @@ sv_jumpvelocity 300 sv_wateraccelerate -1 sv_waterfriction -1 sv_airaccel_sideways_friction -0.2 -sv_airaccel_qw -0.895 +sv_airaccel_qw -0.9475 sv_airstopaccelerate 2.5 -sv_airstrafeaccelerate 70 -sv_maxairstrafespeed 30 -sv_airstrafeaccel_qw -0.98 +sv_airstrafeaccelerate 21 +sv_maxairstrafespeed 200 +sv_airstrafeaccel_qw -0.99 sv_aircontrol 125 sv_aircontrol_power 2.5 sv_warsowbunny_turnaccel 0 diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index f42e14209..10086bbc4 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -21,6 +21,7 @@ float sv_warsowbunny_accel; float sv_warsowbunny_topspeed; float sv_warsowbunny_turnaccel; float sv_warsowbunny_backtosideratio; +float sv_speedlimit; .float ladder_time; .entity ladder_entity; @@ -448,6 +449,11 @@ void CPM_PM_Aircontrol(vector wishdir, float wishspeed) self.velocity_z = zspeed; } +float AdjustAirAccelQW(float accelqw, float factor) +{ + return copysign(bound(0.000001, 1 - (1 - fabs(accelqw)) * factor, 1), accelqw); +} + // example config for alternate speed clamping: // sv_airaccel_qw 0.8 // sv_airaccel_sideways_friction 0 @@ -480,6 +486,8 @@ void PM_Accelerate(vector wishdir, float wishspeed, float wishspeed0, float acce step = accel * frametime * wishspeed0; vel_xy_current = vlen(vel_xy); + if(sv_speedlimit) + accelqw = AdjustAirAccelQW(accelqw, (sv_speedlimit - bound(wishspeed, vel_xy_current, sv_speedlimit)) / max(1, sv_speedlimit - wishspeed)); vel_xy_forward = vel_xy_current + bound(0, wishspeed - vel_xy_current, step) * accelqw + step * (1 - accelqw); vel_xy_backward = vel_xy_current - bound(0, wishspeed + vel_xy_current, step) * accelqw - step * (1 - accelqw); if(vel_xy_backward < 0) @@ -616,9 +624,9 @@ void SV_PlayerPhysics() string c; // fix physics stats for g_movement_highspeed - self.stat_sv_airaccel_qw = copysign(bound(0, 1-(1-fabs(sv_airaccel_qw))*autocvar_g_movement_highspeed, 1), sv_airaccel_qw); + self.stat_sv_airaccel_qw = AdjustAirAccelQW(sv_airaccel_qw, autocvar_g_movement_highspeed); if(sv_airstrafeaccel_qw) - self.stat_sv_airstrafeaccel_qw = copysign(bound(0.001, 1-(1-fabs(sv_airstrafeaccel_qw))*autocvar_g_movement_highspeed, 1), sv_airstrafeaccel_qw); + self.stat_sv_airstrafeaccel_qw = AdjustAirAccelQW(sv_airstrafeaccel_qw, autocvar_g_movement_highspeed); else self.stat_sv_airstrafeaccel_qw = 0; diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 0212fce8a..da576360a 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -198,6 +198,7 @@ void StartFrame (void) sv_warsowbunny_topspeed = cvar("sv_warsowbunny_topspeed"); sv_warsowbunny_turnaccel = cvar("sv_warsowbunny_turnaccel"); sv_warsowbunny_backtosideratio = cvar("sv_warsowbunny_backtosideratio"); + sv_speedlimit = cvar("sv_speedlimit"); teamplay = cvar ("teamplay"); sys_frametime = cvar("sys_ticrate") * cvar("slowmo"); diff --git a/textures/ignis.tga b/textures/ignis.tga new file mode 100644 index 000000000..768ac8896 Binary files /dev/null and b/textures/ignis.tga differ diff --git a/textures/ignis_gloss.tga b/textures/ignis_gloss.tga new file mode 100644 index 000000000..ec7185d74 Binary files /dev/null and b/textures/ignis_gloss.tga differ diff --git a/textures/ignis_glow.tga b/textures/ignis_glow.tga new file mode 100644 index 000000000..c9eee4960 Binary files /dev/null and b/textures/ignis_glow.tga differ diff --git a/textures/ignis_norm.tga b/textures/ignis_norm.tga new file mode 100644 index 000000000..fd7695ef9 Binary files /dev/null and b/textures/ignis_norm.tga differ diff --git a/textures/ignis_shirt.tga b/textures/ignis_shirt.tga new file mode 100644 index 000000000..0a2f7fac5 Binary files /dev/null and b/textures/ignis_shirt.tga differ diff --git a/textures/ignishead.tga b/textures/ignishead.tga new file mode 100644 index 000000000..096b943f3 Binary files /dev/null and b/textures/ignishead.tga differ diff --git a/textures/ignishead_gloss.tga b/textures/ignishead_gloss.tga new file mode 100644 index 000000000..37bf376b6 Binary files /dev/null and b/textures/ignishead_gloss.tga differ diff --git a/textures/ignishead_glow.tga b/textures/ignishead_glow.tga new file mode 100644 index 000000000..d23f7315b Binary files /dev/null and b/textures/ignishead_glow.tga differ diff --git a/textures/ignishead_norm.tga b/textures/ignishead_norm.tga new file mode 100644 index 000000000..ec4b09519 Binary files /dev/null and b/textures/ignishead_norm.tga differ diff --git a/textures/ignishead_shirt.tga b/textures/ignishead_shirt.tga new file mode 100644 index 000000000..209b29832 Binary files /dev/null and b/textures/ignishead_shirt.tga differ