Commit graph

44 commits

Author SHA1 Message Date
Simon
0723c2335e Make saber combat in JKA match JKO
g_saberRealisticCombat should be set to "1"
g_dismemberment should be set to "4"
g_saberMoreRealistic is no longer used
changed logic so that it should be the same approach for dealing damage as JKO with the above settings when TBDC is enabled
fixed saber bounce in JKA too
2023-06-15 22:07:24 +01:00
Simon
fc72b58bb6 TBDC and more..
- Merged TBDC changes from JKO
- Made B/Y buttons not switch when switched sticks (so saber toggle is on correct hand)
- Fixed issue with switched sticks making item selector scroll use wrong thumbstick
- Fix crash when using built in menu to choose alternative saber (need to find out where model has gone though)
2023-06-07 23:33:59 +01:00
Simon
b54dd726df Allow player to override the push/pull motion gesture 2023-05-29 08:03:45 +01:00
Simon
beb5a6d7c6 Small tweaks to the melee 2023-05-22 21:28:54 +01:00
Simon
dfa54a439a A number of changes
- Made Melee available - punch stormtroopers to death! (default melee damage is now 25)
- Draw hand models when in melee (to be replaced with fists soon)
- Made movement not reactivate saber by default (cvar controlled)
- Draw open hand when saber is thrown
2023-05-21 22:38:42 +01:00
Simon
26487d6233 Lots of changes to get vehicles/animals working nicely
also fixed some of the 3rd person 6DoF movement
ensure force speed briefly affects FOV
2023-05-14 22:50:24 +01:00
Simon
86b974ea2e Hopefully final fix to prevent Kata attack being triggered in 1st person when throwing saber 2023-04-26 21:18:33 +01:00
Simon
7c5184592f Prevent special attack being triggered when throwing saber in JKA 2023-04-24 22:18:09 +01:00
Simon
c5c6c1dfb6 Make sure you can exit security cameras! 2023-04-21 09:56:40 +01:00
Simon
9202d2896e Improved dual saber haptics 2023-04-20 19:55:48 +01:00
Simon
abedc8d96c JKA Weapon Haptics & Fix for unresponsive menu after training in JKA 2023-04-19 22:53:48 +01:00
Petr Bartos
4bea59c543 Add delay before allowing to skip cinematic 2023-04-18 23:01:48 +01:00
Petr Bartos
82af313786 Merge branch 'main' into contributions 2023-04-13 18:59:46 +02:00
Petr Bartos
7680cb1288 Fix use action when controlling droid; fix droid view help 2023-04-12 22:26:44 +02:00
Simon
6314561b52 Switch selector on offhand using offhand thumbstick 2023-04-11 08:49:42 +01:00
Simon
a2ff16b576 Quick Save/Load in Selector
Haven't been able to test yet!
2023-04-10 19:42:06 +01:00
Grant Bagwell
70468332d6 TBDC Cleanup 2023-04-05 22:19:45 +02:00
Grant Bagwell
e1b03fdcc6 Fixing Quick Save 2023-04-05 21:57:07 +02:00
Grant Bagwell
d6235ef199 Darkened Menu GFX 2023-04-05 00:30:35 +02:00
Grant Bagwell
4c751fcb59 Y Close Datapad 2023-04-04 23:59:12 +02:00
Grant Bagwell
1939a26542 TBDC
Laser Saber deflections
Guns balancing.
2023-04-04 23:37:41 +02:00
Grant Bagwell
65674abe2a Fix Controller Location Buzz for Quick Save / Load 2023-04-03 21:36:35 +02:00
Grant Bagwell
cb52d310c1 TBDC Weapons 2023-04-02 23:18:28 +02:00
Petr Bartos
05fc4d5ab4 Fix menu haptics 2023-04-02 09:16:00 +01:00
Petr Bartos
5e66ebf6fc Allow to skip cinematics also by triggers 2023-04-01 09:41:31 +01:00
Petr Bartos
587277fa7f Fix use/crouch buttons on switched control schemes 2023-04-01 09:41:31 +01:00
Petr Bartos
6202017b6a Fix virtual gun stock 2023-03-30 21:50:11 +01:00
Simon
3c64fa7e3e Lowered Stun Baton trigger velocity 2023-03-28 23:19:29 +01:00
Simon
0a9206642e Slight adjustment to muzzle position based on whether scoped/two-handed 2023-03-28 13:52:23 +01:00
Simon
ef7a6a6531 For gesture force push / pull ensure palm is facing correct direction for correct force
palm away = force push
palm facing you = force pull
2023-03-22 22:58:17 +00:00
Simon
e51b7b0c0f Improve transition to scope so it more matches where the player is pointing 2023-03-22 22:12:48 +00:00
Simon
31184c1f4a added a cvar for development weapon alignment toggle 2023-03-22 21:43:59 +00:00
Simon
858c5b7f31 Made stun baton a velocity triggered weapon 2023-03-22 20:34:12 +00:00
Simon
d00d0a6a26 Do-not-wrap-cursor-Do-not-switch-menu-controls
Thanks @MuadDib!

Co-Authored-By: petr666 <5103207+petr666@users.noreply.github.com>
2023-03-21 20:10:40 +00:00
Simon
ec021f9b2e Two handed saber improvement 2023-03-21 20:04:54 +00:00
Simon
3fcbf553d6 Weapon Alignment 2023-03-20 21:33:54 +00:00
Simon
3a8b6c3a0b Ensure menu can be used if user has switched option buttons on Quest 2023-03-17 21:58:55 +00:00
Simon
c110cd7bb2 Ensure force push and pull work with a single saber 2023-03-12 10:03:42 +00:00
Simon
c8fa750c6e Prevent random weapon position being stuck
pretty sure it is an uninit variable (vr.saberBlockDebounce)
2023-03-11 15:39:22 +00:00
Simon
8c38301bf0 off hand dual saber now activated by swing 2023-03-08 21:05:28 +00:00
Simon
e4da52c377 Better E11 scope aiming 2023-03-07 22:53:18 +00:00
Simon
9e00445947 @MuadDib's Improve-security-camera-controls 2023-03-05 08:51:50 +00:00
Simon
b00d5053dd @MuadDib's Multi-hand-use-gesture 2023-03-05 08:48:31 +00:00
Simon
72ba9972d8 Renaming JKQuest to JKXR
Rename JKQuest -> JKXR

Renaming JKQuest to JKXR

Renaming JKQuest to JKXR

Renaming JKQuest to JKXR
2023-03-01 22:14:44 +00:00
Renamed from Projects/Android/jni/JKVR/VrInputDefault.cpp (Browse further)