Commit graph

147 commits

Author SHA1 Message Date
Petr Bartos
bebce8bfa6 Add "blank" command to allow explicit blocking of fallback from empty ALT mapping 2022-03-14 22:57:39 +01:00
Petr Bartos
bc88c1a6b6 WIP: Turning as mappable command 2022-03-14 22:20:53 +01:00
Petr Bartos
7cc87f9fe3 Weapon selector tweaks 2022-03-14 17:37:00 +01:00
Petr Bartos
53b60ca372 Update linux build script 2022-03-14 17:36:35 +01:00
Simon
18e4778d48 Move menu stuff to the left, still looks crap, need to change text I think 2022-03-13 19:39:34 +00:00
Simon
64132b114b Merge branch 'master' of https://github.com/DrBeef/ioq3quest 2022-03-13 19:04:00 +00:00
Simon
ce6e74ed0f Update ui_controls3.c 2022-03-13 19:03:47 +00:00
Petr Bartos
e82c52f6e6 Fix some menu items 2022-03-13 19:13:57 +01:00
Petr Bartos
9afde6e694 Fix Team Arena menu crash 2022-03-13 18:44:20 +01:00
Simon
edee441e7a
Merge pull request #14 from petr666/feature/control-tweaks
Control tweaks
2022-03-13 16:14:00 +00:00
Petr Bartos
fb9c7c40f0 Add support for control schemas; make u-turn configurable 2022-03-13 17:11:53 +01:00
Simon
107c36ed9d
Merge pull request #13 from petr666/feature/team-arena-menus
Update of in-game menu for Team Arena
2022-03-13 16:11:50 +00:00
Petr Bartos
fc0c79df59 Support auto-close also for standard selector (to allow mapping on thubmstick) 2022-03-13 16:48:54 +01:00
Petr Bartos
3ad4931b94 Do not fallback to non-alt function (to allow have turning via alt) 2022-03-13 14:44:20 +01:00
Petr Bartos
e49ae98fd3 Auto-close HMD weapon selector if triggered by thumbstick axis 2022-03-13 14:24:46 +01:00
Simon
b451a6f7d2 Fix small issue with death cam thumbstick movement 2022-03-13 11:11:43 +00:00
Simon
3fb6a4945a Second Spectator Mode
- Looks same as deathcam
- Player can also now fly about the map in deathcam/spectator mode 2 using the off hand thumbstick
2022-03-13 11:01:26 +00:00
Simon
e3ec4191f7 Allow pushing of A button to skip full server search 2022-03-13 09:57:05 +00:00
Petr Bartos
f998fd17d7 Update of in-game menu 2022-03-12 23:07:39 +01:00
Simon
1727aae218
Merge pull request #12 from petr666/feature/team-arena-menus
Update of main menu for Team Arena
2022-03-12 20:20:35 +00:00
Simon
123691503c Small fixes to weapon selector
- Better angle selection for weapons (make use of 3/9/6 o'clock points)
- Smaller radius for the controller wheel, easier to select items
2022-03-12 20:02:21 +00:00
Petr Bartos
5f751e542b Update of main menu 2022-03-12 17:28:41 +01:00
Simon
e16f625db0 Overhaul of Weapon Selector
- Now provides a HMD locked weapon wheel option controlled with thumbstick
- Selector type can be chosen in the controls menu
2022-03-12 12:01:59 +00:00
Simon
8939a4f959 Keep selector position relative to controller 2022-03-11 23:09:21 +00:00
Simon
b5e1628dbf Fix issue with weapon wheel cursor locking to one side or other 2022-03-11 20:34:13 +00:00
Simon
4eda77649f cvar changes suggested by Bummser 2022-03-11 19:56:13 +00:00
Simon
fdbc101841 Some small changes
- draw selection beam on weapon selector
- Change direction weapons, weakest start at the bottom (with gauntlet) and then increase clockwise
- small change to menu footer text
- Increased size of Quake III Arena logo on main screen
- Build batch file will create vr_version.h to include in the menu
2022-03-11 19:16:44 +00:00
Simon
217a6fa2b7 Weapon Wheel
prevent cursor overshooting
added ability to colourise the beam in code
2022-03-11 00:02:23 +00:00
Simon
27b1037c03 Changed wepaon wheel to use orientation
just feels a lot smoother to use
2022-03-10 23:02:54 +00:00
Simon
8bc72f8716
Merge pull request #10 from petr666/feature/allow-to-hide-item-in-hand
Allow to hide item in hand
2022-03-10 20:45:26 +00:00
Simon
03202781b5
Merge pull request #9 from petr666/feature/splashscreen-update
New splashscreen using menu background
2022-03-10 20:44:50 +00:00
Simon
7d6ecb92e8
Merge pull request #8 from petr666/feature/menu-update
Move snapturn setting from comfort to controls menu
2022-03-10 20:44:37 +00:00
Petr Bartos
8abe6bc35a Allow to hide item in hand 2022-03-10 20:57:36 +01:00
Petr Bartos
59618744ad New splashscreen using menu background 2022-03-10 17:47:50 +01:00
Petr Bartos
d77c7adf77 Move snapturn setting from comfort to controls menu 2022-03-10 17:11:25 +01:00
Petr Bartos
ee1be201a6 Apply vignette to smooth turn 2022-03-10 13:30:22 +01:00
Simon
9097e00f5d More changes to the weapon selector
- Now wheel based
- Has almost visible spheres around weapons
- Slight haptic blip when contact is made with a selectable weapon
2022-03-09 23:25:50 +00:00
Petr Bartos
48ad5f89d8 Implementation of comfort vignette 2022-03-09 18:58:02 +01:00
Petr Bartos
3c19d4bf46 Menu revamp; option to toggle alt layout; updated defaults 2022-03-09 00:50:56 +01:00
Simon
a155e985be Several changes
- Make the weapons selector fixed in place, doesn't move with the head yaw now which is more comfortable
- Removed a lot of the stuff being copied on start-up into a single pakQ3Q.pk3 file for ease
2022-03-08 22:29:26 +00:00
Simon
a156e3cc1b
Merge pull request #4 from petr666/feature/uturn
Add uturn command and map it to RTHUMBBACK by default
2022-03-07 20:43:13 +00:00
Simon
1e7dd9b001
Merge pull request #3 from petr666/master
Allow to assign action also to right stick diagonals (up-left, up-right, down-left and down-right)
2022-03-07 20:43:02 +00:00
Simon
af495e03a0 Tweaks to weapon selector
and make damage roll cvar apply to pitch too
2022-03-07 20:42:26 +00:00
Petr Bartos
b8c9934171 Add uturn command and map it to RTHUMBBACK by default 2022-03-07 11:25:30 +01:00
Petr Bartos
81e0947c86 Allow to override smooth/snap turn with action; set default weapon mapping 2022-03-07 09:27:28 +01:00
petr666
bb164f3091
Merge branch 'DrBeef:master' into master 2022-03-07 08:23:43 +01:00
Simon
9c62edc5f8
Merge pull request #2 from lvonasek/master
Linux compile fix
2022-03-06 23:08:09 +00:00
Simon
930fb2c49f Fix weapon selector not being accessible on multiplayer servers 2022-03-06 23:03:37 +00:00
Petr Bartos
d994927394 Allow to assign action also to right stick diagonals (up-left, up-right, down-left and down-right) 2022-03-06 22:48:16 +01:00
Simon
992e98a51d Make barrels rotate on weapon selector items
pretty silly
2022-03-06 20:46:31 +00:00
Simon
bd68d221af Ensure railgun colouration is correct on weapon selector 2022-03-06 19:52:21 +00:00
Simon
c69d43461a Restored 1st person body (it was being used!)
ensure barrel is drawn on weapons that have a barrel in the weapon selector
2022-03-06 19:30:02 +00:00
Simon
1865656379 Update autoexec.cfg 2022-03-06 19:05:31 +00:00
Simon
73bbcf8882 Support for a selectable weapon system
much quicker and cleaner than "next" and "previous" on the right stick. That approach can still be set up using the mappings
2022-03-06 15:19:38 +00:00
Simon
e4d49b44e6 Small spectator fixes
- Switch between Follow modes (1st and 3rd person) using the X button
- Switch back to the "Spectate" mode using the A button when in follow mode
- 1st Person follow mode is on a virtual screen (to avoid nausea)
- Slider for haptic intensity: affects both controller and bhaptics level
- Move 3rd person Spectator and Death Cam closer to player's viewpoint
2022-03-05 19:26:39 +00:00
Simon
9426f8605b
Merge pull request #1 from lvonasek/master
Cinematics fixed
2022-03-04 18:19:50 +00:00
Simon
1c823b6943 Improved Spectator/Follow mode
- Spectator / Follow mode will now be 3rd person, with the person you are following marked with an icon
- Optional Laser Sight for aiming (in VR Menu)
- Toggle to send Roll angles to the server
- Removed very janky first person body option
2022-03-04 18:19:18 +00:00
Lubos
4fbdd88833 Linux compile fix 2022-03-04 16:23:57 +01:00
Lubos
38bc4decc6 Cinematics texture format fixed 2022-03-03 16:03:46 +01:00
Simon
2abe93692b Make the sending of roll angles to the server configurable
set vr_sendRollToServer "1"
2022-03-02 23:34:22 +00:00
Simon
76f2b49ee0 Made spectator / follow mode use similar view to death cam 2022-03-02 23:26:57 +00:00
Simon
55c06408ed Added ability to see chat..
- hold offhand controller near HMD and look up
2022-03-01 23:11:00 +00:00
Simon
550e3cfee4 small tweak to location of held item 2022-02-28 23:28:39 +00:00
Simon
e1c6762194 A few small improvements
- Controller haptics
- If two handing the weapon and carrying an item then ensure item is hidden and show on HUD instead
2022-02-28 23:24:24 +00:00
Simon
f2b9eaee60 FInished "6"DoF and removed need for weapon alignment logic 2022-02-27 18:22:39 +00:00
Simon
62f54f8986 Implementation of real-fake 6DoF
https://www.youtube.com/watch?v=zBjC2FHuC7Q

This video explains it (in the comments)
2022-02-27 15:45:20 +00:00
Simon
f112cfe88a Added glFlush
to see if it helps with the weapon disappearing in the right eye issue
2022-02-26 17:18:49 +00:00
Simon
9489c0f106 Moved source files
so that it is easier to debug in Android Studio
2022-02-25 23:18:45 +00:00
Simon
1dd4b9ab18 Several fixes..
- Proper button remapping
  - Can be configured in autoeec.cfg
  - Ability to remap all button functions (including forward/back on R stick)
  - Ability to define an alt-key so that all buttons can have two seperate functions
- Slight reduction to SS value to boost perf by maybe a frame or two per secone
- set Master 1 to be called "Quake3Quest Master"
- QoL tweaks to the VR Options menu
2022-02-25 22:16:37 +00:00
Simon
4a93b7c591 Several Changes
- Removed password from commandline as no longer required
- Render usable / carryable objects in off-hand
- Moved the "Use Item" to the off-hand thumbstick
- Move the show scoreboard to the Y button
- First Person Body (bit janky) can be scaled in menu, set to 0 to hide altogether
2022-02-23 23:37:10 +00:00
Simon
ddd73940df Big Update!
- bHaptics Support!!
- In CTF you now carry the flag in your off-hand when you pick it up
- Hopefully aligned the railgun scope a little better
- Toggle for weapon autoswitch in the VR menu
- Improved realign logic to delay a few frames (which hopefully means fewer misalignment issues)
- Set Ceon's new master server in the autoexec.cfg
2022-02-22 23:48:35 +00:00
Simon
1841ee1892 Big improvement to railgun scope
ready for primetime I  think!
2022-02-19 17:30:32 +00:00
Simon
08193518cc Mostly VR Options Menu
Some other things in there too:
- Incomplete implementation of scoped zoom for rail gun (needs more work)
- VR Options Menu
- Incomplete / Failed attempt at accessing the Android keyboard, leaving in case some revelation occurs
-
2022-02-19 09:14:32 +00:00
Simon
c1b77e09fc Update run.bat 2022-02-15 23:25:28 +00:00
Simon
7496c457aa Placeholder Splash 2022-02-15 23:25:01 +00:00
Simon
9cce7d8d6a Even more changes...
- Removed 3DoF mode from multiplayer (it would never be used)
- Prevent player clipping though solid objects/walls in Multiplayer
- vr_weaponPitch - Allows adjustment of weapon pitch - default: -20
- vr_heightAdjust - Additional height adjustment in metres: default: 0.0
- vr_twoHandedWeapons - Allows disabling of two handed weapon mode, set to 0 to disable
2022-02-15 23:03:29 +00:00
Simon
4f14c4547c Multiple FIxes
- Y button for 3rd person camera mode
- X button for "Gesture" (not quite a taunt..)
- Weapon will auto-realign in multiplayer now, so B button is crouch
- When weapon auto-realigns, playspace will auto recenter too
- Attempt to prevent footstep sound if player hmd movement  is small
- Hopefully prevent CD key request from being shown
- Don't allow camera to orbit when winning on Team Arena
2022-02-14 21:24:38 +00:00
Simon
02e2957e39 Small extra tweaks
- Show scoreboard with off-hand thumbstick
- Add jumping to off-hand trigger
2022-02-13 15:25:33 +00:00
Simon
efe1e29eee Support for Team Arena
- just set the following in the commandline.txt:

+set fs_game missionpack
2022-02-13 15:00:32 +00:00
Simon
dba25f1d52 Multiplayer Server changes
- Include demo pk3 in apk
- copy autoexec and demo pk3 on startup
- support running demo out of the box
- some cvars from VR_Bummser for smoother multiplayer client experience
- Ceno's multiplayer server IPs as favourites
2022-02-12 23:39:56 +00:00
Simon
f5bced0623 Lots of good stuff..
- Multiplayer 6DoF can be disabled setting vr_mp6DoF to 0 (will use a 3DoF scheme instead)
- Cross hair now correctly aligned with weapon aiming when playing on a swerver
- "Use Item" is not a right thumbstick click
- B button will perform crouch in single player or skirmish
- B button will realign the weapon with the controller when playing on a server
2022-02-10 23:28:34 +00:00
Simon
49b8ba1f43 Multiple fixes
- Only use dark crimson background in death cam
- vr_directionMode - 0 = HMD, 1 = off-hand
- use a faked positional tracking approach for multiplayer.. in game player location won't change tho, as it is only view translation
- Use the interpolated position for the weapon in a remote server situation, mades weapon movement MUCH smoother
2022-02-09 23:55:05 +00:00
Simon
2926e73185 Major Mulltiplayer Support changes
- Multiplayer support
- Updated weapon offsets with SkillFur's latest values
- APK contains and copies the glsl shader files now (no need to copy them separately)
2022-02-08 23:22:43 +00:00
Simon
3678133c67 Made the victory podium scenes full VR 2022-02-06 15:31:17 +00:00
Simon
71c6a19806 Added cg_fragMessage to allow disabling of frag notifications on screen 2022-02-04 23:41:42 +00:00
Simon
5066bb9431 Several significant changes
- Fixed bug where player would randomly move around
- Changed package name to com.drbeef.ioq3quest
- Changed location of files to /sdcard/ioquake3quest
- Added commandline.txt file
- Intermission screen now has headtracking (and in skirmish is a full VR experience)
- Fixed projectile location of railgun
- Made HUD model icons larger
2022-02-04 20:42:34 +00:00
Simon
6f3875e9a2 Many fixes / improvements
- When you die you now won't lose head tracking (I won't spoil what does happen now...)
- Lightning Gun Beam is now correct w.r.t cross hair
- Enemy Lightning Gun Beams fire in the direction they are aiming (not in the direction you are aiming!!)
- Sped up crosshair in the menu, as it was too sluggish still
- Restored OG rail gun
- Removed Vertex Lighting cvar
- After match, the Win screen should be shown in the front of player
2022-02-02 23:31:59 +00:00
Simon
b7d89ff02b Multiple changes
- Weapon alignment values courtesy of  SkillFur (thanks!)
- Lightning gun now renders lightning in the correct direction
- Many cvar changes
- Rail Gun and Rocket Launcher use newer implementation
- Changed projection so that UI elements draw clearer
- Made scoreboards easier to read but HUD slightly closer
2022-02-01 23:35:05 +00:00
Simon
4b4ee4ec6e First big commit - pretty much playable throughout 2022-01-29 15:45:18 +00:00
XsparkieX
149c836b94 Updated run.bat to handle paths a bit more gracefully with pushd/popd. 2021-02-01 22:20:30 +01:00
XsparkieX
7f867d4df3 Set ANDROID_SDK_ROOT so gradle won't fail at finding the SDK root on initial pull. 2021-02-01 21:51:36 +01:00
XsparkieX
a86c0bf269 Configured default NDK version in build.gradle. 2021-02-01 21:50:01 +01:00
XsparkieX
bcc28a0ae3 Added support for building for Android on Windows. 2021-02-01 21:37:07 +01:00
XsparkieX
3f4d8f30e7 Do not hardcode the number of cores to use for compilation. 2020-09-06 17:07:05 +02:00
XsparkieX
b678cbd3e3 Renamed spark package name to be my full nickname (sparkie). 2020-09-06 16:41:20 +02:00
XsparkieX
e2c4d40ab0 Updated gradle version. 2020-09-06 14:42:06 +02:00
XsparkieX
791e90b22a Initial Oculus Quest support added. 2020-09-06 13:40:32 +02:00