Commit graph

88012 commits

Author SHA1 Message Date
8c9273972a
Merge pull request #1696 from JulianGro/CXX_FLAGS
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
Move CMake defaults to conanfile.py
2025-07-26 21:45:15 +02:00
d73512f02f
Merge pull request #1592 from HifiExperiments/materialLayers3
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
material layering part 3: this one actually does something
2025-07-24 23:07:33 +02:00
72562dfe73
Merge pull request #1686 from Armored-Dragon/fix/settings/lodSettings
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
Add LOD settings to Settings 'Graphics' page
2025-07-22 22:13:40 +02:00
armored-dragon
3ca1ede0b4
Swap labels.
Woopsie!
2025-07-22 15:02:08 -05:00
4ea3644d80
Merge pull request #1701 from ada-tv/feature/discord-rpc-toggle
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Add setting to toggle Discord RPC
2025-07-22 21:21:14 +02:00
66e37be12f
Change function alignment from 16 to 32 bytes. 2025-07-22 20:59:43 +02:00
727dcd4d52
Merge pull request #1704 from HifiExperiments/splash
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
splash screen shader compilation message
2025-07-22 20:53:14 +02:00
HifiExperiments
37ad9ec7eb
fix typo 2025-07-22 01:34:12 -07:00
HifiExperiments
b03e8d7939 4 notices 2025-07-22 00:35:53 -07:00
HifiExperiments
a81fc6f285 material layers part 3: this one actually does something 2025-07-21 22:05:09 -07:00
f678372155
Merge pull request #1690 from Armored-Dragon/fix/settings/taaSelectableOnForwardRenderer
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Gray out anti-aliasing on forward renderer
2025-07-22 01:02:05 +02:00
armored-dragon
afc2b638de
Say MSAA. 2025-07-21 17:55:07 -05:00
4c94b01cb7
Merge pull request #1591 from HifiExperiments/materialLayers2
material layering part 2: layers + splatmaps
2025-07-21 23:44:48 +02:00
e38f1bf0fa
Merge pull request #1695 from ada-tv/fix/thumbstick-scroll-locks
Only capture relevant thumbstick for scrolling, remove trigger requirement for Web entity scrolling
2025-07-21 23:26:18 +02:00
HifiExperiments
110e7ce15c more alpha cutoff epsilon, fix normal accumulation for non-pbr triplanar 2025-07-20 21:32:19 -07:00
HifiExperiments
0c487083f0 compiling shaders message for splash screen 2025-07-20 01:41:18 -07:00
Ada
99ab0dec55 Apply Discord RPC setting change without needing restart 2025-07-19 23:45:23 +10:00
Ada
d833756b27 Add setting to toggle Discord RPC 2025-07-19 23:14:09 +10:00
fb099d6009 Move CMake defaults to conanfile.py to be applied as part of the Conan CMake toolchain *before* CMake uses its own defaults.
The way to set default CMAKE_CXX_FLAGS and similar is to use CMake toolchain files. While this is considered bad practice by the CMake community, it is pretty much necessary for us. CMake doesn't know what compiler, architecture, et cetera it is using in its toolchain; So instead we get all this information from Conan and add our defaults to Conan's CMake toolchain.
2025-07-18 13:16:26 +02:00
Ada
310dc7f78f Make scrolling only lock the relevant thumbstick 2025-07-18 17:14:53 +10:00
armored-dragon
5f7336c341
Gray out anti-aliasing on forward renderer.
Added disabled property to combo-box.
2025-07-15 04:58:50 -05:00
armored-dragon
577beb443e
Added LOD settings. 2025-07-14 07:04:05 -05:00
44cc890de2
Merge pull request #1657 from JulianGro/no_fixup
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
Restore previous behaviour of only copying libraries on next to executable on Windows.
2025-07-12 19:42:10 +02:00
b713eadca8
Merge pull request #1677 from Armored-Dragon/fix/chat/selectTextInputByMouse
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
Select chat text input using mouse
2025-07-10 21:26:16 +02:00
armored-dragon
6363f0beec
Select chat text input using mouse. 2025-07-06 21:42:54 -05:00
HifiExperiments
9a0346a794 Merge remote-tracking branch 'overte/master' into materialLayers2 2025-07-05 16:28:17 -07:00
56b473fcdf Fix merge commit for thumbstick scrolling
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
2025-07-05 20:57:09 +02:00
38f2ee55be
Merge pull request #1564 from ada-tv/feature/thumbstick_scrolling
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Thumbstick scrolling
2025-07-05 20:40:14 +02:00
39a3ea26f5
Merge branch 'master' into feature/thumbstick_scrolling 2025-07-05 20:39:35 +02:00
559b6b607d
Merge pull request #1645 from ada-tv/fix/grab-hasOwnProperty
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Fix desktop grab attempts spamming errors in some cases
2025-07-05 17:20:04 +02:00
27d0ff8385
Merge pull request #1670 from Armored-Dragon/fix/armored_chat/hotfix_1659
Hotfix for chat
2025-07-05 17:15:58 +02:00
18dacdf6fb
Merge pull request #1647 from ada-tv/fix/local-laser-grab
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Fix laser grabs on local entities
2025-07-05 17:07:31 +02:00
armored-dragon
49271645f6
Make text selectable again. 2025-07-05 10:04:00 -05:00
armored-dragon
104a04170c
Fix messages not clearing after sending erase message request. 2025-07-05 10:02:26 -05:00
4f31864e81
Merge pull request #1661 from ada-tv/fix/xr-wayland-warning
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
'OpenXR not supported on Wayland' message box
2025-07-05 16:44:43 +02:00
5a919908e7
Merge pull request #1664 from ada-tv/fix/vr-notification-height
Fix chat notification height on VR HUD
2025-07-05 16:37:14 +02:00
2b9891af9a
Merge pull request #1659 from Armored-Dragon/fix/armored-chat/refactor
Armored Chat minor refactoring
2025-07-05 16:36:49 +02:00
Ada
d622d9165c Fix chat notification height on VR HUD 2025-07-05 23:28:29 +10:00
bdb1e2cc31
Merge pull request #1660 from Armored-Dragon/remove/graphics-icon-toggle-setting
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Remove "Show Graphics Icon..." from preferences dialog
2025-07-05 00:13:00 +02:00
92dcdf7d25 Merge Alezia's audio zones UI PR
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
2025-07-03 21:45:04 +02:00
Ada
55c004fb65 Fix virtual trigger buttons from sending real click events 2025-07-03 00:47:11 +10:00
Ada
66493ee541 Fix scrolling on local web entities like the tablet 2025-07-02 22:53:06 +10:00
Ada
e7c405032a Only process scrolls and lock player inputs when the trigger is held 2025-07-02 22:53:06 +10:00
Ada
1b54bd4b88 Expose scroll value to JS PointerEvent 2025-07-02 22:53:06 +10:00
Ada
0ca1c61631 Reliable input blocking for overlay and web lasers 2025-07-02 22:53:06 +10:00
Ada
5fb9ec8a94 Remove debug prints, lower scroll sensitivity and make it a preproc constant 2025-07-02 22:53:06 +10:00
Ada
34d073bb61 Hacky controller locking when HUD or web laser is active, super brittle and barely works 2025-07-02 22:53:06 +10:00
Ada
bc305bf1d9 Remove the digital LX/LY hack from OpenXR and fix the too-sensitive controller settings 2025-07-02 22:53:06 +10:00
Ada
eb40056231 Scrolling working! 2025-07-02 22:53:06 +10:00
Ada
dcd0334603 Wheel events being sent, but not being used by Qt? 2025-07-02 22:53:06 +10:00