Commit graph

87149 commits

Author SHA1 Message Date
armored-dragon
648c3ff9d8
Added extra needed checks. 2024-09-04 01:38:52 -05:00
armored-dragon
cf3afa8855
Prevent duplicate actions. 2024-09-02 12:29:44 -05:00
a142f7de72
Try fixing master build uploads. 2024-09-02 17:15:49 +02:00
82ac56d147
Merge pull request #1078 from Armored-Dragon/fix/xss_notificationCore
Sanitize notificationCore text to prevent XSS
2024-09-02 13:21:45 +02:00
433e2c0234
Merge pull request #1084 from Armored-Dragon/fix/Tofu-inArmored-Chat
[Armored Chat] Change the 'open in new window' character.
2024-09-02 13:17:24 +02:00
c28424ebe8
Merge branch 'master' into fix/Tofu-inArmored-Chat 2024-09-02 13:16:59 +02:00
23c58d5c95
Merge pull request #1089 from Armored-Dragon/Delete/onFirstRun
Remove unused onFirstRun.js
2024-09-02 13:15:08 +02:00
0f123d7d95
Fix Windows master build uploads. 2024-09-02 12:38:46 +02:00
Armored-Dragon
5155ac3163
Merge branch 'overte-org:master' into fix/xss_notificationCore 2024-08-31 21:52:34 +00:00
Armored-Dragon
e8dae14a02
Merge branch 'overte-org:master' into Delete/onFirstRun 2024-08-31 20:48:38 +00:00
armored-dragon
edb08572f5
Missed another one. 2024-08-27 16:14:02 -05:00
armored-dragon
7fc7f5e617
Missed some reverts. 2024-08-27 16:13:12 -05:00
armored-dragon
1ab2a7e1e3
Reverted initial commit. Implemented hack to listen for menu click events. 2024-08-27 16:10:46 -05:00
armored-dragon
10dc75af5d
Listen for click instead of release. 2024-08-27 15:24:18 -05:00
HifiExperiments
3d97f7845b fix stats + waitForWearables 2024-08-19 14:17:20 -07:00
HifiExperiments
e9831d9f22 try to fix isServer assert 2024-08-18 21:09:06 -07:00
HifiExperiments
86f3ca8918 fix build error 2024-08-18 20:56:11 -07:00
HifiExperiments
7c3498bf9d add loadPriority to model entities, working on other avatars waitForWearables 2024-08-18 20:56:08 -07:00
HifiExperiments
fe61d92a09 model loading priority updates over time, takes into account out of bounds, avatar entities have higher priority, and fsts can specify to wait for wearables to load before rendering 2024-08-18 20:55:22 -07:00
eb168e4e5d
Merge pull request #1106 from Armored-Dragon/fix/ArmoredChat-Scrolling
[ArmoredChat] Alleviate scrolling issue
2024-08-18 16:15:39 +02:00
a97b892338
Merge pull request #1094 from AleziaKurdis/createApp_Paste_Url_In_Create_ui
Create App: Revolutionary "Paste" Url buttons for the "Create Model", "Create Material" and "Create Voxels" UI
2024-08-18 16:12:27 +02:00
HifiExperiments
93c1ed6446
Merge pull request #1108 from HifiExperiments/master_to_protocol_changes4
merge master to protocol_changes
2024-08-17 12:32:31 -07:00
HifiExperiments
093f8b7cb0 Merge remote-tracking branch 'overte/master' into master_to_protocol_changes4 2024-08-17 12:30:15 -07:00
Dale Glass
fb81ad6c83
Merge pull request #1105 from HifiExperiments/colorspace
add a setting to workaround the GLES colorspace conversion issue
2024-08-17 21:13:24 +02:00
Dale Glass
228d451361
Merge pull request #1104 from HifiExperiments/changelog
bring changelog up to date
2024-08-17 21:12:35 +02:00
Dale Glass
836db25cdf
Merge pull request #1102 from HifiExperiments/language
Update outdated language
2024-08-17 21:11:48 +02:00
HifiExperiments
fa2211f9ca
Merge pull request #1107 from HifiExperiments/master_to_protocol_changes3
merge master to protocol_changes (again) (again)
2024-08-17 12:09:33 -07:00
HifiExperiments
8fc734b168 Merge remote-tracking branch 'overte/master' into master_to_protocol_changes3 2024-08-17 12:07:21 -07:00
HifiExperiments
0ab9d5f004
Merge pull request #1053 from HifiExperiments/graphicsSettings
Graphics settings
2024-08-17 11:47:41 -07:00
Armored Dragon
f222323ef0
Remove message appending.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-08-17 04:28:24 -05:00
HifiExperiments
91c72299ab new line 2024-08-16 14:46:15 -07:00
HifiExperiments
f987bbca4f add a setting to workaround the GLES colorspace conversion issue 2024-08-16 14:35:33 -07:00
HifiExperiments
b1d991deb2 add comment for SKYBOX_DISTANCE 2024-08-16 13:38:59 -07:00
HifiExperiments
3565a2d5ea bring changelog up to date 2024-08-14 22:31:16 -07:00
HifiExperiments
05661c6007 fix haze in mirrors 2024-08-14 18:20:06 -07:00
HifiExperiments
24ed76a5db alezia's fixes 2024-08-14 15:42:01 -07:00
HifiExperiments
126c325410 master -> primary 2024-08-13 20:50:51 -07:00
HifiExperiments
74b0754f72 blacklist -> blocklist 2024-08-13 17:39:51 -07:00
HifiExperiments
f2d8fa2fe4 whitelist -> allowlist 2024-08-13 17:29:53 -07:00
HifiExperiments
2876a4d4ea slave -> worker 2024-08-13 00:06:55 -07:00
HifiExperiments
493c9c9441
Merge pull request #1058 from HifiExperiments/fallbacks
Custom shader fallbacks
2024-08-01 14:55:15 -07:00
HifiExperiments
3e617d003a fix AA in mirrors 2024-07-30 16:02:24 -07:00
Armored Dragon
d8abae2c31
Merge remote-tracking branch 'upstream/master'
Update
2024-07-30 08:46:20 -05:00
HifiExperiments
f0ecffd11d
Merge pull request #1095 from HifiExperiments/master_to_protocol_changes2
merge master into protocol_changes (again)
2024-07-29 18:10:38 -07:00
HifiExperiments
2d6e5027b8 Merge remote-tracking branch 'overte/master' into master_to_protocol_changes2 2024-07-29 18:09:14 -07:00
HifiExperiments
259458394e fix AO setting + effects in mirrors 2024-07-28 23:32:19 -07:00
HifiExperiments
d4ca3d5dc1 more graphics options 2024-07-28 23:32:19 -07:00
Alezia Kurdis
a93e1591d6
Add Paste Url button to UI
This adds "Paste" buttons in "Create Model", "Create Material" and "Create Voxels" to help pasting url (which was totally disfunctional in VR)
2024-07-27 21:12:58 -04:00
Dale Glass
b69ab5a157
Merge pull request #1093 from JulianGro/fix-login-error
Fix login failure handling and improve logging.
2024-07-27 21:53:46 +02:00
Dale Glass
cc8e14ada7
Merge pull request #1091 from AleziaKurdis/createApp_MatAssistant2.0
Create App: Material Assistant: Add Mtoon, Shader_simple, missing PBR properties and bug fixes.
2024-07-27 21:48:37 +02:00