Commit graph

411 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
HifiExperiments
d4112f455b also fix zone stack 2023-11-18 00:29:52 -08:00
HifiExperiments
e5e3c1bc08 fix luci errors + updated config paths 2023-11-15 22:54:26 -08:00
022bf6de8c Laser pointer fixes 2023-05-19 00:17:40 +02:00
6313bc5295
Merge pull request #380 from overte-org/qml_remove_deprecated
Remove styles-uit and controls-uit QML modules
2023-05-01 19:00:00 +02:00
028f6c2f82 Remove styles-uit and controls-uit QML modules, as they were replaced with stylesUit and controlsUit 5 years ago. 2023-04-23 20:23:11 +02:00
8b973bdfa3 Remove executable permission from a bunch of files 2023-03-14 00:02:33 +01:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Sam Gateau
d714cc6da6 FIxing some stuff ? 2019-10-04 17:55:37 -07:00
Sam Gateau
a5ccd07347 Adding the material fields ui yeah, todo: many errors for undefined fields 2019-10-03 22:43:44 -07:00
Sam Gateau
a5c10abcac Working on improving the material inspector 2019-10-03 17:04:40 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
Sam Gateau
133a8b7d5e a bunch of changes to debug why... 2019-09-11 18:21:44 -07:00
Sam Gateau
03c5dfad3d propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version 2019-09-03 16:28:32 -07:00
Sam Gateau
e1e4d9ac6c Exposing the AA mode of the AA job 2019-08-20 18:15:35 -07:00
Sam Gateau
c5bd9ecf4f REfreshing the antialiasing qml na dconfig of the Jitter Job 2019-08-19 18:14:29 -07:00
Sam Gateau
aeb407698d bloom ui 2019-08-18 22:15:20 -07:00
Sam Gateau
a934b79321 Updating the bloom debug ui 2019-08-16 17:34:16 -07:00
Sam Gateau
5e57e53db2 Address errors sent from running the ENgine Inspector.js 2019-08-14 11:15:52 -07:00
Sam Gateau
859016bf37 Addressing review comments 2019-08-14 10:28:42 -07:00
Sam Gateau
9139edc8b1 Maybe fixed the problem, cannot render the gl41 version properly 2019-08-12 00:44:14 -07:00
Sam Gateau
53642763c9 Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse 2019-08-11 21:57:36 -07:00
Sam Gateau
a96ef7b5f0 Exloring the why.... 2019-08-09 18:34:36 -07:00
Sam Gateau
67a13ee7cd Exploring differences in the polyline rendering 2019-08-08 17:10:46 -07:00
Sam Gateau
eb616452ec An afternounwatchign code 2019-08-05 17:54:46 -07:00
Sam
d84bebcc28 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-02 09:36:58 -07:00
Sam
6e2ffe14a0 better ui 2019-07-31 11:44:42 -07:00
Sam
767f413a2c merging the various job/task/switch congif into one 2019-07-29 00:07:16 -07:00
Anna
b59d967b6c fixed luci, made tone mapping mirrored auto generate, changed color format on forward, bug fixes 2019-07-16 15:44:28 -07:00
SamGondelman
6ce809fb2a merge with master 2019-07-11 09:01:30 -07:00
SamGondelman
29dbbc49ad Merge remote-tracking branch 'upstream/master' into bias 2019-07-09 15:38:13 -07:00
SamGondelman
8fd2251612 mostly working equation? 2019-07-09 13:34:33 -07:00
Zach Fox
d622e53458 Some comments; changed the code to be backwards compatible 2019-07-08 17:10:11 -07:00
SamGondelman
72f52b069e cleanup, fix shadow qml 2019-07-03 16:21:47 -07:00
Sam Gateau
2c412808e7 More information from the platform on mac 2019-07-02 14:48:25 +02:00
raveenajain
17d127ecf3 modify shadow debugger for new bias input 2019-06-28 10:07:49 -07:00
Sam Gateau
aa160c4d0f Improving presentation of stats & debug information 2019-06-21 16:17:28 -07:00
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
Sam Gateau
e5a772a9b8 Introducing the HUD layer rendering pass into it s own task and file 2019-06-14 17:54:15 -07:00
Sam Gateau
12f8c7486b getting rescaling to work for forward yop 2019-06-14 00:48:07 -07:00
Sam Gateau
4ba34f9a85 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -07:00
Sam Gateau
b132a42e89 fixing the scroll view 2019-06-12 22:42:05 -07:00
Sam Gateau
d406e52d71 Messing around 2019-06-06 16:37:49 -07:00
Sam Gateau
34bae25d0e fixing the broken binding dependency for the propitems 2019-06-05 00:33:44 -07:00
Sam Gateau
2a4d0cfaec Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset 2019-06-03 18:06:28 -07:00
Sam Gateau
b88deb52b0 Cleaning up the interface for the Performance PRESET and the associated debug ui 2019-05-30 12:03:44 -07:00
Sam Gateau
a212a8a36a COnnect the profile tier to the performance setting and assign on first run or after reset... 2019-05-29 17:49:17 -07:00
Sam Gateau
aedc631c45 Gathering all the needed settings in one place 2019-05-28 21:55:17 -07:00
Sam Gateau
0862e40b41 Adding ui to debug render settings 2019-05-28 18:01:39 -07:00