Commit graph

416 commits

Author SHA1 Message Date
Simon
ca40a99ec1 Implement separate saber pitch adjustment
it uses the OpenXR grip pose and an adjuster separate to the weapon one
2023-08-12 15:25:23 +01:00
Simon
e5b561a46b Revert "new cvar r_alwaysmaxlod for PCVR build"
This reverts commit 8e7c1f69a4.
2023-08-08 20:29:41 +01:00
Simon
8e7c1f69a4 new cvar r_alwaysmaxlod for PCVR build 2023-08-06 17:37:42 +01:00
Simon
9387dea98f Modified PCVR build to use 64 bit OpenAL 2023-08-06 17:36:27 +01:00
Simon
e2c4cfd015 Don't use vid_restart, get user to manually restart JKXR on video settings change 2023-08-05 18:15:52 +01:00
Simon
84f257ac60 Updated Beef Crawl & small menu/cvar tweaks 2023-08-04 11:37:17 +01:00
Simon
43503dbeff Fixed shadow defaulting
1 - Blobs for Standalong
2 - Stencils for PCVR
2023-08-03 08:14:13 +01:00
Simon
b46da13606 Cloaking effect really doesn't work in VR 2023-08-03 07:47:09 +01:00
Simon
25d8ef18e1 Separate cvar cg_renderToTextureFX in two
cg_renderToTextureFX and cg_forceBlurRenderToTextureFX
2023-08-01 21:09:44 +01:00
Simon
7766547abc FInal improvements to HUD text drawing 2023-08-01 18:39:05 +01:00
Simon
a1268d9045 Slight adjustment as to when to draw hand models 2023-08-01 18:22:19 +01:00
Simon
afaf887a47 Fix adjustment to weapon scopes for asymmetric fov HMDs 2023-07-31 22:57:24 +01:00
Simon
c01babfc1d More unification of the two builds 2023-07-31 22:42:28 +01:00
Simon
2290193a95 Fix for HUD scaling with new projections 2023-07-31 22:42:04 +01:00
Simon
67e1d61214 Fix for the zooming fov cross-eyed issue 2023-07-31 22:41:33 +01:00
Simon
6a09e2d411 A few PCVR specific fixes
- Restored missing item selector beam
- Allow much wider angle pitch adjust, hopefully enough for Index users
2023-07-29 19:14:24 +01:00
Simon
e0b65748a0 Changes for PCVR build 2023-07-27 23:24:35 +01:00
Simon
5010b6ff54 Restored mp source (for the sake of cmake) 2023-07-27 23:11:12 +01:00
Simon
f0eb5262eb Integration of PCVR into the main repo 2023-07-27 23:08:48 +01:00
Simon
9411068172 Next set of changes to sync pcvr and standalone 2023-07-27 22:46:41 +01:00
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
3fd5e15103 For JKA blocks/parries/knockaways reverse the lerp
This makes the saber kick in the right direction
2023-07-15 20:01:57 +01:00
Simon
09cf2d49f3 Use the complete JKO level 3 saber seek code 2023-07-14 22:41:21 +01:00
Simon
b1a9ff3990 Add Sith Sword to the cheat menu 2023-07-14 22:16:10 +01:00
Simon
1477f452a8 Ensure hand drawn when throwing one of the dual sabers 2023-07-13 22:10:04 +01:00
Simon
1a6a99e2a7 Fix issue with frozen or enemy lasers firing in the wrong direction consistently 2023-07-13 21:52:57 +01:00
Simon
f4a6e66ed0 Attempt to prevent yaw lock when death slo mo 2023-07-13 21:52:13 +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
19be309f9a Updated version to 1.1.10 2023-07-10 23:38:13 +01:00
Simon
d98a7aad7f Ensure roll is used when in scope 2023-07-10 23:36:51 +01:00
Simon
bda2e7e3f1 Re-instated force level 3 saber throw enemy seek from JKO in JKA 2023-07-10 23:36:19 +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
f4d9ab0854 Let Noghri also be sliced up easily 2023-07-10 19:59:05 +01:00
Simon
8551460577 Let the saber cut through sand people like butter 2023-06-30 20:26:30 +01:00
Simon
1a25d96c3d Remove asserts 2023-06-20 22:18:16 +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
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
0bc707c11e Update Version to 1.1.8 2023-06-08 22:41:10 +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
b54dd726df Allow player to override the push/pull motion gesture 2023-05-29 08:03:45 +01:00
Simon
3116c5296c Proper 6DoF for Flechette alt-fire 2023-05-29 08:03:17 +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
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
b7fed25470 Make alt-fire of concussion rifle 6DoF 2023-05-21 14:46:08 +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
374e2f956c Fix sky over Hoth 2023-05-09 23:04:55 +01:00
Simon
a7318c2d89 Fix insta-death on elevator situation
seems gesture use was triggering the "hurt_touch" function of the elevator entity which was inflicting 10000 fall damage to the player!
2023-05-09 22:49:33 +01:00
Simon
4405c2214f Fix quick save crash 2023-05-09 22:06:11 +01:00
Simon
176d7efead Update version
and remove an assert that was causing an issue in debug with the dark forces mod
2023-05-04 19:53:52 +01:00
Simon
88e4e2f8ba Fix for crash in Dark Forces mod 2023-05-04 19:48:56 +01:00
Petr Bartos
cc79e8ae3f Allow to override weapon adjustment 2023-05-01 09:48:03 +01:00
Simon
bde413658b Fix crash on quest firmware v53 2023-04-28 19:45:31 +01:00
Simon
1764c82c59 Update version number 2023-04-28 19:45:13 +01:00
Simon
d682771bbc Update to API level 29 2023-04-28 19:44:54 +01:00
Simon
0674c3080f haptic feedback when saber is burning scorch marks or boiling water 2023-04-26 21:18:56 +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
0e3c88fb1c make saber throw in JKA work the same as JKO 2023-04-24 22:40:52 +01:00
Simon
4ada169242 version number update 2023-04-24 22:18:17 +01:00
Simon
7c5184592f Prevent special attack being triggered when throwing saber in JKA 2023-04-24 22:18:09 +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
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
34bb30d714 Fix staff saber top blade not actually blocking shots 2023-04-19 23:51:56 +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
Simon
ccd581c8d0 FOV fix for remote turrets on JKA 2023-04-16 22:25:18 +01:00
Simon
195cfb8251 Fix FOV on Lady Luck turret 2023-04-16 22:14:25 +01:00
Petr Bartos
5acadef11e Fix AT-ST usable hint icon 2023-04-16 15:18:57 +02:00
Simon
35b89acc87 Support for changeable fresh rate 2023-04-15 12:32:35 +01:00
Petr Bartos
539bfa8956 Ensure proper menu defaults on the very first start 2023-04-15 00:02:59 +02:00
Petr Bartos
216a225aa6 Fix storing of force crosshair option 2023-04-14 22:41:24 +02:00
Petr Bartos
48c2486aad Merge remote-tracking branch 'origin/main' into contributions 2023-04-14 22:23:24 +02:00
Petr Bartos
a72ca459c5 Intern all default values; Remove no longer needed configuration files 2023-04-14 22:19:47 +02:00
Petr Bartos
32c4e6eac1 Ensure weapon adjustment is applied when resetting to defaults 2023-04-14 20:59:41 +02:00
Grant Bagwell
fcb9169955 Increased default force motion trigger 2023-04-14 18:58:32 +02:00
Grant Bagwell
2433ae4110 Change Force Crosshair 2023-04-14 18:55:56 +02:00
Grant Bagwell
4ab6a6024a Fixed player knockback.... hopefully 2023-04-14 17:01:16 +02:00
Grant Bagwell
7deeee7a6f Increased Force Power Visibility 2023-04-14 17:01:00 +02:00
Petr Bartos
fada09a0bb Fix remote turret on-screen help 2023-04-13 20:38:13 +02: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
Grant Bagwell
37d5ac4184 Changes to TBDC
Different menu text + added vanilla mode
2023-04-12 18:12:07 +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
d3dcac8f9d Save game crash fix in JKO 2023-04-11 20:58:56 +01:00
Simon
6314561b52 Switch selector on offhand using offhand thumbstick 2023-04-11 08:49:42 +01:00
Simon
3b2ffd7289 Attempted fix for save game crash
- Not really a proper fix, but might at least workaround it
2023-04-11 08:39:32 +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
b9d0314a6a Make getting into AT-ST easier 2023-04-09 19:38:32 +02:00
Petr Bartos
d121206f83 Tune touch gesture distance; Improve use interaction in 3rd person. 2023-04-08 22:49:28 +02:00