Commit graph

63 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
Alezia Kurdis
af4589d42a
Small adjustments 2024-02-24 13:49:44 -05:00
Alezia Kurdis
c28048be47
Fix notification display
This address the following things:
- In HMD, the notification are now synch with the helmet, you can't miss any notification now. the rendering is more stable this way. (Addressing Issue #826)
- in Desktop, it is using Window API instead of Controller API to obtain the window size to know where to display should be. (Controller is not always on synch with desktop size.  Window is always accurate for Desktop.
- In Desktop, now the windows width is recomputed so it support now window resizing. (Maybe addressing Issue #470 (assuming that "Announcements" are the "Notificatons", ))
2024-02-23 22:19:57 -05:00
5aeca97f83 Cache Controller.Standard in scripts for higher performance 2023-11-30 00:26:01 +01:00
ae7d229d0e Fix copyright headers 2023-05-19 00:17:38 +02:00
1ad1aee11f Minor scripting-related fixes 2023-05-19 00:17:38 +02:00
Alezia Kurdis
425cd51cd6
Play whoosh sound before deletion
The sound "whoosh" is now played before calling the notification deletion.
Previously it was called after and the effect was a bit wasted by this.
2022-09-17 22:17:37 -04:00
Alezia Kurdis
4a49631007
Added HMD notifications dismissal
Added a gestural way to dismiss the notifications in HMD.

The notifications vanishes after 10 sec. 
But if for any reason we want to accelerate the process (mostly because it hide the view or it is going to appears in photo capture)
In Desktop we can simply click on the notification to get rid of them.
But in HMD, clicking was kinda a pain (assuming the if you want to dismiss the notification is often because they are already annoying you)
have to aim and click is like pressing a button using a fishing pole, it's certainly adding more annoyance to this.
To addressed that, I introduced the "Whoosh!": An easy gesture to dismiss any 3d UI, by simply move one of you controller over you eyes height. (a bit like making flee an annoying fly.)
2022-09-16 22:29:02 -04:00
Alezia Kurdis
3e7854a034
Re-coded to be more stable.
This is a an almost complete re-coding of the notifications script.
The previous version had too useless complexities and was computing each element position independently causing the notifications to be unstably displayed in HMD if the user moved.
There was also too many array used to achieved this. It was a bit painful.

This new version use an invisible entity parented to the avatar as a "container" where the notification elements are parented to it, making the positioning easier and more stable if the avatar moves.
I used only one array of objects to contain the the notification stack.
There is also a better management of some signal to avoid useless computing when it wasn't necessary.
I think the code is also more clear.

I got rid of the little x buttons to close the notification, it was on each element, you had to target a very small square surface with the mouse if you wanted to absolutely close a notification within the 10 second of their existence. Now you can close a notification simply by clicking on it (on all its surface)
But as before, the close function works only on desktop mode. (Apparently it's relatively complex to get the id of the entity that you click on in HMD. Maybe one day.)

It's also easier now to adjust the scale of the notifications in HMD if we want too, (only one value to change in the script)
The parenting using a container entity has also made all the notification UI in HMD scaling correctly according the avatar scale (it was free by parenting all those together).
2022-09-14 23:11:56 -04:00
Alezia Kurdis
efa22b8fd9
Upgrade to local Entities and Misc
Upgrade to local Entities and Misc

- All the deprecated use of 3d overly has been changes to Local Entities (Only the addEntity)
- All the preview are now unlit (it was a pain in a dark place)
- The HMD has been repositionned to be visible. (This is a try, I think it is better)
- Many bug fix in HMD
- Added a setting to switch on/off the snapshot related notification (because they are often a nuisance during capture sessions. constantly present and appearing in the capture)

(The setting still need to be plugged in the admin.)
2022-09-09 23:55:49 -04:00
danteruiz
5dab4c0010 remove white-space 2019-03-15 10:47:48 -07:00
danteruiz
1e354fb280 fix notications scaling 2019-03-12 17:18:15 -07:00
Jeff Clinton
18bf6bf975
Merge pull request #14143 from ElderOrb/FB18673
FB18673 - Last line of GOTO desktop notification text cropped off on …
2018-11-13 14:05:21 -08:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
Alexander Ivash
f8285ab3d8 FB18673 - Last line of GOTO desktop notification text cropped off on bottom 2018-10-05 00:14:13 +03:00
howard-stearns
685b2978ce Text tuning for wallet setup call to action 2018-09-14 08:26:25 -07:00
Dante Ruiz
072d8b70b1 adding back notifcations 2018-05-30 13:36:02 -07:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
Zach Fox
a2b84c0fbb It's working!! 2018-04-30 12:11:46 -07:00
samcake
077b2dab30 Code review fixes 2018-04-02 16:09:43 -07:00
samcake
5a1eac563b Code review fixes 2018-04-02 15:50:18 -07:00
samcake
d4bc61fb3d Remove notifications and print outs for LOD changes because it was too much noise 2018-04-02 13:53:30 -07:00
Stephen Birarda
a97b4b010d suppress Interface notification for DS decryption error 2018-01-18 16:54:04 -08:00
luiscuenca
df51d66f60 no double scaling and comments 2017-11-17 13:40:22 -07:00
luiscuenca
bbf5e3b023 simplifications and comments 2017-11-17 12:45:36 -07:00
luiscuenca
26e401a069 fix broken HMD notifications 2017-11-14 14:22:53 -07:00
luiscuenca
262dc091ce 7589 Fix notifications shrink with avatar 2017-11-10 17:22:41 -07:00
Zach Fox
1cf816a261 Fix Wallet notification appearing when taking screenshots 2017-10-16 11:15:09 -07:00
Zach Fox
c2733a4186 Fix notification bug 2017-10-11 09:47:16 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
David Rowe
6b3b2beae0 Merge branch 'master' into vr-edit-a 2017-09-27 15:34:52 +13:00
Anthony J. Thibault
0873b88347 code review feedback 2017-09-20 09:21:15 -07:00
David Rowe
c56fda88fa Merge branch 'master' into vr-edit-a 2017-09-19 16:17:04 +12:00
Dante Ruiz
a5553d5e1c fixed text scale for notifications 2017-09-06 09:26:48 -07:00
David Rowe
6838461b07 Display notification message when don't have rez permissions 2017-09-06 12:44:57 +12:00
Dante Ruiz
a34dae4aad adding scale to notifications 2017-09-05 17:12:40 -07:00
Zach Pomerantz
337b6bca14 update JS with Audio.muted 2017-06-13 16:02:58 -04:00
Howard Stearns
0f8ee7051c lint 2017-04-26 08:20:12 -07:00
howard-stearns
ce7f3197f6 watch for announcements 2017-04-21 14:27:38 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Howard Stearns
5d341778c5 fix notification word wrapping 2017-04-07 07:08:19 -07:00
Howard Stearns
b8f557ca54 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration 2017-03-29 13:30:15 -07:00
Howard Stearns
53d484c318 makes connections! 2017-03-29 13:23:31 -07:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master"
This reverts commit b5ba4a109d.
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
David Kelly
76657a670c added notifications (faked user name for now), along with switch to avatar entities 2017-03-27 11:28:57 -07:00
Dante Ruiz
a5f1fb9e9a fixed notification spelling error 2017-03-15 19:45:30 +01:00
Dante Ruiz
4bc050e583 added tablet notification 2017-03-15 19:26:50 +01:00