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
549 commits 12 branches 21 tags 207 MiB
Commit graph

447 commits

Author SHA1 Message Date
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