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

436 commits

Author SHA1 Message Date
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
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
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
b9b10a9876 Make NPCs fire at different locations on the player 
50% - Chest
30% - Legs
20% - Head
 2022-11-20 17:15:27 +00:00
Simon
c46603adf3 Fix for enemy aim when IRL crouch used (@MuadDib) 2022-11-18 21:06:46 +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
85f642e9e7 Use primary hand direction/location as trigger for buttons 2022-11-16 22:34:41 +00:00
Simon
f014078518 Helper to enable auto-use of Bacta Canister 
Thanks again to @MuadDib for this one!
 2022-11-16 21:30:19 +00:00
Simon
f179693772 Hopefully fix recursive glass breaking function call 
This is a weird one, hopefully this fixes it!
 2022-11-16 21:28:08 +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
92ef497bbc Correct aspect ratio on scope / binoculars overlay 2022-11-12 19:22:24 +00:00
Simon
3fe778ea7f reduce motion trigger threshold slightly 2022-11-12 18:45:03 +00:00
Simon
a1b76ee5cb Made saber block debounce configurable 2022-11-12 17:06:03 +00:00
Simon
18140d2340 Menu changes from @MuadDib 
Fix crouch toggle
 2022-11-12 09:30:41 +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
42a79f4b13 Menu updates from MuadDib 2022-11-11 19:49:01 +00:00
Simon
067931ac1d Small fixes to motion force power 2022-11-11 19:48:35 +00:00
Simon
15d1fef9b4 Proper handling of saber lock scenario 
and small changes to MuadDib's persistent saber marks change
 2022-11-11 19:48:01 +00:00
Simon
35e5cc428c Update AndroidManifest.xml 2022-11-09 22:53:39 +00:00
Simon
3e54452a0b MuadDib's persistent saber burn marks 
set cg_saberBurnMarkExtraTime > 0 to activate
 2022-11-09 22:05:06 +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
56ac3c1830 Added debug saber combat (not yet working) 
and updated crawl TGA
 2022-11-06 08:10:25 +00:00
Simon
d3cd3ee71b Force Changes... 
Allow grip to pull and push NPCs away and toward player (by moving hand forward and back)
Make saber still be controllable on level 1 but slower and for shorter time
Always draw force crosshair, but change colour when aimed at an entity
 2022-11-03 22:38:34 +00:00
Simon
73080a2b4b Small fix to allow loading of @MuadDib's locale file 
and included the latest menu update from @MuadDib
 2022-11-02 21:53:07 +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
b1207a60ca Few small changes... 
- Tidied up selector rendering a little bit for when no weapon held
- render a hand when no weapon held
- don't allow weapon stabilisation when holding no weapon or using saber
- better support for left handed mode
- disable face culling for VR view models (weapons / hands) so they look much better, especially left handed!
 2022-10-29 09:44:25 +01:00
Simon
5df6bfbe27 Fix to allow force pull to activate water gargoyles in Yavin Temple 2022-10-28 22:51:32 +01:00
Simon
d9384db1bc Update AndroidManifest.xml 2022-10-26 23:39:15 +01: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
12d117f679 Prevent cameras and turrets exiting if player moves their head too much 
also.. for the secrity cameras, it will show the actual angles of the camera, but in mono.
 2022-10-25 23:12:20 +01:00
Simon
eb341b78cd Throwable thermal grenades 
Also fixed issue where triggering saber throw too quickly on change would screw things up
 2022-10-25 21:59:33 +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
ace44a04a9 Update AndroidManifest.xml 2022-10-17 22:39:01 +01:00
Simon
a118fadce0 Don't draw mission failed message (no need) 
removed a few redundant options from the menu too
 2022-10-17 22:35:18 +01:00
Simon
10cd6ad67d Made screen layer much flatter 2022-10-17 22:07:22 +01:00
Simon
0edba3662d Hugely improved weapon selector 
also added missed splash screen image
 2022-10-17 20:29:58 +01:00
Simon
c30950dca0 Put force power selector on off-hand 2022-10-16 16:51:59 +01:00
Simon
2f40ff3e6a Fix issue with glitching view when using something 
it was lean being triggered

Co-Authored-By: Grant Bagwell <general@grantbagwell.co.uk>
 2022-10-15 19:37:07 +01:00
Simon
b1e6677fc0 Hints to force direction 
also rotated saber back so the glitch is not so visible
Added controls for force direction hint and Speed FOV adjust to the menu
 2022-10-15 14:53:53 +01:00
Simon
4d5b8de994 Corrected cvars 
g_saberMoveSpeed "1" (which is the game default and should be)
and
g_saberAnimSpeed "1.2"
 2022-10-15 00:26:54 +01:00
Simon
3a4909e424 Multiple changes 
- New Hand models for relaxed and force hands and textures (@baggyg)
- Additional selector screen when using the saber to change stance
- show current item in the selector
- Allow player to restart game if they die holding the saber

Co-Authored-By: Grant Bagwell <general@grantbagwell.co.uk>
 2022-10-14 23:51:31 +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
