Grant Bagwell
cb52d310c1
TBDC Weapons
2023-04-02 23:18:28 +02:00
Petr Bartos
e3524e8e48
Add use haptic feedback; Fix use in 3rd person mode
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
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
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
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
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
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
Simon
62b9a0bfab
Hide force power aura when item selector is shown
2023-03-28 13:52:45 +01:00
Simon
f452b9cf06
Slight tweak to NPC Combat
2023-03-28 13:51:49 +01:00
Simon
3897531544
JKO - Ensure UseVR Position is only true when in first person
2023-03-27 21:38:17 +01:00
Simon
134dec8264
Fix possible crash on JK2
2023-03-26 16:31:53 +01:00
Simon
858c5b7f31
Made stun baton a velocity triggered weapon
2023-03-22 20:34:12 +00:00
Simon
8a6e37b216
Fix crash with security camera on Artus Mine level
2023-03-19 10:53:12 +00:00
Simon
93efed3b24
Corrected logic error with saber-lock hilt rendering scenario
2023-03-13 19:37:13 +00:00
Simon
0d5162626d
Realistic Saber (dismemberment)
2023-03-12 10:03:25 +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
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
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
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
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
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
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
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
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
fb59d40e3f
g_TeamBeefDirectorsCut
...
some other very minor fixes at the same time
2023-01-19 21:43:53 +00:00
Simon
7578e39d67
Scope Zooming (in and out) (@MuadDib)
2023-01-19 21:16:20 +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
2c00a2a40f
We have visuals!!
...
OpenXR is now at least rendering the menu screen!
2022-12-14 15:17:43 +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
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
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
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
92ef497bbc
Correct aspect ratio on scope / binoculars overlay
2022-11-12 19:22:24 +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
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
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
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
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
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
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
