Commit graph

50 commits

Author SHA1 Message Date
Simon
25987a5fb7 Revert "Move Speed selector on offhand radial quick menu"
This reverts commit bc964e2ee0.
2023-11-02 21:48:19 +00:00
Simon
bc964e2ee0 Move Speed selector on offhand radial quick menu 2023-09-28 21:29:51 +01:00
Simon
7766547abc FInal improvements to HUD text drawing 2023-08-01 18:39:05 +01:00
Simon
6a09e2d411 A few PCVR specific fixes
- Restored missing item selector beam
- Allow much wider angle pitch adjust, hopefully enough for Index users
2023-07-29 19:14:24 +01:00
Simon
1d5be37787 Code re-org to sync with PCVR 2023-07-27 22:08:18 +01:00
Simon
72fc1b9b83 Fix missing melee icon in JKO
and don't draw crosshair when melee active
2023-06-01 23:04:31 +01:00
Simon
dfa54a439a A number of changes
- Made Melee available - punch stormtroopers to death! (default melee damage is now 25)
- Draw hand models when in melee (to be replaced with fists soon)
- Made movement not reactivate saber by default (cvar controlled)
- Draw open hand when saber is thrown
2023-05-21 22:38:42 +01:00
Simon
9202d2896e Improved dual saber haptics 2023-04-20 19:55:48 +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
82af313786 Merge branch 'main' into contributions 2023-04-13 18:59:46 +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
a2ff16b576 Quick Save/Load in Selector
Haven't been able to test yet!
2023-04-10 19:42:06 +01:00
Petr Bartos
260d501776 Fix and improve weapon adjustment helper axes 2023-04-08 22:34:59 +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
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
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
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
80f4e9520a Improved font scaling 2023-03-07 22:52:55 +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
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
e2902ca3f9 Make controlling a vehicle (AT-ST) work a lot better - uses 1st person view 2023-01-28 15:28:24 +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
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
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
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
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
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
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
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
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
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
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
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
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
3826eb86c4 Number of small tweaks
including world scale
2022-10-04 22:48:30 +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
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
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