Commit graph

24 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
4aad531049 Add license information to a bunch of files 2022-11-25 22:02:06 +01:00
David Rowe
86aa3c8709 Make chat open links in internal Web browser instead of custom window 2020-10-03 16:29:14 +13:00
Flame Soulis
1a883b5a32 Added HifiAbout (used in interstitialPage.js) 2018-10-19 09:04:22 -04:00
Thijs Wenker
b20741baba web-scripting globals 2018-05-15 06:36:01 +02:00
Thijs Wenker
82befc8862 ignore 0.5 and 2 as magic-numbers 2018-05-15 06:21:26 +02:00
Thijs Wenker
50f76dd4df added more missing globals 2018-05-15 00:11:34 +02:00
Thijs Wenker
20fb9034f8 no magic numbers, except -1, 0, 1 2018-05-14 20:11:55 +02:00
Thijs Wenker
e24523a29e updated eslint config to be more sorted and complete 2018-05-11 01:48:13 +02:00
Liv
94b925d9d5
Update .eslintrc.js 2017-11-13 15:53:33 -08:00
beholder
61c5395f44 add missing comma 2017-09-14 18:48:43 +03:00
druiz17
310dbce65d fixed merge conflict 2017-09-13 15:55:04 -07:00
Menithal
30c979bd31 Added Clap App to Repository
Addede Clap App Icons to tablet icons (there needs to be another way to
do this than link directly to link or use this method!)
Added module as valid global to eslintrc
2017-09-11 23:48:30 +03:00
Dante Ruiz
7cf27c18d3 code cleanup and fix broken features 2017-08-31 18:06:55 -07:00
humbletim
060d5aa3cb add "Resource" API global 2017-04-26 17:49:14 -04:00
Anthony J. Thibault
6747f553bf Add DebugDraw to .eslintrc config file
(cherry picked from commit c7cd0fdc38)
2017-03-13 15:23:22 -07:00
Anthony J. Thibault
0b9f4d4f11 updated eslint to include Tablet global 2017-02-16 16:53:51 -08:00
Anthony J. Thibault
d36e60bbaa eslintrc: accept spaces after function keyword in anonymous functions
Anonymous functions `function () {}` and `function() {}` will both be accepted by eslint.
2016-08-08 15:20:58 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui
Edit model dialog improvements
2016-07-22 17:11:52 -07:00
Zander Otavka
0992e80254 Add Toolbars to eslint globals 2016-07-21 15:44:05 -07:00
Zander Otavka
6417bb1859 Require tripple equals over double, fix in edit.js 2016-07-15 17:33:47 -07:00
Zander Otavka
5428192b2e Add a few missing globals to .eslintrc file 2016-07-15 17:00:35 -07:00
Zander Otavka
5b343c9b82 Fix eslint descrepencies
Prohibit trailing commas, and fix function spacing rule to be more in
line with the coding standard.  Also prohibit leading decimal points,
also specified in coding standard.
2016-06-30 14:18:07 -07:00
Zander Otavka
55c2466249 Move .eslintrc.js to project root
This way, all project scripts are in scope, and the .eslintrc doesn't
get pushed to the installer with the default scripts.
2016-06-27 10:25:53 -07:00
Renamed from scripts/.eslintrc.js (Browse further)