From: Mario Date: Thu, 22 Jun 2017 22:45:27 +0000 (+1000) Subject: Add sv_aircontrol_sidewards X-Git-Tag: xonotic-v0.8.5~2709 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37d93db98a5ba0fec820dd7333b873087b341291;p=xonotic%2Fxonotic-data.pk3dir.git Add sv_aircontrol_sidewards --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 2b431e8fe..625c5736b 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -299,6 +299,7 @@ set sv_friction_slick 0.5 set sv_slick_applygravity 0 set sv_aircontrol_backwards 0 "apply forward aircontrol options to backward movement" +set sv_aircontrol_sidewards 0 "apply forward aircontrol options to sideward movement" set sv_player_viewoffset "0 0 35" "view offset of the player model" set sv_player_mins "-16 -16 -24" "playermodel mins" diff --git a/physics.cfg b/physics.cfg index 1a38a7f61..b3439d691 100644 --- a/physics.cfg +++ b/physics.cfg @@ -29,6 +29,7 @@ set g_physics_xonotic_airaccel_sideways_friction 0 set g_physics_xonotic_aircontrol 100 set g_physics_xonotic_aircontrol_power 2 set g_physics_xonotic_aircontrol_backwards 0 +set g_physics_xonotic_aircontrol_sidewards 0 set g_physics_xonotic_aircontrol_penalty 0 set g_physics_xonotic_warsowbunny_airforwardaccel 1.00001 set g_physics_xonotic_warsowbunny_topspeed 925 @@ -58,6 +59,7 @@ set g_physics_nexuiz_airaccel_sideways_friction 0.35 set g_physics_nexuiz_aircontrol 0 set g_physics_nexuiz_aircontrol_power 2 set g_physics_nexuiz_aircontrol_backwards 0 +set g_physics_nexuiz_aircontrol_sidewards 0 set g_physics_nexuiz_aircontrol_penalty 0 set g_physics_nexuiz_warsowbunny_airforwardaccel 1.00001 set g_physics_nexuiz_warsowbunny_topspeed 925 @@ -87,6 +89,7 @@ set g_physics_quake_airaccel_sideways_friction 0 set g_physics_quake_aircontrol 0 set g_physics_quake_aircontrol_power 2 set g_physics_quake_aircontrol_backwards 0 +set g_physics_quake_aircontrol_sidewards 0 set g_physics_quake_aircontrol_penalty 0 set g_physics_quake_warsowbunny_airforwardaccel 1.00001 set g_physics_quake_warsowbunny_topspeed 925 @@ -116,6 +119,7 @@ set g_physics_warsow_airaccel_sideways_friction 0 set g_physics_warsow_aircontrol 0 set g_physics_warsow_aircontrol_power 2 set g_physics_warsow_aircontrol_backwards 0 +set g_physics_warsow_aircontrol_sidewards 0 set g_physics_warsow_aircontrol_penalty 0 set g_physics_warsow_warsowbunny_airforwardaccel 1.00001 set g_physics_warsow_warsowbunny_topspeed 925 @@ -145,6 +149,7 @@ set g_physics_defrag_airaccel_sideways_friction 0 set g_physics_defrag_aircontrol 150 set g_physics_defrag_aircontrol_power 2 set g_physics_defrag_aircontrol_backwards 0 +set g_physics_defrag_aircontrol_sidewards 0 set g_physics_defrag_aircontrol_penalty 0 set g_physics_defrag_warsowbunny_airforwardaccel 1.00001 set g_physics_defrag_warsowbunny_topspeed 925 @@ -174,6 +179,7 @@ set g_physics_quake3_airaccel_sideways_friction 0 set g_physics_quake3_aircontrol 0 set g_physics_quake3_aircontrol_power 2 set g_physics_quake3_aircontrol_backwards 0 +set g_physics_quake3_aircontrol_sidewards 0 set g_physics_quake3_aircontrol_penalty 0 set g_physics_quake3_warsowbunny_airforwardaccel 1.00001 set g_physics_quake3_warsowbunny_topspeed 925 @@ -203,6 +209,7 @@ set g_physics_vecxis_airaccel_sideways_friction 0.3 set g_physics_vecxis_aircontrol 0 set g_physics_vecxis_aircontrol_power 2 set g_physics_vecxis_aircontrol_backwards 0 +set g_physics_vecxis_aircontrol_sidewards 0 set g_physics_vecxis_aircontrol_penalty 0 set g_physics_vecxis_warsowbunny_airforwardaccel 1.00001 set g_physics_vecxis_warsowbunny_topspeed 925 @@ -232,6 +239,7 @@ set g_physics_quake2_airaccel_sideways_friction 0 set g_physics_quake2_aircontrol 0 set g_physics_quake2_aircontrol_power 2 set g_physics_quake2_aircontrol_backwards 0 +set g_physics_quake2_aircontrol_sidewards 0 set g_physics_quake2_aircontrol_penalty 0 set g_physics_quake2_warsowbunny_airforwardaccel 1.00001 set g_physics_quake2_warsowbunny_topspeed 925 @@ -261,6 +269,7 @@ set g_physics_bones_airaccel_sideways_friction 0 set g_physics_bones_aircontrol 150 set g_physics_bones_aircontrol_power 2 set g_physics_bones_aircontrol_backwards 0 +set g_physics_bones_aircontrol_sidewards 0 set g_physics_bones_aircontrol_penalty 0 set g_physics_bones_warsowbunny_airforwardaccel 1.00001 set g_physics_bones_warsowbunny_topspeed 925 @@ -290,6 +299,7 @@ set g_physics_overkill_airaccel_sideways_friction 0 set g_physics_overkill_aircontrol 125 set g_physics_overkill_aircontrol_power 2 set g_physics_overkill_aircontrol_backwards 0 +set g_physics_overkill_aircontrol_sidewards 0 set g_physics_overkill_aircontrol_penalty 180 set g_physics_overkill_warsowbunny_airforwardaccel 1.00001 set g_physics_overkill_warsowbunny_topspeed 925 diff --git a/physicsCPMA.cfg b/physicsCPMA.cfg index f2a4209c2..612a779da 100644 --- a/physicsCPMA.cfg +++ b/physicsCPMA.cfg @@ -24,6 +24,7 @@ sv_aircontrol 150 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsFruit.cfg b/physicsFruit.cfg index efe5b46ac..8e0a7f0fe 100644 --- a/physicsFruit.cfg +++ b/physicsFruit.cfg @@ -23,6 +23,7 @@ sv_airstrafeaccel_qw -0.97 sv_aircontrol 125 sv_aircontrol_power 2.5 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsHavoc.cfg b/physicsHavoc.cfg index 8d02ff462..e5d431b3e 100644 --- a/physicsHavoc.cfg +++ b/physicsHavoc.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsLeeStricklin-ModdedFruit.cfg b/physicsLeeStricklin-ModdedFruit.cfg index 61ce6557d..81d54d2ee 100644 --- a/physicsLeeStricklin-ModdedFruit.cfg +++ b/physicsLeeStricklin-ModdedFruit.cfg @@ -32,6 +32,7 @@ sv_aircontrol 125 sv_aircontrol_penalty 150 sv_aircontrol_power 2.5 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 800 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsLeeStricklin.cfg b/physicsLeeStricklin.cfg index 53ec90148..741224b11 100644 --- a/physicsLeeStricklin.cfg +++ b/physicsLeeStricklin.cfg @@ -32,6 +32,7 @@ sv_aircontrol 125 sv_aircontrol_penalty 150 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 800 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsLeeStricklinOld.cfg b/physicsLeeStricklinOld.cfg index 6a24567a9..83689d161 100644 --- a/physicsLeeStricklinOld.cfg +++ b/physicsLeeStricklinOld.cfg @@ -27,6 +27,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsLzd.cfg b/physicsLzd.cfg index f6f74cd21..de271c298 100644 --- a/physicsLzd.cfg +++ b/physicsLzd.cfg @@ -25,6 +25,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz10.cfg b/physicsNexuiz10.cfg index 9292016af..28d7c7f2c 100644 --- a/physicsNexuiz10.cfg +++ b/physicsNexuiz10.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz11.cfg b/physicsNexuiz11.cfg index 660e7b818..7633e5a28 100644 --- a/physicsNexuiz11.cfg +++ b/physicsNexuiz11.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz151.cfg b/physicsNexuiz151.cfg index 2c2e94c5f..aaec2756f 100644 --- a/physicsNexuiz151.cfg +++ b/physicsNexuiz151.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz151b.cfg b/physicsNexuiz151b.cfg index 45a46cb46..3cd9df61e 100644 --- a/physicsNexuiz151b.cfg +++ b/physicsNexuiz151b.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz16rc1.cfg b/physicsNexuiz16rc1.cfg index 86f1c31c7..17b8de8e4 100644 --- a/physicsNexuiz16rc1.cfg +++ b/physicsNexuiz16rc1.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz20.cfg b/physicsNexuiz20.cfg index fe4617688..168ec2d34 100644 --- a/physicsNexuiz20.cfg +++ b/physicsNexuiz20.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz25.cfg b/physicsNexuiz25.cfg index ed45598a9..6038e7b6a 100644 --- a/physicsNexuiz25.cfg +++ b/physicsNexuiz25.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNexuiz26.cfg b/physicsNexuiz26.cfg index 3f7cd58f1..cb088f9df 100644 --- a/physicsNexuiz26.cfg +++ b/physicsNexuiz26.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg index 77660a426..2b054788a 100644 --- a/physicsNoQWBunny-nexbased.cfg +++ b/physicsNoQWBunny-nexbased.cfg @@ -33,6 +33,7 @@ sv_aircontrol 125 sv_aircontrol_penalty 100 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsOverkill.cfg b/physicsOverkill.cfg index c40b755bf..526f7e222 100644 --- a/physicsOverkill.cfg +++ b/physicsOverkill.cfg @@ -38,6 +38,7 @@ sv_aircontrol 125 sv_aircontrol_penalty 180 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 900 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsQ.cfg b/physicsQ.cfg index 609a8f3d3..c880f511e 100644 --- a/physicsQ.cfg +++ b/physicsQ.cfg @@ -25,6 +25,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsQ2.cfg b/physicsQ2.cfg index a9fbe166d..992cb3e62 100644 --- a/physicsQ2.cfg +++ b/physicsQ2.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsQ2a.cfg b/physicsQ2a.cfg index 87817dfcf..ce3232696 100644 --- a/physicsQ2a.cfg +++ b/physicsQ2a.cfg @@ -25,6 +25,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsQ3.cfg b/physicsQ3.cfg index 7363b216d..a6d46ca82 100644 --- a/physicsQ3.cfg +++ b/physicsQ3.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsQBF.cfg b/physicsQBF.cfg index adc9df69c..39b705637 100644 --- a/physicsQBF.cfg +++ b/physicsQBF.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsQBFplus.cfg b/physicsQBFplus.cfg index 596d6ca3b..2e092b123 100644 --- a/physicsQBFplus.cfg +++ b/physicsQBFplus.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsSamual.cfg b/physicsSamual.cfg index 9041601e2..8506e2255 100644 --- a/physicsSamual.cfg +++ b/physicsSamual.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsWarsow.cfg b/physicsWarsow.cfg index 5fbe22bab..1bd23b647 100644 --- a/physicsWarsow.cfg +++ b/physicsWarsow.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 9 // activates warsow movement mode sv_warsowbunny_accel 0.1593 diff --git a/physicsWarsowClassicBunny.cfg b/physicsWarsowClassicBunny.cfg index 3b28d9099..985be7e95 100644 --- a/physicsWarsowClassicBunny.cfg +++ b/physicsWarsowClassicBunny.cfg @@ -24,6 +24,7 @@ sv_aircontrol 150 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsWarsowDev.cfg b/physicsWarsowDev.cfg index cf31a3f93..dff451087 100644 --- a/physicsWarsowDev.cfg +++ b/physicsWarsowDev.cfg @@ -24,6 +24,7 @@ sv_aircontrol 0 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 6 // activates warsow movement mode sv_warsowbunny_accel 0.1585 diff --git a/physicsX.cfg b/physicsX.cfg index 2ef068975..6b154508e 100644 --- a/physicsX.cfg +++ b/physicsX.cfg @@ -39,6 +39,7 @@ sv_aircontrol 100 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 900 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsX010.cfg b/physicsX010.cfg index 0dfe0b46c..9c5a7d334 100644 --- a/physicsX010.cfg +++ b/physicsX010.cfg @@ -32,6 +32,7 @@ sv_aircontrol 125 sv_aircontrol_penalty 150 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 800 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsX07.cfg b/physicsX07.cfg index 132aa9eff..1fd86cd80 100644 --- a/physicsX07.cfg +++ b/physicsX07.cfg @@ -38,6 +38,7 @@ sv_aircontrol 125 sv_aircontrol_penalty 180 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 800 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsXDF.cfg b/physicsXDF.cfg index db55fd849..e192ab476 100644 --- a/physicsXDF.cfg +++ b/physicsXDF.cfg @@ -30,6 +30,7 @@ sv_aircontrol 150 sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/physicsXDFLight.cfg b/physicsXDFLight.cfg index 4d1f652bb..24705deb8 100644 --- a/physicsXDFLight.cfg +++ b/physicsXDFLight.cfg @@ -30,6 +30,7 @@ sv_aircontrol 100 sv_aircontrol_penalty 100 sv_aircontrol_power 2.5 sv_aircontrol_backwards 0 +sv_aircontrol_sidewards 0 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index b8a14a4ce..56219b2c9 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -57,6 +57,7 @@ void Physics_UpdateStats(entity this, float maxspd_mod) STAT(MOVEVARS_AIRCONTROL, this) = Physics_ClientOption(this, "aircontrol", autocvar_sv_aircontrol); STAT(MOVEVARS_AIRCONTROL_POWER, this) = Physics_ClientOption(this, "aircontrol_power", autocvar_sv_aircontrol_power); STAT(MOVEVARS_AIRCONTROL_BACKWARDS, this) = Physics_ClientOption(this, "aircontrol_backwards", autocvar_sv_aircontrol_backwards); + STAT(MOVEVARS_AIRCONTROL_SIDEWARDS, this) = Physics_ClientOption(this, "aircontrol_sidewards", autocvar_sv_aircontrol_sidewards); STAT(MOVEVARS_AIRCONTROL_PENALTY, this) = Physics_ClientOption(this, "aircontrol_penalty", autocvar_sv_aircontrol_penalty); STAT(MOVEVARS_WARSOWBUNNY_AIRFORWARDACCEL, this) = Physics_ClientOption(this, "warsowbunny_airforwardaccel", autocvar_sv_warsowbunny_airforwardaccel); STAT(MOVEVARS_WARSOWBUNNY_TOPSPEED, this) = Physics_ClientOption(this, "warsowbunny_topspeed", autocvar_sv_warsowbunny_topspeed); @@ -137,6 +138,11 @@ void CPM_PM_Aircontrol(entity this, float dt, vector wishdir, float wishspeed) float movity = IsMoveInDirection(this.movement, 0); if(PHYS_AIRCONTROL_BACKWARDS(this)) movity += IsMoveInDirection(this.movement, 180); + if(PHYS_AIRCONTROL_SIDEWARDS(this)) + { + movity += IsMoveInDirection(this.movement, 90); + movity += IsMoveInDirection(this.movement, -90); + } float k = 32 * (2 * movity - 1); if (k <= 0) diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index 39cc573ee..571d3c6cb 100644 --- a/qcsrc/common/physics/player.qh +++ b/qcsrc/common/physics/player.qh @@ -47,6 +47,7 @@ bool IsFlying(entity a); #define PHYS_AIRCONTROL_PENALTY(s) STAT(MOVEVARS_AIRCONTROL_PENALTY, s) #define PHYS_AIRCONTROL_POWER(s) STAT(MOVEVARS_AIRCONTROL_POWER, s) #define PHYS_AIRCONTROL_BACKWARDS(s) STAT(MOVEVARS_AIRCONTROL_BACKWARDS, s) +#define PHYS_AIRCONTROL_SIDEWARDS(s) STAT(MOVEVARS_AIRCONTROL_SIDEWARDS, s) #define PHYS_AIRSPEEDLIMIT_NONQW(s) STAT(MOVEVARS_AIRSPEEDLIMIT_NONQW, s) #define PHYS_AIRSTOPACCELERATE(s) STAT(MOVEVARS_AIRSTOPACCELERATE, s) #define PHYS_AIRSTRAFEACCELERATE(s) STAT(MOVEVARS_AIRSTRAFEACCELERATE, s) diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index cde626a2a..2cb353361 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -295,6 +295,7 @@ REGISTER_STAT(MOVEVARS_AIRSPEEDLIMIT_NONQW, float) REGISTER_STAT(MOVEVARS_AIRSTRAFEACCEL_QW, float) REGISTER_STAT(MOVEVARS_AIRCONTROL_POWER, float) REGISTER_STAT(MOVEVARS_AIRCONTROL_BACKWARDS, bool) +REGISTER_STAT(MOVEVARS_AIRCONTROL_SIDEWARDS, bool) noref bool autocvar_sv_gameplayfix_nogravityonground; REGISTER_STAT(MOVEFLAGS, int, MOVEFLAG_VALID | (autocvar_sv_gameplayfix_q2airaccelerate ? MOVEFLAG_Q2AIRACCELERATE : 0) diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index cd042661f..0c2c1ed4f 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -518,6 +518,7 @@ float autocvar_sv_airaccel_sideways_friction; float autocvar_sv_aircontrol; float autocvar_sv_aircontrol_power; float autocvar_sv_aircontrol_backwards; +float autocvar_sv_aircontrol_sidewards; float autocvar_sv_aircontrol_penalty; float autocvar_sv_warsowbunny_airforwardaccel; float autocvar_sv_warsowbunny_topspeed;