teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-12-03 09:22:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
3559 commits 7 branches 5 tags 124 MiB
Commit graph

167 commits

Author SHA1 Message Date
Simon
f9fa5cc2b6 Two handed weapons only triggered when < 40cm between controllers 2022-03-20 09:44:39 +00:00
Lubos
68ebf1b55f GLSL precision increased 2022-03-20 10:12:01 +01:00
Lubos
996cf7a5f7 Vignette assets updated 2022-03-19 22:08:50 +01:00
Lubos
2d0f0a3330 Optimize vignette rendering 2022-03-19 21:58:23 +01:00
Simon
aa9e2899bd Adjustment to controller weapon wheel 
- Make proximity of selection bigger
- Copy pakQ3Q to baseoa if it exists
 2022-03-19 16:51:32 +00:00
Simon
cb387417c1 Reverted Culling logic 
- Just turned r_nocull back on again
- Add version info when playing demo
 2022-03-19 12:33:37 +00:00
Petr Bartos
d341a034e7 Fix comfort vignette to not be applied when not moving/turning 2022-03-19 08:29:18 +01:00
Simon
f6314a286d Update ui_credits.c 2022-03-18 22:55:33 +00:00
Simon
cdb9e7ef8f Update cg_view.c 2022-03-18 22:41:01 +00:00
Simon
1999c0f540 Update AndroidManifest.xml 2022-03-18 22:29:52 +00:00
Simon
58d51a9b47
Merge pull request #24 from petr666/feature/no-crosshair-mod 
Allow to disable crosshair by server via sending "no crosshair" string in server info to client
 2022-03-18 22:25:35 +00:00
Simon
7fce284d93 Some small fixes 
- Use FOV from the SDK to calculate the culling frustrum (so r_nocull can be turned off now, hopefully increasing framerate)
- I think I fixed thumbstick movement in second spectator follow mode
- Remove Gauntlet from weapon wheel because it is shit
- Some code refactoring
- Hopefully made the Chaingun accessible on the weapon wheel now
 2022-03-18 22:21:22 +00:00
Petr Bartos
eccea2469f Allow to disable crosshair by server via sending "no crosshair" string in server info to client 2022-03-18 20:43:20 +01:00
Simon
9aef5b5d68 small fixes 
- 6DoF movement in follow mode seems right now
- Prevent surfaces being culled in follow modes (annoyingly I've not figured out what is culling models yet, so other players still vanish)
 2022-03-17 23:30:43 +00:00
Simon
b3beeeef00
Merge pull request #22 from petr666/feature/switchable-thumbsticks-and-menu-update 
Switchable thumbsticks and menu update
 2022-03-17 21:42:59 +00:00
Simon
63c284f1b9 Several changes 
- Additional credits screen for Quake3Quest
- Fix for world moving when weapon is moved on a multiplayer server
- Make player setup model move within a 90 degree arc so it always visible
 2022-03-17 21:41:42 +00:00
Petr Bartos
0e6ee663be Switchable thumbsticks and menu update 2022-03-17 18:18:51 +01:00
Simon
5fb823ad95 URL Update 2022-03-16 23:18:52 +00:00
Simon
f8fb5d0e1b Revert "Soft keyboard support added" 
This reverts commit fdf2decde3.
 2022-03-16 23:07:20 +00:00
Simon
adaf21b98e
Merge pull request #21 from petr666/feature/turning-as-mappable-command 
Fix the issue of comfort vignette not working while smooth turning
 2022-03-16 23:05:59 +00:00
Simon
726c9e1e95 Merge branch 'master' of https://github.com/DrBeef/ioq3quest 2022-03-16 23:03:44 +00:00
Simon
0772bc8c0b Fix issue with multiple item pickup events playing 
This was causing horrible audio, as multiple item pickup events were all playing at the same time. This was because the predict player state was being called once per eye, and by the time it came to the right eye it had cleared the buffer and it would just allow server events to get played again. The actual fix is in cg_view.c, line 994, where we only predict if the eye being rendered is the left.
 2022-03-16 23:03:37 +00:00
Petr Bartos
ead81a8886 Fix the issue of comfort vignette not working while smooth turning 2022-03-16 17:11:54 +01:00
petr666
4096dcd88c
Merge branch 'DrBeef:master' into feature/turning-as-mappable-command 2022-03-15 23:40:11 +01:00
Simon
b6896417cf Merge branch 'master' of https://github.com/DrBeef/ioq3quest 2022-03-15 22:38:32 +00:00
Simon
83599b76ca Some changes... 
- Make HMD weapon wheel use angles for weapon selection, allows selection immediately before show animation is complete
- Proper model scaling in the Player Setup menu
 2022-03-15 22:38:26 +00:00
Petr Bartos
a6b6046e74 Fix issue with non-working mapping of smooth turn on buttons 2022-03-15 23:37:54 +01:00
Simon
0e0e9db07b
Merge pull request #19 from lvonasek/master 
Soft keyboard support added
 2022-03-15 22:36:55 +00:00
Lubos
fdf2decde3 Soft keyboard support added 2022-03-15 16:33:17 +01:00
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
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
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
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
7496c457aa Placeholder Splash 2022-02-15 23:25:01 +00:00