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

235 commits

Author SHA1 Message Date
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
a457b17c19 Update AndroidManifest.xml 2023-03-12 10:18:09 +00:00
Simon
c110cd7bb2 Ensure force push and pull work with a single saber 2023-03-12 10:03:42 +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
8c38301bf0 off hand dual saber now activated by swing 2023-03-08 21:05:28 +00:00
Simon
e4da52c377 Better E11 scope aiming 2023-03-07 22:53:18 +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
0578434775 Package the assets as part of the build (thanks to @MuadDib) 2023-02-26 19:49:51 +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
c8de3b4673 Gradle changes to support building without dependency on the Meta OpenXR SDK Package 2023-02-05 23:13:43 +00:00
Simon
9c98a60331 Made pico logic clearer 2023-02-05 19:45:08 +00:00
Simon
373ffaa413 Move some openxr stuff into the jni folder 2023-02-04 10:30:48 +00:00
Simon
fa220af9f7 Last bit of OpenXR tidy up 2023-02-04 09:26:24 +00:00
Simon
dc17afde16 Manufacturer based openxr_loader selection (rather than model) 2023-02-03 23:29:52 +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
d2b1beab32 Update version to 0.6 for EA 2023-01-29 08:37:58 +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
bb423c1e37 Removed a lot of unnecessary crud 2023-01-27 18:51:25 +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
9e138c64ce Ensure touches are reset correctly 2023-01-26 22:02:43 +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
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
2538e8df30 Fixed missing thumbstick click 2023-01-21 20:27:37 +00:00
Simon
b86028588c Input refactoring 2023-01-21 15:09:00 +00:00
Simon
059d131b8c Further standardisation of input 2023-01-20 23:35:43 +00:00
Simon
d7844eb54b Making input more standardised 2023-01-20 23:31:44 +00:00
Simon
fb59d40e3f g_TeamBeefDirectorsCut 
some other very minor fixes at the same time
 2023-01-19 21:43:53 +00:00
Simon
15d08031db Scope handling improvements (@MuadDib) 2023-01-19 21:23:29 +00:00
Simon
7578e39d67 Scope Zooming (in and out) (@MuadDib) 2023-01-19 21:16:20 +00:00
Simon
dad5ed29f7 Fix for Pico thumbstick movement & fixed typo 2023-01-18 21:55:47 +00:00
Simon
f0a6d673ee Prevent issues on start-up with Pico 2023-01-17 22:38:30 +00:00
Simon
23121a528b Step to make the code reuseable 
Tried to separate out the game specific logic in the JKVR files from the generic OpenXR and other boilerplate stuff that each port will need
 2022-12-19 21:23:28 +00:00
Simon
6e61785dcd Fixed lifecycle so headset can go to sleep and app will resume without issue 2022-12-18 23:12:11 +00:00
Simon
3d6af564c8 Fixed screen distance setting 2022-12-18 11:44:34 +00:00
Simon
5acd17a9df Fix config overwrite issue 2022-12-17 19:44:32 +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
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
7d99f83ae9 Fix Haptics 2022-12-14 15:17:44 +00:00
Simon
c509e29ee1 Full OpenXR compatibility 
Including Pico 4 support!!
 2022-12-14 15:17:44 +00:00
Simon
9af30f39ba Set color space correctly 
Now pretty much working - head tracking has some lag for some reason though
 2022-12-14 15:17:44 +00:00
Simon
d95f02dca2 Most stuff working.. 
but looks pretty bad at the moment
 2022-12-14 15:17:43 +00:00
Simon
f650a3be1c Use Quad layer for screen - and get resolution correct 2022-12-14 15:17:43 +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
6a61f24048 early start on this OpenXR - doesn't build yet 2022-12-14 15:17:43 +00:00
Simon
2cc54bc8bd Update to use gesture (@MuadDib) 2022-12-14 14:45:51 +00:00
Simon
257382adcd Load last save game on respawn (@MuadDib) 2022-11-30 19:23:00 +00:00
Simon
399e803068 Restored original vanilla renderer and renamed current to rd-gles 2022-11-30 17:59:40 +00:00
Simon
cd9026c927 Prevent gesture use skipping cutscenes or exiting security cameras 
also don't allow weapon firing whilst showing item selector
 2022-11-30 17:52:57 +00:00
Simon
5781390a92 Slight modifications to the force push/pull 
use player's Chest as the distance calculation point and lowered the distance required to trigger.
 2022-11-27 14:51:19 +00:00
Simon
46f5441165 Restore shiny saber by default 2022-11-26 19:22:48 +00:00
Simon
bec2177392 Bowcaster bolt direction fix (@MuadDib) 2022-11-26 18:09:33 +00:00
Simon
f2c9a603b8 Gesture based button / item triggering 2022-11-26 15:38:50 +00:00
Simon
008e0ff44a Fix crash when using security camera 2022-11-26 15:38:30 +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
cd38d00cf8 3rd Person Saber toggle options (@MuadDib) 2022-11-25 23:35:49 +00:00
Simon
6ee8dcd2bc Movement Speed toggle 
Using X you can toggle between Full (100%), Comfortable (75%) and Walk (50%), small icon on screen to show you
 2022-11-25 23:25:37 +00:00
Simon
fe1216e84d Fix crouch for switched sticks 2022-11-25 19:14:11 +00:00
Simon
96b8b4ebd5 Proper fix for Yavin sky 2022-11-25 19:06:25 +00:00
Simon
b942a64fc2 Comfort Vignette (@MuadDib) 
+ haptic intensity menu control
 2022-11-25 18:01:08 +00:00
Simon
0d3d244157 Fix sky over Yavin Swamp 
The only significant part of this change is the removal of r_fastsky check, since Yavin Swamp doesn't have a skybox.
 2022-11-23 22:17:58 +00:00