teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
549 commits 12 branches 21 tags 207 MiB
Commit graph

447 commits

Author SHA1 Message Date
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
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
Simon Brown
67b7d26de8
Merge pull request #4 from DrBeef/TBDC 
TBDC Scales in Code
 2023-04-06 16:54:01 +01:00
Grant Bagwell
ccd63d4eec Forced for Extended Menu 2023-04-06 16:57:36 +02:00
Grant Bagwell
d6b3e8eb65 TBDC Scales in Code 2023-04-06 16:55:02 +02:00
Simon Brown
316c2a2904
Merge pull request #2 from DrBeef/TBDC 
Team Beef Directors Cut
 2023-04-06 10:02:01 +01:00
Simon
a271b61ac7 Switch to use Bummser's NPC file if TBDC is disabled 2023-04-06 09:58:18 +01:00
Simon
a2f1644d72 Update version to 1.0.0 for release 2023-04-06 08:39:02 +01:00
Grant Bagwell
90b694ff60 Last Cleanup 2023-04-05 22:21:41 +02: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
95950f2390 Updated ratios per difficulty 2023-04-05 20:08:10 +02:00
Grant Bagwell
d6235ef199 Darkened Menu GFX 2023-04-05 00:30:35 +02:00
Simon
a3fdb460c4 Prevent crash when throwing Saber 
seems it is indexing the g2 model surface that doesn't exist, might be something to do with the new hilt and the old hilt being in the save. Not sure, but this stops it crashing.
 2023-04-04 23:03:31 +01:00
Grant Bagwell
4c751fcb59 Y Close Datapad 2023-04-04 23:59:12 +02:00
Grant Bagwell
a1216665c8
Merge pull request #1 from DrBeef/main 
Main -> TDBC
 2023-04-04 23:48:20 +02:00
Grant Bagwell
1939a26542 TBDC 
Laser Saber deflections
Guns balancing.
 2023-04-04 23:37:41 +02:00
Petr Bartos
fe9e12a3f9 Merge branch 'main' into contributions 2023-04-03 22:55:29 +02:00
Simon
2b255ac3ea Improved version string 2023-04-03 21:26:39 +01:00
Simon
62284414d0 Ensure intro vid can be skipped without having to press trigger first 2023-04-03 21:26:20 +01:00
Grant Bagwell
65674abe2a Fix Controller Location Buzz for Quick Save / Load 2023-04-03 21:36:35 +02:00
Grant Bagwell
7175c872a9 Knockback settings TBDC 2023-04-03 00:36:46 +02:00
Simon
dd71a05e36 Put version at the bottom of the main menu 2023-04-02 22:51:49 +01:00
Grant Bagwell
cb52d310c1 TBDC Weapons 2023-04-02 23:18:28 +02:00
Simon
3f5c767e8d Update AndroidManifest.xml 2023-04-02 19:42:42 +01:00
Simon
64ab392fc5 JKA: Some CVAR change to increase performance 2023-04-02 19:42:39 +01:00
Simon
d43de53e8a Added missed saber blocking check 
might explain why some people find JKA a bit easy if it is auto-blocking in 1st person
 2023-04-02 19:41:50 +01:00
Simon
8b23e255d8 Update open xr headers 2023-04-02 19:41:16 +01:00
Petr Bartos
e3524e8e48 Add use haptic feedback; Fix use in 3rd person mode 2023-04-02 09:16:00 +01:00
Petr Bartos
05fc4d5ab4 Fix menu haptics 2023-04-02 09:16:00 +01:00
Petr Bartos
eec46c183d Add use haptic feedback; Fix use in 3rd person mode 2023-04-01 18:48:42 +02:00
Petr Bartos
fe9891f8db Fix menu haptics 2023-04-01 12:07:13 +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
Petr Bartos
baec8832ab Merge branch 'main' into contributions 2023-04-01 11:15:25 +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
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
82706df34f Allow to skip cinematics also by triggers 2023-03-31 15:40:54 +02:00
Petr Bartos
1111766032 Fix use/crouch buttons on switched control schemes 2023-03-31 14:52:40 +02:00
Petr Bartos
822d1ddbba Merge branch 'main' into contributions 2023-03-31 08:43:50 +02: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
Petr Bartos
6202017b6a Fix virtual gun stock 2023-03-30 21:50:11 +01:00
Petr Bartos
6d49f87150 Do not check angle on non-facing triggers 2023-03-30 21:50:11 +01:00
Petr Bartos
926c64c691 Add angle check for triggers touched by hand 2023-03-30 21:50:11 +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
a1a7d541fa Fix virtual gun stock 2023-03-30 21:52:44 +02:00
Petr Bartos
15d932c75f Do not check angle on non-facing triggers 2023-03-30 19:26:36 +02:00
Petr Bartos
402277e717 Add angle check for triggers touched by hand 2023-03-30 17:54:33 +02:00
Petr Bartos
9b22378c88 Add special delay for re-triggering security cameras 2023-03-30 17:52:26 +02:00
Simon
c4cc218f8b Turn the stun baton into an "always active" weapon 
movement still triggers the sound, but it will always shock an enemy when it makes contact
 2023-03-29 22:44:50 +01:00
Simon
3c64fa7e3e Lowered Stun Baton trigger velocity 2023-03-28 23:19:29 +01:00
Petr Bartos
94e82c2da3 Fix subtitles rendering; Fix rendering of other centered texts 2023-03-28 22:44:38 +01:00
Petr Bartos
40128567be Add help to menu 2023-03-28 22:43:42 +01:00
Petr Bartos
4f1b6b5f07 Split vr asset packs to avoid duplicates 2023-03-28 22:43:13 +01:00
Simon
62b9a0bfab Hide force power aura when item selector is shown 2023-03-28 13:52:45 +01:00
Simon
0a9206642e Slight adjustment to muzzle position based on whether scoped/two-handed 2023-03-28 13:52:23 +01:00
Simon
f452b9cf06 Slight tweak to NPC Combat 2023-03-28 13:51:49 +01:00
Simon
2a1cd0e6e7 Don't send roll to the server, this might be causing gradual roll drift 2023-03-28 07:20:10 +01:00
Simon
1b22652e5c Fixed aiming of bowcaster and demp alt fire 2023-03-27 21:38:46 +01:00
Simon
895b09041f JKA - Ensure UseVR Position is only true when in first person 2023-03-27 21:38:25 +01:00
Simon
3897531544 JKO - Ensure UseVR Position is only true when in first person 2023-03-27 21:38:17 +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
1968a7d8ba Always use right hand as saber home 2023-03-26 16:33:22 +01:00
Simon
74dcd955d2 Fix crash in JKA 2023-03-26 16:32:49 +01:00
Simon
134dec8264 Fix possible crash on JK2 2023-03-26 16:31:53 +01:00
Simon
3c97d7d54a Updated for EA build 0.7.6 2023-03-23 21:59:49 +00: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