Commit graph

9157 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
ffe6e3a323
Remove onFirstRun.js
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-18 15:04:35 -05:00
54e993f220
Merge pull request #1086 from Armored-Dragon/fix/ControllerScripts-uncaught-exception
Fix controllerScripts uncaught exception.
2024-07-17 00:52:48 +02:00
Armored Dragon
8656f23147
Fix variable name.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-16 17:38:32 -05:00
d7eb29b665
Merge pull request #1081 from Armored-Dragon/fix/mouselook-ignoring-setting
Fix mouselook ignoring setting.
2024-07-16 23:55:15 +02:00
Armored Dragon
a5858c3597
Change the 'open in new window' character.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-13 15:20:11 -05:00
Armored Dragon
06f4550e55
Hardcode link colorization.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-13 14:38:56 -05:00
Armored Dragon
e901cea8ef
Check if setting is enabled.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-12 16:01:45 -05:00
a651b6b978
Merge pull request #1004 from Armored-Dragon/mouselook_refactor
MouseLook.js refactor
2024-07-11 22:06:50 +02:00
1d1a680678
Merge pull request #961 from Armored-Dragon/ArmoredChat
Replace Floofchat with ArmoredChat
2024-07-11 21:27:36 +02:00
Armored Dragon
9964d91729
Fixed message subscription.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-11 14:21:32 -05:00
Armored Dragon
e56ea656f6
Also check sender name.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-10 10:24:20 -05:00
Armored Dragon
112bd816ec
Sanitize notification text.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-09 13:37:20 -05:00
Armored Dragon
fe4625839b
Sanity check on message channel.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-09 13:23:44 -05:00
Armored Dragon
252b33b73f
Removed commented code.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-08 11:25:19 -05:00
Armored Dragon
6cf6e6c9ec
Disallow all text formatting by default.
Removed now redundant <script> filtering.

Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-08 11:21:04 -05:00
Armored Dragon
c6d2e567f6
Fix keyboard being invoked when not in VR.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-07-06 10:26:42 -05:00
Armored-Dragon
f2e1ae9a62
Merge branch 'overte-org:master' into mouselook_refactor 2024-07-01 16:44:02 -05:00
69105e716a Increase default vertical FOV 2024-06-30 20:59:32 +02:00
Armored-Dragon
2012cce7e9
Merge branch 'master' into ArmoredChat 2024-06-29 14:17:42 -05:00
Armored Dragon
7e100a1870
Raise VR Keyboard when textfield is selected
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-06-28 10:42:39 -05:00
HifiExperiments
4d927b1440
Merge pull request #1014 from HifiExperiments/lasers
Wiggly lasers
2024-06-28 01:51:25 -07:00
245da8eb19 Remove external reference to FloofChat.js. 2024-06-15 15:39:58 +02:00
HifiExperiments
a5b32a6406 allow configurable delay 2024-06-14 20:15:24 -07:00
HifiExperiments
9a2f0f7704
Merge pull request #937 from HifiExperiments/text
Text Entity Improvements
2024-06-10 22:59:44 -07:00
HifiExperiments
3064647d05 wiggly lasers 2024-06-09 20:00:44 -07:00
Armored Dragon
192d80aece
Floofchat compatibility.
Made conversion functions to allow communication between apps.
Removed developer console.log function.

Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-06-08 11:51:25 -05:00
Armored Dragon
eb84de84b4
Corrected case on variables.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-06-08 08:41:53 -05:00
Armored Dragon
7fc1a3d175
Fixed scrolling too far.
Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
2024-06-08 08:34:04 -05:00