Commit graph

9220 commits

Author SHA1 Message Date
armored-dragon
e1e079b654
Fix scrolling + message combining. 2024-10-29 15:16:06 -05:00
8b4207d18c
Merge pull request #1196 from Armored-Dragon/fix/AC_fix_quickchat_colortheme
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
Fix ArmoredChat quick_message qml dialog colors on light theme systems
2024-10-27 13:12:14 +01:00
armored-dragon
d3bf9a5cb7
Hard code colors.
Fix indentation.
Created custom components.
Italic text on placeholder text.
2024-10-27 03:52:19 -05:00
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
HifiExperiments
6876742e6f static pipelines + misc render cleanup 2024-10-23 15:53:10 -07:00
a2208725e0
Merge pull request #1165 from HifiExperiments/screenshare
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
Remove hifi screenshare (updated) (updated)
2024-10-22 17:31:39 +02:00
5b3cd71ea2
Merge pull request #1160 from AleziaKurdis/createApp_EquipableProperties
Create app: Grab and Equip
2024-10-22 14:20:45 +02:00
7ff372fa4c
Merge pull request #1164 from AleziaKurdis/placesAppPeristentMaturityFilter
Places App.: Persisted Maturity Filter and Default value for Newbies.
2024-10-22 14:15:49 +02:00
HifiExperiments
56a57d54bb
Merge branch 'master' into createApp_EquipableProperties 2024-10-21 16:00:48 -07:00
d38ebbd9f9 Fix Uuid.NULL behavior 2024-10-21 15:45:00 -07:00
ce8d57b4be
Merge pull request #1096 from overte-org/protocol_changes
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
Protocol changes -> master
2024-10-21 11:41:50 +02:00
Maki
5e35f76668 Remove hifi-screenshare
Cherry picked and updated from Tivoli dd5b6ea6ee5597a06603e16509640e7ed18106bb

Co-authored-by: Julian Groß <julian.g@posteo.de>
2024-10-18 18:59:18 -07:00
Alezia Kurdis
130948f0ac
move "triggerable" under GRAB & EQUIP
move "triggerable" under GRAB & EQUIP
2024-10-16 22:13:55 -04:00
Alezia Kurdis
7979366978
Adjust the default value for maturity
Adjust the default value for maturity
2024-10-15 21:14:50 -04:00
Alezia Kurdis
6bd09409ce
Make Maturity Filter persisted
Make Maturity Filter persisted and with a default value (Teen & Everyone)
2024-10-14 21:22:18 -04:00
Alezia Kurdis
d63b3f51bc
Text adjustments for grab.equippable
Text adjustments for grab.equippable
2024-10-12 13:37:14 -04:00
Alezia Kurdis
c928c9b048
Add tooltips for the "Grab and Equip" properties
Add the tooltips for the "Grab and Equip" properties
2024-10-11 22:09:29 -04:00
Alezia Kurdis
64b5d2db33
Add files via upload 2024-10-11 21:37:51 -04:00
Alezia Kurdis
82a923e06c
Add "Grab And Equip" section
Add "Grab And Equip" section for the grabbale and Equipable groups of properties.
2024-10-10 22:27:26 -04:00
Alezia Kurdis
17e253006b
Adding icon for "Grab And Equip" section
Adding icon for "Grab And Equip" section
2024-10-10 22:23:28 -04:00
b78d0b060e
Merge pull request #1123 from Armored-Dragon/fix/createMenuDelete
Fix Create App not honoring menu bar actions
2024-10-05 22:33:21 +02:00
529a7ae72b
Merge pull request #1153 from AleziaKurdis/placesAppPromoteBetter
Place App: Weekly promoted place
2024-10-05 22:02:57 +02:00
HifiExperiments
e7f7314b37
Merge branch 'master' into protocol_changes 2024-10-02 12:11:39 -07:00
Alezia Kurdis
8526f09a9d
weekly promoted place
Highlight the first place in the list as the weekly promoted place
2024-09-30 20:27:09 -04:00
armored-dragon
1ede7ed3e9
Replaced key value with key text.
Added additional comment about the specific delete key used.
2024-09-30 08:02:44 -05: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
HifiExperiments
79cfa68edf fix accidentally clearing url fields when you don't have view permission 2024-09-09 14:58:41 -07:00
HifiExperiments
74fa1d1291 text vertical alignment, use uint8_t for entity property enums, fix text recalculating too often 2024-09-08 21:12:25 -07:00
armored-dragon
cf3afa8855
Prevent duplicate actions. 2024-09-02 12:29:44 -05: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
c28424ebe8
Merge branch 'master' into fix/Tofu-inArmored-Chat 2024-09-02 13:16:59 +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
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
093f8b7cb0 Merge remote-tracking branch 'overte/master' into master_to_protocol_changes4 2024-08-17 12:30:15 -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
74b0754f72 blacklist -> blocklist 2024-08-13 17:39:51 -07:00
HifiExperiments
2d6e5027b8 Merge remote-tracking branch 'overte/master' into master_to_protocol_changes2 2024-07-29 18:09:14 -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
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
HifiExperiments
2c148ca97d change AO default to HBAO, remove from create 2024-07-26 18:23:23 -07:00
HifiExperiments
c72f22e4ee
Merge branch 'protocol_changes' into zoneProps 2024-07-22 17:33:30 -07:00