Commit graph

73 commits

Author SHA1 Message Date
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
Simon
f16e6b2e7e Various changes
- Force Speed FOV changes
- Fix skybox
- Scoped weapons
2023-03-08 21:06:51 +00:00
Simon
80f4e9520a Improved font scaling 2023-03-07 22:52:55 +00:00
Simon
5ba176fced @MuadDib's Usable-objects-hint 2023-03-05 08:50:51 +00:00
Simon
6b40649ef5 Added missing shaders and comfort vignette drawing 2023-03-01 23:20:26 +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
348bd46f62 Support for first person sabers - including dual wield and two-handed
needs more work, but going well
2023-02-02 22:53:34 +00:00
Simon
b67d87fd5c Patched immersive camera changes from JKO 2023-02-02 22:52:28 +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
4b1e010ca0 Use calculated projection matrix
sorts out weird warping on the Pico.
Allows for FOV to be overridden still for some effects (force speed)
2022-12-14 15:17:44 +00:00
Simon
2c00a2a40f We have visuals!!
OpenXR is now at least rendering the menu screen!
2022-12-14 15:17:43 +00:00
Simon
a8a402288b Fix issue with muzzle flash only causing dlight in the left eye 2022-11-26 10:14:13 +00:00
Simon
077cfe159e HAPTICS!!!
Controller only so far - still needs some things implemented, but mostly there
2022-11-17 00:05:01 +00:00
Simon
6695f0bc0d Finished implementation of disruptor scope 2022-11-09 21:28:18 +00:00
Simon
baafc2ec8d Several fixes
- Disruptor scope now working pretty much as expected
- Fix to menu hints now rendering correctly (@MuadDib)
- Removed roll from thrown saber angles
2022-11-08 21:43:12 +00:00
Simon
e425c34317 Fixed Ladyluck remote turret
Also included @MuadDib's latest menu changes
Force Crosshair now seperately configurable
Restored the mission failed text
2022-11-07 22:14:36 +00:00
Simon
5c09153f67 Decouple view angles from 3rd person saber
Feels a lot cleaner, also made the turn mode have 3 options:
0 = Snap turn
1 = Snap turn (1st Person) & Smooth turn (3rd person)
2 = Smooth turn
2022-10-31 22:17:09 +00:00
Simon
89f925c373 Immersive Cutscene 6DoF
also:
- 6DoF using mounted guns
- Better HUD scaling when Zoomed
2022-10-30 23:15:58 +00:00
Simon
b1207a60ca Few small changes...
- Tidied up selector rendering a little bit for when no weapon held
- render a hand when no weapon held
- don't allow weapon stabilisation when holding no weapon or using saber
- better support for left handed mode
- disable face culling for VR view models (weapons / hands) so they look much better, especially left handed!
2022-10-29 09:44:25 +01:00