Commit Graph

365 Commits

Author SHA1 Message Date
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 cfbb5fc943 Update .gitignore 2023-02-03 23:00:28 +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 f12753967c Copy appropriate config file based on HMD type
this allows for a different r_gamma value on the Pico 4
2022-12-14 19:28:37 +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