Commit graph

249 commits

Author SHA1 Message Date
Petr Bartos
83199b89e4 Add pakQ3Q.pk3 to gitignore to prevent merge conflicts (as it is now automatically packaged) 2022-04-07 18:22:32 +02:00
Petr Bartos
8b0f96fdfe Controller mapping refactoring 2022-04-07 18:08:45 +02:00
Simon
6c637821b6 Several changes
- Awesome custom Arena Gate Quest Home courtesy of ROBYER1
- Tweak to credits (to include ROBYER1)
- New menu background thanks to Artsmen
2022-04-06 23:19:44 +01:00
Simon
c5bcec3e05 Merge branch 'pr/51' 2022-04-06 22:31:53 +01:00
Petr Bartos
a88d864a65 New control schema - weapon wheel disabled 2022-04-06 20:17:58 +02:00
Petr Bartos
e91141c727 Do not grab thumbstick inputs by weapon wheel if not necessary 2022-04-06 19:34:38 +02:00
Petr Bartos
7eda51a3fc Add show console messages to Team Arena menu 2022-04-06 19:00:28 +02:00
Petr Bartos
bb001197d8 Revert fix of spectator mode movement (was breaking more things than fixing) 2022-04-06 18:25:57 +02:00
Simon
652c226e20 Merge branch 'master' of https://github.com/DrBeef/ioq3quest 2022-04-05 23:05:07 +01:00
Simon
bfd6ba7744 Several fixes
- Show console messages is now a menu toggle
- Rail gun scope now renders correctly
- Vignette now working correctly (again!)
- Movement of floaty HUD is a little snappier
- Floaty HUD will now not be occluded by the weapon (this does mean the weapon can now pass through things like walls etc, hopefully no-one will notice or care)
2022-04-05 23:05:05 +01:00
Petr Bartos
9a88b190a9 Do not end locked up in weapon zoomed state on level end and in pause menu 2022-04-05 20:27:35 +02:00
Petr Bartos
dc7c01667d Do not move during spectating by turning controller/hmd 2022-04-05 20:19:13 +02:00
Simon
8839768f26 Changed size of HUD buffer to increase performance
Console text should be visible again
2022-04-05 18:05:46 +01:00
Simon
239a348c68
Merge pull request #48 from petr666/feature/menu-update
More menu updates
2022-04-05 00:02:29 +01:00
Simon
6df22d0d8b
Merge pull request #46 from petr666/master
Linux build tweaks
2022-04-05 00:02:16 +01:00
Simon
357a87f7e7 Use much smaller buffer for HUD
only issue now is that the models on the HUD are screwed up position wise and I have no idea how to fix them! :-(
2022-04-05 00:01:46 +01:00
Petr Bartos
6a69763d23 More menu updates 2022-04-04 21:40:03 +02:00
Simon
a05e054784 New HUD mode "static (performance)"
- doesn't use the in-world entity for the HUD but uses the old style drawing to the render buffer
- Has to use 2D icons (which look pretty good tbh)
- Floating HUD will now move with pitch as well as yaw
2022-04-03 23:37:47 +01:00
Simon
cbd1850cd6 Greatly improved performance of railgun core "high" setting
also, make sure only the HUD is decoupled, keep other things coupled to view angles (like intermission scoreboard)
2022-04-03 17:45:56 +01:00
Simon
90059c4bbc Merge branch 'master' of https://github.com/DrBeef/ioq3quest 2022-04-03 17:01:39 +01:00
Simon
4fcd8bb0e1 Decouple HUD from face 2022-04-03 17:01:36 +01:00
Petr Bartos
efcc438099 Menu update 2022-04-03 17:42:04 +02:00
Petr Bartos
b236ecf180 Linux build tweaks 2022-04-03 14:46:35 +02:00
Simon
c808c877f3 Several fixes
- HUD no longer has a slight weird transparency which made it a little hard to read in some scenarios
- HUD models draw correctly and clearly in the correct locations
- Vignette fix
- Railgun Scope fix
2022-04-03 10:17:28 +01:00
Simon
443a3657f2 Fix non-rendering TA and cinematics 2022-04-03 00:20:22 +01:00
Simon
326ddd1764 Squashed commit of the following:
commit b10fb5aae4
Author: Simon <simonbrown77@googlemail.com>
Date:   Sat Apr 2 23:40:44 2022 +0100

    Update pakQ3Q.pk3

commit ffc5546f0c
Merge: 5a6a7cfd 67016999
Author: Simon <simonbrown77@googlemail.com>
Date:   Sat Apr 2 23:36:00 2022 +0100

    Merge branch 'master' into multiview

commit 5a6a7cfd66
Author: Simon <simonbrown77@googlemail.com>
Date:   Sat Apr 2 23:34:11 2022 +0100

    Lots of changes

    - Hacky fix for weird "out-of-body" issue when not drawing hud
    - HUD is now drawn as a world sprite (this has its own issues, but is mostly there)
    - Package the pk3 as part of the build

commit 3639fc6d6a
Author: Simon <simonbrown77@googlemail.com>
Date:   Wed Mar 30 23:27:55 2022 +0100

    Update tr_glsl.c

commit 3cc8918328
Merge: 3bb87ecb fe180129
Author: Simon <simonbrown77@googlemail.com>
Date:   Wed Mar 30 22:10:54 2022 +0100

    Merge branch 'master' into multiview

commit 3bb87ecbe6
Author: Simon <simonbrown77@googlemail.com>
Date:   Wed Mar 30 20:05:14 2022 +0100

    Some small tweaks to shaders following trunk merge

commit 2b2748b9f9
Merge: aeb45adc a750c2e5
Author: Simon <simonbrown77@googlemail.com>
Date:   Wed Mar 30 19:17:00 2022 +0100

    Merge branch 'master' into multiview

commit aeb45adcd8
Author: Simon <simonbrown77@googlemail.com>
Date:   Tue Mar 29 23:23:33 2022 +0100

    Small changes following the merge from master

    - and also removed a couple of bits of my hacking

commit 3f5226aa85
Merge: e8da7431 bcf9287a
Author: Simon <simonbrown77@googlemail.com>
Date:   Tue Mar 29 23:05:01 2022 +0100

    Merge branch 'master' into multiview

commit e8da743153
Author: Simon <simonbrown77@googlemail.com>
Date:   Tue Mar 29 22:41:36 2022 +0100

    Orthographic projection now working

    the main fix is in tr_glsl.c, the other changes are peripheral and probably contribute nothing

commit e1a16cbeb2
Author: Simon <simonbrown77@googlemail.com>
Date:   Tue Mar 29 19:53:00 2022 +0100

    Correct pointer offset

commit 12987c20b9
Author: Simon <simonbrown77@googlemail.com>
Date:   Mon Mar 28 23:16:19 2022 +0100

    Few small changes

    might add slight perf improvements as there was some buffer swap stuff not needed

commit e06ba21101
Author: Simon <simonbrown77@googlemail.com>
Date:   Mon Mar 28 19:30:55 2022 +0100

    World entities now drawing in the right places

    ..next up is the 2D stuff

commit e2a5472667
Author: Simon <simonbrown77@googlemail.com>
Date:   Sun Mar 27 23:19:16 2022 +0100

    Small progress

    world is now rendering correctly, but..
    - All items in world are rendering in the wrong place
    - no 2D still

commit 71708ee91e
Author: Simon <simonbrown77@googlemail.com>
Date:   Sun Mar 27 18:08:51 2022 +0100

    Restored missing matrix

commit 6506c96194
Author: Simon <simonbrown77@googlemail.com>
Date:   Sun Mar 27 17:46:42 2022 +0100

    Still ongoing (with little improvement)

commit 170f32709b
Author: Simon <simonbrown77@googlemail.com>
Date:   Sat Mar 26 23:31:03 2022 +0000

    Now rendering!

    2D stuff doesn't draw, and 3D is all wonky, but this is progress!

commit d6ade0215f
Author: Simon <simonbrown77@googlemail.com>
Date:   Sat Mar 26 19:02:03 2022 +0000

    Ensure multiview is only applied to vertex shaders

commit eec5efe237
Author: Simon <simonbrown77@googlemail.com>
Date:   Sat Mar 26 12:11:55 2022 +0000

    Make main a C file in prep for the next step

commit b2fece761e
Author: Simon <simonbrown77@googlemail.com>
Date:   Fri Mar 25 19:34:44 2022 +0000

    Make context create correctly

commit e1a04d2200
Author: Simon <simonbrown77@googlemail.com>
Date:   Fri Mar 25 00:05:11 2022 +0000

    Not working yet
2022-04-02 23:42:56 +01:00
Simon
6701699932
Merge pull request #45 from petr666/feature/fake-6dof-for-local-multiplayer
Use fake 6DoF also for local multiplayer
2022-04-02 23:34:54 +01:00
Petr Bartos
2ee4cf4c36 Fix view in pause menu when using fake 6DoF 2022-04-02 19:22:42 +02:00
Petr Bartos
285870c353 Use fake 6DoF also for local multiplayer 2022-04-02 17:19:32 +02:00
Petr Bartos
9b411443d9 Implemented separate setting for player and opponents shadows 2022-03-31 18:59:45 +02:00
Simon
fe180129a9 Removing the old unused gl1 renderer - phase 2
rename the gl2 renderer to be correctly called gles3
2022-03-30 22:00:30 +01:00
Simon
5f7755b219 Removing the old unused gl1 renderer - phase 1 2022-03-30 21:57:33 +01:00
Petr Bartos
a44bdc323b Add brightness setting, remove color depth and texture filter setting 2022-03-30 21:25:12 +02:00
Simon
a750c2e540
Merge pull request #40 from lvonasek/hotfix_performance_restored
Restore mediump float precision and fast-math C flag
2022-03-30 18:53:59 +01:00
Petr Bartos
4a5cdc47f6 Fix setting of HUD on initial startup, add HUD toggle to team arena 2022-03-30 18:29:39 +02:00
Lubos
25154e5b9f Restore mediump float precision and fast-math C flag 2022-03-30 18:27:12 +02:00
Simon
bcf9287a85 Updated ready for v28 build 2022-03-29 22:54:14 +01:00
Simon
00379ad62d
Merge branch 'master' into feature/menu-update 2022-03-29 22:48:30 +01:00
Simon
271ce70f86
Merge pull request #36 from petr666/feature/menu-cursor
Fix team arena cursor; prevent crashes caused by invalid pointer when switching to TA and back
2022-03-29 22:43:08 +01:00
Simon
7b4ac44cdc
Merge pull request #35 from lvonasek/feature_opengl_tweaks
Geometry detail improved
2022-03-29 22:42:50 +01:00
Petr Bartos
4b0bfe599d Fix default value of gore level; Add proper gore settings to team arena 2022-03-29 23:26:46 +02:00
Petr Bartos
24ce45a3c5 Add support for setting control schema in team arena 2022-03-29 22:46:31 +02:00
Petr Bartos
90fa0bcf42 Remove graphic presets from menu 2022-03-29 21:52:14 +02:00
Petr Bartos
1e7279b899 Ensure high geometry details sets proper lodbias; Unify geometry detail setting between team arena and vanilla 2022-03-29 19:22:02 +02:00
Petr Bartos
8ab1439347 Add shadow detail setting 2022-03-29 18:33:10 +02:00
Petr Bartos
c10f4b03fb Merge branch 'feature/player-menu-update' into feature/menu-update 2022-03-29 17:47:02 +02:00
Lubos
0441ba1ab0 Do not crash on undefined LOD 2022-03-29 12:58:09 +02:00
Petr Bartos
364c4d66fe Add note about editing player name; add body scale to team arena menus 2022-03-24 22:13:59 +01:00
Simon
0c52a61cf6 Revert "Speedup VBO"
This reverts commit 22890e13a6.
2022-03-24 18:51:43 +00:00
Petr Bartos
95951c27f9 Fix team arena cursor; prevent crashes caused by invalid pointer when switching to TA and back 2022-03-24 17:59:42 +01:00
Lubos
0a22991ff3 Modify the low geometry detail settings 2022-03-24 16:39:26 +01:00
Lubos
ad5ea81eeb Replace LOD computation to better fit VR needs 2022-03-24 16:39:03 +01:00
Lubos
55c4be043d Redundant SDL call removed 2022-03-24 16:12:20 +01:00
Simon
56d1334007 Ensure menu cursor is correctly aligned
store the yaw at which the menu is invoked to calculate correct X
slightly increased the cursor movement scale as it was a little too much wrist turning required to reach outer edges of screen
2022-03-23 20:48:01 +00:00
Simon
14cf79c585
Merge pull request #33 from petr666/feature/menu-cursor
Use absolute position for menu cursor (no need to "calibrate" pointer any more)
2022-03-23 20:34:28 +00:00
Simon
550c25bf71
Merge pull request #34 from lvonasek/feature_opengl_speedup
Opengl speedup
2022-03-23 20:21:49 +00:00
Simon
d9791d0ef1
Merge pull request #32 from lvonasek/feature_pause_flow
Game pause flow improvements
2022-03-23 20:21:36 +00:00
Petr Bartos
7100dd66aa Switch active controller in menu by pressing trigger on inactive one 2022-03-23 21:07:34 +01:00
Petr Bartos
95e55b5ba9 Remove moving of cursor with thumbstick (not working with absolute cursor position) 2022-03-23 20:06:17 +01:00
Petr Bartos
5e9a38307b Make cursor little bit less sensitive 2022-03-23 18:33:39 +01:00
Petr Bartos
36222228bb Allow to draw cursor outside visible area to avoid weird jumping around edges when pointing outside 2022-03-23 18:02:23 +01:00
Lubos
22890e13a6 Speedup VBO 2022-03-23 11:53:24 +01:00
Lubos
c0089a54f2 Disable OpenGL debug messages 2022-03-23 11:52:45 +01:00
Petr Bartos
0e99425a79 Use absolute position for menu cursor (no need to "calibrate" pointer any more) 2022-03-22 22:19:38 +01:00
Lubos
7c13dc8c34 Disable opening console (didn't work so well in multiplayer)) 2022-03-22 21:49:57 +01:00
Lubos
56e1e5d247 Game pausing using Oculus button improved 2022-03-22 17:48:16 +01:00
Lubos
822e3515dc Make GL debug messages easier to unterstand 2022-03-22 17:46:48 +01:00
Lubos
3581ca75b1 Workaround to make in menu player model rendering working 2022-03-22 17:44:32 +01:00
Simon
83bd49f800
Merge pull request #29 from lvonasek/feature_vignette_yaw_noisefilter
Add noise filter for yaw delta values when drawing vignette
2022-03-20 18:25:41 +00:00
Simon
7e697c91d3 Couple of fixes
- Use unadjusted angles for off-hand controller movement direction
- Ensure that the lightning gun in the demo shows the correct lightning shader
2022-03-20 18:25:27 +00:00
Lubos
004e8d3b06 Add noise filter for yaw delta values when drawing vignette 2022-03-20 12:54:12 +01:00
Simon
0bd08098d9
Merge pull request #27 from lvonasek/master
Vignette rendering optimalisation
2022-03-20 09:46:46 +00:00
Simon
3745959a8d
Merge pull request #28 from lvonasek/feature_glsl_precision
GLSL float precision increased
2022-03-20 09:45:29 +00:00
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