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

248 commits

Author SHA1 Message Date
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
70468332d6 TBDC Cleanup 2023-04-05 22:19:45 +02:00
Grant Bagwell
95950f2390 Updated ratios per difficulty 2023-04-05 20:08:10 +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
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
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
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
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
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
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
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
Simon
62b9a0bfab Hide force power aura when item selector is shown 2023-03-28 13:52:45 +01:00
Simon
f452b9cf06 Slight tweak to NPC Combat 2023-03-28 13:51:49 +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
858c5b7f31 Made stun baton a velocity triggered weapon 2023-03-22 20:34:12 +00:00
Simon
d00d0a6a26 Do-not-wrap-cursor-Do-not-switch-menu-controls 
Thanks @MuadDib!

Co-Authored-By: petr666 <5103207+petr666@users.noreply.github.com>
 2023-03-21 20:10:40 +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
1534cad9cf Add missing code from JKO for enemy aim at player 2023-03-20 21:34:26 +00:00
Simon
8a6e37b216 Fix crash with security camera on Artus Mine level 2023-03-19 10:53:12 +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
0d5162626d Realistic Saber (dismemberment) 2023-03-12 10:03:25 +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
0de97cb8e9 Fixed Model FOV in Character creation screen 2023-03-11 20:19:23 +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
25f46bbf52 @MuadDib: Fix-detection-of-expanded-menu-mod 2023-03-10 17:54:58 +00:00
Simon
fce7d4865a @MuadDib: Allow-1000-saves-instead-of-100 2023-03-10 17:53:49 +00:00
Simon
e19f8b9c1d Force Crosshair & Force See effect correct 2023-03-08 22:56:45 +00:00
Simon
174350d86a Throwable Thermal Detonators 2023-03-08 22:56:21 +00:00
Simon
f16e6b2e7e Various changes 
- Force Speed FOV changes
- Fix skybox
- Scoped weapons
 2023-03-08 21:06:51 +00:00
Simon
3930f6d514 JKVR -> JKXR 2023-03-08 21:05:48 +00:00
Simon
80f4e9520a Improved font scaling 2023-03-07 22:52:55 +00:00
Simon
6d6b4cf3da Warning when force power too low to use selected force 2023-03-07 22:52:30 +00:00
Simon
3f869386a3 Off-hand-use-gesture-savegame-fix 2023-03-05 19:53:50 +00:00
Simon
4127f788e8 Academy-Bowcaster-angle-fix 2023-03-05 19:53:18 +00:00
Simon
5813c42b30 Academy-IRL-Crouch 2023-03-05 19:52:49 +00:00
Simon
ac8ac8f6d9 Update to credits (further changes pending) 
also default gesture use to be on
 2023-03-05 16:13:44 +00:00
Simon
911d89557d @MuadDib's Fix-security-cameras-with-single-view 2023-03-05 08:52:35 +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
b00d5053dd @MuadDib's Multi-hand-use-gesture 2023-03-05 08:48:31 +00:00
Simon
a4b8ffc635 Enable optimisations when building release 2023-03-02 21:42:34 +00:00
Simon
6b40649ef5 Added missing shaders and comfort vignette drawing 2023-03-01 23:20:26 +00:00
Simon
1597349f9d Prevent haptics triggering when an NPC is using the force 2023-03-01 22:59:45 +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
614d0ec605 MuadDib's changes for patreon credits and more! 2023-03-01 20:56:41 +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
373ffaa413 Move some openxr stuff into the jni folder 2023-02-04 10:30:48 +00:00
Simon
0b27c1c0e9 Changes to allow a single APK to run on both Quest and Pico 
Link against the generic Android openxr_loader then load the correct loader library at runtime on start-up
 2023-02-03 23:00:13 +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
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
d78ed1f40e Revert "AT-ST aiming using controller" 
This reverts commit 3e5a27421e.
 2023-01-28 22:39:48 +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
0d72a548ca Change makefiles to select appropriate openxr_loader at build time 2023-01-27 14:49:23 +00:00
Simon
566da10ab6 Build with optimisations in Release only 
Thanks to @Emawind for showing me how to do this!
 2023-01-26 22:06:18 +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
3e5a27421e AT-ST aiming using controller 2023-01-26 22:02:07 +00:00
Simon
f19b230169 Bit of camera tidy up 2023-01-25 09:24:23 +00:00