Commit Graph

447 Commits

Author SHA1 Message Date
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
Simon e51b7b0c0f Improve transition to scope so it more matches where the player is pointing 2023-03-22 22:12:48 +00:00
Simon c950cb69cb Improved Trip Mine view model scale 2023-03-22 21:44:15 +00:00
Simon 31184c1f4a added a cvar for development weapon alignment toggle 2023-03-22 21:43:59 +00: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 3fcbf553d6 Weapon Alignment 2023-03-20 21:33:54 +00:00
Simon 8a6e37b216 Fix crash with security camera on Artus Mine level 2023-03-19 10:53:12 +00:00
Simon 3a8b6c3a0b Ensure menu can be used if user has switched option buttons on Quest 2023-03-17 21:58:55 +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 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