Commit graph

87014 commits

Author SHA1 Message Date
pull[bot]
2f359cc15f
[pull] master from overte-org:master (#93)
* mirrors wip

* fix view + projection, texture flipping, billboarding

* wip portals

* wip

* fix cpu frustum culling (hacky?)

* fix mirrors in deferred

* mirrors on models + text

* portals use exit as ignoreItem

* cleanup

* entity tags

* wild guess to handle view correction, hide portalExitID in create when mirrorMode != portal

* let's try this??

* plz

* promising

* fix paramsOffset and view flipping

* portals shouldn't flip

* break when tag found

* fix portal view calculation

* Revert "Mirrors + Portals"

* Revert "Revert "Mirrors + Portals""

* web entity wantsKeyboardFocus property

* fix typo

* move audio zones to zone entity properties

* fix audio zones in create

* set dynamic factory

* new procecural particle entity type

* fix particle intersection

* shorten create labels

* fix 0 update props case

* Ability to smooth model animations

* sound entities

* fix layered simulate items

* fix stereo sound speed

* support non-localOnly sound avatar entities

* add sound url prompt

* support registration point, improve locking

* remove keyboardRasied

* locking attempt #2

* fix keyboardRasied typo

* add default particle props

* add unlit property for shapes

* Merge branch master into protocol_changes

* add ambient light color

* fix create issue

* fix create issue

* add tonemapping props to zones, wip ambient occlusion

* wip ambient occlusion

* it's working!

* remove attachments

* fix non-localOnly positional sounds not updating

* change AO default to HBAO, remove from create

* more graphics options

* fix AO setting + effects in mirrors

* fix AA in mirrors

* alezia's fixes

* fix haze in mirrors

* add comment for SKYBOX_DISTANCE

* new line

* 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

* add loadPriority to model entities, working on other avatars waitForWearables

* fix build error

* try to fix isServer assert

* fix stats + waitForWearables

* Listen for click instead of release.

* Reverted initial commit. Implemented hack to listen for menu click events.

* Missed some reverts.

* Missed another one.

* Prevent duplicate actions.

* Added extra needed checks.

* Fix without formatting? (#91)

* Hopefully fixed formatting.

* Things can't be too easy.

* Remove google poly

* automated entity property serialization

* cleanup + automate EntityPropertyFlags

* text vertical alignment, use uint8_t for entity property enums, fix text recalculating too often

* fix text size

* Update interface/resources/controllers/keyboardMouse.json

Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>

* fix component mode serialization

* Fixed mouse look in selfie mode.

* fix text debug assert on invalid or unloaded font

* missed some enums

* fix ADD_GROUP_PROPERTY_TO_MAP

* fix PROP_GRAB_EQUIPPABLE_INDICATOR_URL missing urlPermission

* fix KeyLightPropertyGroup legacy properties

* fix PolyLineEntityItem::getEntityProperties

* comment cmake script

* fix copyright

* Replaced key value with key text.
Added additional comment about the specific delete key used.

* weekly promoted place

Highlight the first place in the list as the weekly promoted place

* Fixed lingering references to `avatarIcon`.

Signed-off-by: armored-dragon <publicmail@armoreddragon.com>

* Adding icon for "Grab And Equip" section

Adding icon for "Grab And Equip" section

* Add "Grab And Equip" section

Add "Grab And Equip" section for the grabbale and Equipable groups of properties.

* Add files via upload

* Add tooltips for the "Grab and Equip" properties

Add the tooltips for the "Grab and Equip" properties

* Text adjustments for grab.equippable

Text adjustments for grab.equippable

* Make Maturity Filter persisted

Make Maturity Filter persisted and with a default value (Teen & Everyone)

* Adjust the default value for maturity

Adjust the default value for maturity

* move "triggerable" under GRAB & EQUIP

move "triggerable" under GRAB & EQUIP

* Remove hifi-screenshare
Cherry picked and updated from Tivoli dd5b6ea6ee5597a06603e16509640e7ed18106bb

Co-authored-by: Julian Groß <julian.g@posteo.de>

* Insert placeholder to not break protocol yet.

* Fix incorrectly resolved merge conflict, left too much code.

* Fixes based on review comments on previous PR

* Remove code accidentally re-added during a conflict fix

* bump protocol

* rebuild fonts with full charset (NOT -allglyphs)

* Attempt at fixing Windows master branch builds

* Change minimum angular velocity to a lower one

* Fix Uuid.NULL behavior

---------

Signed-off-by: armored-dragon <publicmail@armoreddragon.com>
Co-authored-by: HifiExperiments <thingsandstuffblog@gmail.com>
Co-authored-by: ksuprynowicz <ksuprynowicz@post.pl>
Co-authored-by: Dale Glass <51060919+daleglass@users.noreply.github.com>
Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
Co-authored-by: Julian Groß <julian.g@posteo.de>
Co-authored-by: armored-dragon <publicmail@armoreddragon.com>
Co-authored-by: Armored-Dragon <github56254@armoreddragon.com>
Co-authored-by: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Co-authored-by: Maki <mxmcube@gmail.com>
Co-authored-by: Dale Glass <dale@daleglass.net>
2024-10-24 06:32:53 +00:00
2824067ecb
Merge pull request #1141 from Armored-Dragon/update/avatarAppIcons
Update Avatar App icons
2024-10-02 17:03:34 +02:00
18d713d3e3
Merge pull request #1152 from AleziaKurdis/createAppHighlightAvatarEntities
Create app: highlight avatar entities
2024-10-02 07:27:07 +02:00
Alezia Kurdis
1deab129d2
Add Avatar and Local Entities Highlighting
Add Avatar and Local Entities Highlighting for Name and ID properties
2024-09-29 23:00:03 -04:00
Alezia Kurdis
652bb6f6da
Adding Avatar Entity Highlighting
Adding Avatar Entity Highlighting
2024-09-29 20:52:07 -04:00
Alezia Kurdis
151546619d
Adding Avatar Entity Highlighting
Adding Avatar Entity Highlighting
2024-09-29 20:51:43 -04:00
Alezia Kurdis
b2137adde0
Adding Avatar Entity Highlighting
Adding Avatar Entity Highlighting
2024-09-29 20:51:04 -04:00
542b231107
Merge pull request #1138 from HifiExperiments/emptyField
fix accidentally clearing url fields when you don't have view permission
2024-09-22 18:15:16 +02:00
armored-dragon
9442559f9d
Say less, JulianGro. 2024-09-19 07:27:52 -05:00
armored-dragon
637968eceb
Update icons. 2024-09-19 06:20:44 -05:00
808135b6c4
Merge pull request #1135 from overte-org/clion-ignore
Add CLion-style build directories to .gitignore
2024-09-11 14:06:22 +02:00
HifiExperiments
79cfa68edf fix accidentally clearing url fields when you don't have view permission 2024-09-09 14:58:41 -07:00
ff130095b9 Add CLion-style build directories to .gitignore 2024-09-07 22:53:38 +02: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
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
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
Armored Dragon
f222323ef0
Remove message appending.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-08-17 04:28:24 -05:00
HifiExperiments
f987bbca4f add a setting to workaround the GLES colorspace conversion issue 2024-08-16 14:35:33 -07:00
HifiExperiments
3565a2d5ea bring changelog up to date 2024-08-14 22:31:16 -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
Armored Dragon
d8abae2c31
Merge remote-tracking branch 'upstream/master'
Update
2024-07-30 08:46:20 -05: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
3034ce7093 Improve logging for abnormal behaviour. 2024-07-25 03:19:29 +02:00
b9239f451f Fix error printing message during login failure and make it a warning. 2024-07-25 03:18:34 +02:00
d6150c3684 Fix login failure handling in LoggingInBody.qml. 2024-07-25 03:16:42 +02:00
Alezia Kurdis
448250883a
Ui Adjustment
Ui Adjustment:
- UV Animation scroll speed X  and Y is now -3 to 3
- MToon and Shader (Simple) (instead of MTOON and SHARDER (Simple))
- Opacity mode: "Not used" instead of "Do not used" ("Do not use" would be also wrong as it means more "Don't even think to touch it" ranther than "currently not using it")
2024-07-22 18:46:29 -04:00
Alezia Kurdis
c1fb08e509
Add better error messages.
Add better error messages.
2024-07-22 14:38:15 -04:00
Alezia Kurdis
a987ab0e65
Support MTOON in Material Assistant
Support MTOON in Material Assistant
2024-07-21 22:35:27 -04:00
Alezia Kurdis
d189f70b36
Support MTOON in Material Assistant
Support MTOON in Material Assistant
2024-07-21 22:34:16 -04:00
Alezia Kurdis
4a69e90035
Support MTOON in Material Assistant
Support MTOON in Material Assistant
2024-07-21 22:31:56 -04:00
Armored Dragon
da06bcb9b7
Merge remote-tracking branch 'upstream/master' 2024-07-21 09:39:31 -05:00
Dale Glass
2be3011d28
Merge pull request #1088 from daleglass-overte/fix-wireshark-dissector
Fix wireshark dissector
2024-07-18 22:07:39 +02:00
Dale Glass
e771bd1706
Merge pull request #1087 from daleglass-overte/dump-protocol-data
Dump protocol data
2024-07-18 22:07:16 +02:00
Armored Dragon
ffe6e3a323
Remove onFirstRun.js
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-18 15:04:35 -05:00