19ee9179e8 Many improvements 
Added cvar g_saberAutoDeflect1stPerson so saber is only ever used to deflect lasers in first person
Made selector always draw using HMD YAW so it remains in front when turning i.r.l
Updated the hand model (@baggyg)
Updated the crawler text with the patron credits
Added @MuadDib's menu changes
Aligned all weapons
Scaled the saber hilt down a little bit

Co-Authored-By: Grant Bagwell <general@grantbagwell.co.uk>
 2022-10-13 23:19:44 +01:00
Simon
d08b94715c Turn Saber on/off right trigger 2022-10-12 23:03:17 +01:00
Simon
0773fe325a Added placeholder hand model 
- made sure other force powers originate from off-hand
- switch 1st/3rd person using right stick when using saber
- if goggles equipped, then you can zoom in and out using right stick, and exit with B button
 2022-10-12 22:35:27 +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
40e91fe9b0 Restore original saber speed trigger 2022-10-10 23:21:28 +01:00
Simon
3c7074f5d3 Small change to lightsaber swing sound triggers 2022-10-10 23:21:27 +01:00
Simon
fb15cd462d 0.1.0 - EA first build 2022-10-10 22:01:09 +01:00
Simon
a00281d038 Fix for saber not affecting dark jedi 2022-10-10 21:58:02 +01:00
Simon
daafcc6ba4 Drfaulting a lot of cvars 
and saber blur now working
 2022-10-10 21:58:02 +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
7328046b32 Improvements to the crosshair 2022-10-08 17:29:50 +01:00
Simon
ab03fc7c6d So many changes.. 
- Fix issue where scripts stop running if you die (change to Android.mk)
- Added weapon based crosshair
- Lots of HUD fixes
- Fixed snowing indoors issue
 2022-10-08 17:29:49 +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
851183b90d Update cg_players.cpp 2022-10-04 23:08:06 +01:00
Simon
3826eb86c4 Number of small tweaks 
including world scale
 2022-10-04 22:48:30 +01:00
Simon
581b8829af update to make files 2022-10-03 22:19:20 +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
2c29c10b42 First implementation of 1st person saber 2022-10-02 23:17:51 +01:00
Simon
5b4d047b5a Mapped datapad button to Y 
this means you can't switch force powers at the moment
 2022-10-01 19:40:28 +01:00
Simon
9620011ed5 Multiple fixes 
- Fixed some crashes
- weapons (for the first level of outcast) should be aligned
- ducking works, player height now correct
some button changes:

A - Jump
B - Alt Fire
X - Use current Force (no use in outcast atm)
Y - Select next Force Power
Right Thumbstick Button - "Use"
Left Thumbstick Button - Duck - good for side rolls etc
Right Grip - Slow time to 10% (testing this for the weapon/force selector, also quite fun)
Left Grip - two handed weapons (no advantage to this at the moment)

You should find that weapons are now properly motion controlled
 2022-10-01 00:02:49 +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
Simon
7cc4c4f281 Several changes 
- Jedi Outcast now running properly
- Added Use to right thumbstick to bypass cutscenes
 2022-09-28 23:07:22 +01:00
Simon
adfc6da46d Many many changes 
- Added in a cheat menu (https://jkhub.org/files/file/3828-beta-ingame-customization-and-cheat-menu/)
- Added and building source for JK2
- FIxed jittery head tracking
- Started on motion controlled weapons (no sabers yet)
- made cutscenes immersive (can be turned off)
- Started on a visible HUD
 2022-09-27 23:19:12 +01:00
Simon
18f17c2bab Stereo Separation now working 2022-09-24 20:08:43 +01:00
Simon
62556d9b6b Fixed crash 
and head tacking seems to work
 2022-09-24 17:50:21 +01:00
Simon
b1d847e0d8 Mouse working in main menu 
and game library loads, intro plays, but crashing in a sequence atm
 2022-09-23 23:10:32 +01:00
Simon
9627464541 can now finally see the menu! 2022-09-23 21:40:35 +01:00
Simon
8c62569139 More progress... sound is playing (no visuals yet) 2022-09-22 23:23:00 +01:00
Simon
f894efd296 It now builds!! 
but won't run obviously, long way before that happens, but it is at least compiling and linking, which is good
 2022-09-21 23:34:51 +01:00
Simon
cf2aa201ee More fixing compilation and linker errors 2022-09-20 23:15:52 +01:00
Simon
11f00b4fd4 fixing compilation errors 2022-09-20 22:08:09 +01:00
Simon
c1cc1097f5 More fixes to try and build 2022-09-19 23:22:36 +01:00
Simon
bdb808b3f8 Still too many build issues... 2022-09-19 22:46:47 +01:00
Simon
9f28c4d992 Trying to get it to build... 2022-09-18 19:43:59 +01:00
Simon
4597b03873 Initial Commit 
Opens in Android Studio but haven't even tried to build it yet (it won't.. I know that much!)
 2022-09-18 16:37:21 +01:00