Commit graph

56 commits

Author SHA1 Message Date
Simon
82ace54c07 Start of proper changes for JKA 2023-02-26 09:45:41 +00:00
Simon
fa220af9f7 Last bit of OpenXR tidy up 2023-02-04 09:26:24 +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
7821de9e7e Ensure controlling an NPC allows time for the view angles to be set correctly 2023-01-26 22:03:41 +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
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
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
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
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
f2c9a603b8 Gesture based button / item triggering 2022-11-26 15:38:50 +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
b942a64fc2 Comfort Vignette (@MuadDib)
+ haptic intensity menu control
2022-11-25 18:01:08 +00:00
Simon
52061d9040 Big improvement to disruptor
better handling for NPC controlling (though it still doesn't feel very good)
2022-11-21 21:56:59 +00:00
Simon
7b410f5867 Support for external haptics providers 2022-11-18 21:02:36 +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
96f6be0be9 IRL Crouch (@MuadDib)
Real Life Crouch implementation, courtesy of @MuadDib, complete with menu options
2022-11-16 21:27:36 +00:00
Simon
c372dd455b E11 Blaster Rifle Scope
also a small change to allow proper rendering of the view when controlling an NPC that isn't a droid
2022-11-16 21:12:28 +00:00
Simon
d450d55dc8 Update JKVR_SurfaceView.cpp 2022-11-14 21:57:38 +00:00
Simon
a1b76ee5cb Made saber block debounce configurable 2022-11-12 17:06:03 +00:00
Simon
7a921c5e38 Blocked Saber Pause
blocked saber will pause for a short time to indicate it was blocked
implemented crouch toggle
set cg_debugSaberCombat to 1 to show red saber when it is blocked too
2022-11-11 23:43:50 +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
73ea7a970d Motion controlled Force Push/Pull 2022-11-07 23:57:10 +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
27cdcbcb14 Added cvar for expanded menu (as per MuadDib's suggestion) 2022-10-31 22:36:04 +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
a5ae9452a8 If player is controlling a remote NPC
such as a mouse droid, then render on a screen as if viewing a remote camera. This might need reworking if the player controls something alive at some point, but works well for the mouse droid for now.
Also for security cameras, render to a screen
2022-10-26 23:37:42 +01:00
Simon
3bef513990 Force Crosshair
and a number of other changes:
- fix for enemy saber throw
- reseed RNG with same number for both eyes
- vr_two_handed_weapons toggle cvar
2022-10-20 17:47:12 +01:00
Simon
948ea7507e More changes...
- Updated NPC stats and weapon tweaks from @bummser
- Updated g_saberMoveSpeed to 2
- vr_weapon_velocity_trigger is now 2.6
2022-10-13 23:33:20 +01:00
Simon
4f5c275fc4 Item Selector
and a number of other changes:
- Scrolling text on main menu for patron credits
- Off-hand force powers using trigger
- vr_weapon_velocity_trigger - cvar controls speed for velocity triggered weapons
- walk direction is hmd based
2022-10-12 18:00:41 +01:00
Simon
83d6fabb98 Various general improvements
- remove head bob
- default shadows on
- slight decrease to time slowdown
- slight player speed change
2022-10-10 21:58:02 +01:00
Simon
0dc4992576 Removed unused cvars 2022-10-10 21:58:02 +01:00
Simon
086545aa8f Few fixes
Don't spin camera on death
Fix mouse cursor getting stuck on left
2022-10-05 22:37:39 +01:00
Simon
3826eb86c4 Number of small tweaks
including world scale
2022-10-04 22:48:30 +01:00
Simon
99bf86ae8f Almost too many changes to mention!
lots of saber stuff
view angle stuff
height is now correct
6DoF is working
weapon aiming working in a lot of cases
2022-10-03 22:19:00 +01:00
Simon
385017812e Some weapon aiming code 2022-09-29 23:38:22 +01:00
Simon
163b725ebe support both games via command line txt
jo - Jedi Outcast
ja - Jedi Academy
2022-09-29 20:18:23 +01:00