Commit graph

103 commits

Author SHA1 Message Date
Simon
1d5be37787 Code re-org to sync with PCVR 2023-07-27 22:08:18 +01:00
Simon
a58e4051b5 Changes to sync up with the PCVR build 2023-07-27 21:56:20 +01:00
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
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
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
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
195cfb8251 Fix FOV on Lady Luck turret 2023-04-16 22:14:25 +01:00
Petr Bartos
48c2486aad Merge remote-tracking branch 'origin/main' into contributions 2023-04-14 22:23:24 +02:00
Grant Bagwell
7deeee7a6f Increased Force Power Visibility 2023-04-14 17:01:00 +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
4a1d90e729 Merge branch 'main' into contributions 2023-04-06 19:12:07 +02:00
Grant Bagwell
1939a26542 TBDC
Laser Saber deflections
Guns balancing.
2023-04-04 23:37:41 +02: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
Simon
9877859676 Update to the VC+Elin weapons pack
includes a sweet new saber hilt
2023-03-30 21:44:36 +01:00
Petr Bartos
94e82c2da3 Fix subtitles rendering; Fix rendering of other centered texts 2023-03-28 22:44:38 +01:00
Simon
62b9a0bfab Hide force power aura when item selector is shown 2023-03-28 13:52:45 +01:00
Simon
858c5b7f31 Made stun baton a velocity triggered weapon 2023-03-22 20:34:12 +00:00
Simon
93efed3b24 Corrected logic error with saber-lock hilt rendering scenario 2023-03-13 19:37:13 +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
80f4e9520a Improved font scaling 2023-03-07 22:52:55 +00:00
Simon
9e00445947 @MuadDib's Improve-security-camera-controls 2023-03-05 08:51:50 +00:00
Simon
5ba176fced @MuadDib's Usable-objects-hint 2023-03-05 08:50:51 +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
Simon
eed4ea9e15 Allow demo assets map to be played
only register appropriate weapon models if playing the demo map
2023-02-26 15:08:31 +00:00
Simon
82ace54c07 Start of proper changes for JKA 2023-02-26 09:45:41 +00:00
Simon
773593c8bd Started on JKA
- First person view working
- Merged a lot of other changes from JKO
2023-02-01 21:11:04 +00:00
Simon
89fb6f6887 Configurable HUD scaling menu options 2023-01-31 21:45:13 +00:00
Simon
a83dfc7989 Added haptics for ATST 2023-01-29 08:36:46 +00:00
Simon
3b139bb537 ATST fixes
- Push muzzle flash away so it doesn't blind player
- Ensure ATST sounds play even though player is in first person (cg_players.cpp)
- Slight improvement to position of hand models
- Weapon selector shows the two Main/Side options for ATST
2023-01-28 23:36:26 +00:00
Simon
e2902ca3f9 Make controlling a vehicle (AT-ST) work a lot better - uses 1st person view 2023-01-28 15:28:24 +00:00
Simon
49f758c7f9 Update cg_camera.cpp 2023-01-26 22:04:05 +00:00
Simon
7821de9e7e Ensure controlling an NPC allows time for the view angles to be set correctly 2023-01-26 22:03:41 +00:00
Simon
f19b230169 Bit of camera tidy up 2023-01-25 09:24:23 +00:00
Simon
3d22e95737 Huge improvement to immersive cutscene camera control 2023-01-24 18:52:10 +00:00
Simon
93f18988d4 some hacking to try to make immersive cutscenes better
not great so far
2023-01-23 22:49:03 +00:00
Simon
7578e39d67 Scope Zooming (in and out) (@MuadDib) 2023-01-19 21:16:20 +00:00
Simon
9bda989514 Ensure projection works on Meta Quest
Also fixed emplaced guns exiting by gesture use
2022-12-14 18:19:58 +00:00