Commit graph

94 commits

Author SHA1 Message Date
Simon
b4596caab9 Don't trigger haptics when blade hits solid if saber is in flight 2023-07-12 16:33:15 +01:00
Simon
d98a7aad7f Ensure roll is used when in scope 2023-07-10 23:36:51 +01:00
Simon
5cffb00cd4 Staff-saber now allows bottom blade to be shut off
Use B to toggle:  Two Blades -> Single Blade -> Off
2023-07-10 22:05:46 +01:00
Simon
0a7fac269f Fixed using turret guns when saber equipped
by switch to WP_NONE
2023-06-20 22:17:59 +01:00
Simon
5a6ef6f77a If saber model name is missing, just use the default saber model
looks better than no saber model at all and right now I can't be bothered to dig any deeper into this one
2023-06-08 22:31:52 +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
72fc1b9b83 Fix missing melee icon in JKO
and don't draw crosshair when melee active
2023-06-01 23:04:31 +01:00
Simon
b074d1cbf6 Get the ATST working correctly in JKA 2023-05-27 12:17:20 +01:00
Simon
2a3efff83e Fix crash when entering AT-ST in JKA 2023-05-27 00:14:10 +01:00
Simon
ff6827a4ed Fix missing hand in JKO when saber equipped 2023-05-26 23:16:44 +01:00
Simon
62eec97249 Proper fist models
.. for fisting stormtroopers with

Co-Authored-By: Grant Bagwell <general@grantbagwell.co.uk>
2023-05-26 22:04:16 +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
4e94e0ee8b Fix for vanishing tauntaun 2023-05-15 22:02:16 +01:00
Simon
948b6fb281 Hide hands when in vehicles 2023-05-15 22:02:05 +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
7faa7755dd Implement stance switching in 3rd person JKA 2023-05-12 18:41:08 +01:00
Simon
0674c3080f haptic feedback when saber is burning scorch marks or boiling water 2023-04-26 21:18:56 +01:00
Simon
ec9aab5f6f Prevent black screen on Bakura level
..when enemies use their clocking devices

Also use old style force effect for push/pull as the new effect doesn't actually work correctly (compared with flatscreen)
2023-04-24 22:17:52 +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
Simon
ccd581c8d0 FOV fix for remote turrets on JKA 2023-04-16 22:25:18 +01:00
Petr Bartos
539bfa8956 Ensure proper menu defaults on the very first start 2023-04-15 00:02:59 +02:00
Petr Bartos
48c2486aad Merge remote-tracking branch 'origin/main' into contributions 2023-04-14 22:23:24 +02:00
Grant Bagwell
2433ae4110 Change Force Crosshair 2023-04-14 18:55:56 +02:00
Petr Bartos
82af313786 Merge branch 'main' into contributions 2023-04-13 18:59:46 +02:00
Simon
c7c66e46a7 Revert "Arrange quick save icons horizontally"
This reverts commit 20f8fff3fe.

Also make the icons white
2023-04-12 08:37:36 +01:00
Simon
20f8fff3fe Arrange quick save icons horizontally 2023-04-11 21:00:09 +01:00
Simon
a2ff16b576 Quick Save/Load in Selector
Haven't been able to test yet!
2023-04-10 19:42:06 +01:00
Petr Bartos
260d501776 Fix and improve weapon adjustment helper axes 2023-04-08 22:34:59 +02:00
Petr Bartos
fe9e12a3f9 Merge branch 'main' into contributions 2023-04-03 22:55:29 +02:00
Simon
64ab392fc5 JKA: Some CVAR change to increase performance 2023-04-02 19:42:39 +01:00
Petr Bartos
21483d0d5a Make weapon adjustment mode independent for each weapon; Optimize loading of weapon adjustments 2023-04-01 11:25:11 +02:00
Simon
52fcc8a49e Revert "Removed the no-backface-culling for weapons as it is no longer needed"
This reverts commit b899b99178.
2023-04-01 09:47:48 +01:00
Simon
5f56cf48fc Camera shake fix part 2 2023-03-30 22:16:37 +01:00
Simon
3dd7833cd0 Disable camera shake when charging a weapon's alt fire 2023-03-30 22:06:18 +01:00
Simon
b899b99178 Removed the no-backface-culling for weapons as it is no longer needed
used only for hand models now
2023-03-30 21:45:10 +01:00
Petr Bartos
94e82c2da3 Fix subtitles rendering; Fix rendering of other centered texts 2023-03-28 22:44:38 +01:00
Simon
3b5121e349 Render Special Effects on hand/weapon when force power is activated for protection etc 2023-03-27 21:37:49 +01:00
Simon
858c5b7f31 Made stun baton a velocity triggered weapon 2023-03-22 20:34:12 +00:00
Simon
ec021f9b2e Two handed saber improvement 2023-03-21 20:04:54 +00:00
Simon
0517b987e2 Fix missing muzzle flash in JKA
Not really sure why it didn't work, but this specific handling for the player seems to fix it
2023-03-20 22:15:58 +00:00
Simon
93efed3b24 Corrected logic error with saber-lock hilt rendering scenario 2023-03-13 19:37:13 +00:00
Simon
7528b8dc40 Ensure hand is drawn if dual sabering, but holding a different weapon 2023-03-12 10:58:23 +00:00
Simon
a67dc074cb Draw sabers in correct position when in enemy lock
and don't draw in security camera views
2023-03-12 10:49:04 +00:00
Simon
be59694bc5 Fix force push/pull use when dual saber but holding other weapon 2023-03-12 10:48:31 +00:00
Simon
f46644c08c slight FOV warping in water 2023-03-11 23:28:38 +00:00
Simon
4e6b7c226a Ensure sky box renders correctly when looking through a weapon scope
and hopefully in other circumstances too
2023-03-11 20:20:20 +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
2eafff44ee Force powers aimed using controllers 2023-03-10 22:54:28 +00:00
Simon
e19f8b9c1d Force Crosshair & Force See effect correct 2023-03-08 22:56:45 +00:00