Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Discard non-existent dvar #153

Merged
merged 5 commits into from
Oct 15, 2024
Merged

Discard non-existent dvar #153

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b22e100
Discard non-existent dvar
enclave Oct 11, 2024
f0cf738
Merge branch 'develop' into develop
enclave Oct 11, 2024
8c01a0e
Replace AimAssist_Lerp
enclave Oct 12, 2024
ea07ea9
Restore aim_lockon_pitch_strength and update aim_lockon_strength desc…
enclave Oct 13, 2024
add6c4a
Merge branch 'develop' into develop
Rackover Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Components/Modules/Gamepad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ namespace Components
Dvar::Var Gamepad::aim_slowdown_yaw_scale_ads;
Dvar::Var Gamepad::aim_lockon_enabled;
Dvar::Var Gamepad::aim_lockon_deflection;
Dvar::Var Gamepad::aim_lockon_pitch_strength;
Dvar::Var Gamepad::aim_lockon_strength;

Gamepad::GamePadGlobals::GamePadGlobals()
Expand Down Expand Up @@ -507,7 +506,7 @@ namespace Components
const auto pitchTurnRate =
(screenTarget->velocity[0] * aaGlob.viewAxis[2][0] + screenTarget->velocity[1] * aaGlob.viewAxis[2][1] + screenTarget->velocity[2] * aaGlob.viewAxis[2][2]
- (aaGlob.ps.velocity[0] * aaGlob.viewAxis[2][0] + aaGlob.ps.velocity[1] * aaGlob.viewAxis[2][1] + aaGlob.ps.velocity[2] * aaGlob.viewAxis[2][2]))
/ arcLength * 180.0f * aim_lockon_pitch_strength.get<float>();
/ arcLength * 180.0f * aim_lockon_strength.get<float>();

const auto yawTurnRate =
(screenTarget->velocity[0] * aaGlob.viewAxis[1][0] + screenTarget->velocity[1] * aaGlob.viewAxis[1][1] + screenTarget->velocity[2] * aaGlob.viewAxis[1][2]
Expand Down Expand Up @@ -1882,7 +1881,6 @@ namespace Components
aim_slowdown_yaw_scale_ads = Dvar::Var("aim_slowdown_yaw_scale_ads");
aim_lockon_enabled = Dvar::Var("aim_lockon_enabled");
aim_lockon_deflection = Dvar::Var("aim_lockon_deflection");
aim_lockon_pitch_strength = Dvar::Var("aim_lockon_pitch_strength");
aim_lockon_strength = Dvar::Var("aim_lockon_strength");
}

Expand Down
1 change: 0 additions & 1 deletion src/Components/Modules/Gamepad.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ namespace Components
static Dvar::Var aim_slowdown_yaw_scale_ads;
static Dvar::Var aim_lockon_enabled;
static Dvar::Var aim_lockon_deflection;
static Dvar::Var aim_lockon_pitch_strength;
static Dvar::Var aim_lockon_strength;

static void MSG_WriteDeltaUsercmdKeyStub();
Expand Down