Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-21 04:03:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85615 commits 25 branches 28 tags 1.2 GiB
Commit graph

8888 commits

Author SHA1 Message Date
Kasen IO
d6793f79ba Share functionality enabled. 2020-04-04 01:55:45 -04:00
Kasen IO
00d388d94d Receive functionality enabled. 2020-04-04 01:04:10 -04:00
Kasen IO
e8027ac6a2 Edit functionality enabled. 2020-04-04 00:22:41 -04:00
Kasen IO
c89f07d508 Add and remove functionality enabled. 2020-04-04 00:03:03 -04:00
Alezia Kurdis
4a3405484c
Add new property "renderWithZones" 
Add the new property "renderWithZones" to the Create App.
For this, a new type of renderer type has been added: "Multiple Zones Selector".
(Required for the PR#78)
 2020-04-03 23:43:36 -04:00
Alezia Kurdis
16c5d8c051
Support for "Multiple Zones Selector" Renderer 
Add the code to expose the Zones list to the entityProperty.
as support for the new "Multiple Zones Selector" Renderer type.
(Required to support the new property "renderWithZones" for PR #78)
 2020-04-03 23:37:18 -04:00
Alezia Kurdis
0afca55e18
Add the new property "renderWithZones" 
This adds the Tooltip for new property "renderWithZones"
(Required for PR#78)
 2020-04-03 23:32:45 -04:00
Alezia Kurdis
0338d8a9f4
New classes for the "Multiple Zones Selector" Renderer 
Added:
New CSS classes for the "Multiple Zones Selector" Renderer
(Required for  the new property "renderWithZones" for PR#78)
 2020-04-03 23:27:01 -04:00
Alezia Kurdis
4b4a1bd8c0
Icons for "Multiple Zones Selector" Renderer 
2 new icon added for the "Multiple Zones Selector" Renderer
(required for the new property "renderWithZones" for PR#78):
"Add" and "Remove".
 2020-04-03 23:23:20 -04:00
Kasen IO
d8693d4d43 License headers. 2020-04-03 02:12:27 -04:00
Kasen IO
42ab992397 Even *further* progress. 2020-04-03 01:46:14 -04:00
Kasen IO
e138278ebc Further progress. 2020-04-02 21:12:40 -04:00
Kasen IO
3f4b3c4b36 First prototype styling and layout. 2020-04-02 19:29:33 -04:00
kasenvr
243309fdc4
Merge pull request #247 from FluffyJenkins/feature/chat 
Added license
 2020-03-30 18:50:53 -04:00
Fluffy Jenkins
f5b287b084 Added license 2020-03-30 22:10:53 +01:00
David Rowe
0bef98fd96 Relabel "GOTO" app's button to "OLD GOTO" 2020-03-29 13:34:26 +13:00
Kasen IO
46bd7e6001 Update title. 2020-03-27 14:44:33 -04:00
Kasen IO
3a4fbbc0b9 Update to explore app. 2020-03-26 22:28:39 -04:00
Alezia Kurdis
e52e1bafc6
Moved tabs.css reference 
-Change the path for the new location of tabs.css
-Local "style" migrated to "class"
 2020-03-18 18:38:41 -04:00
Alezia Kurdis
022ea6c5fb
Moved tabs.css to system/html/css 
Moved tabs.css to system/html/css
with other css.
 2020-03-18 18:34:51 -04:00
Alezia Kurdis
e371823896
Move the tabs.css with other css 
Move the tabs.css with other css
 2020-03-18 18:33:09 -04:00
kasenvr
d0cea34269
Merge branch 'kasen/core' into feature/default-moreapp 2020-03-16 17:58:58 -04:00
kasenvr
474770f0f2
Merge pull request #190 from kasenvr/feature/interim-goto 
Adds interim decentralizedGoTo as a default script, adds beta channel as well.
 2020-03-16 17:52:47 -04:00
kasenvr
f7e2b277bc
Merge pull request #192 from kasenvr/feature/toggle-beta-defaults 
Adds menu toggle for beta default scripts
 2020-03-16 17:51:28 -04:00
Kasen IO
5c4078320b Undo var -> const in more.html because it doesn't work, because reasons. 2020-03-16 00:39:29 -04:00
Kasen IO
3731b64b37 DisplayApp -> displayApp function name. 2020-03-16 00:28:32 -04:00
Kasen IO
391c4975fa var -> const in more.html 
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
 2020-03-16 00:25:08 -04:00
kasenvr
c78f7a9596
Apply suggestions from code review 
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-03-16 00:22:04 -04:00
Kasen IO
6420752db1 Update code formatting and add search optimization features. 
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
 2020-03-15 23:15:20 -04:00
Kasen IO
f70a9ec4c0 Bugfixing. - authored by Keb Hellion. 2020-03-13 13:34:32 -04:00
Kasen IO
cb4407532d Type check for metadataScript.src. 2020-03-13 10:09:33 -04:00
Kasen IO
bb3da99856 Undo overwritten previous fixes to type checking. 2020-03-12 15:29:11 -04:00
Kasen IO
1f67adc6dd Fix menu unsubscribing. 2020-03-12 03:46:09 -04:00
Kasen IO
4eea4980fd Lint + fix default apps per page + fix script list loading bug. 2020-03-11 14:59:35 -04:00
David Rowe
0839d15c5a Fix button icons 2020-03-11 16:31:02 +13:00
Alezia Kurdis
8ab40e1a08
Fix the userData and materialData editor 
Fix the userData and materialData editor.
Only 2 conditions have been modified to make it works.
I have removed a significant quantity of dead code
that was trying to overlay a static text an obscure reason.
Please, retest this. In case I missed something that I don't know.
 2020-03-10 00:48:54 -04:00
kasenvr
db0bcb9b19
Merge pull request #184 from kasenvr/fix/chat-goto-json 
Updates the var name and URL for the goto JSON for use in chat
 2020-03-09 15:18:38 -04:00
David Rowe
725a06d248 Fix fix 2020-03-06 15:04:58 +13:00
David Rowe
435094ddbe Fix button label and icon 2020-03-06 14:56:03 +13:00
Alezia Kurdis
d934018c7b
Codes minor adjustments 
Codes minor adjustments.
Some formatting issues.
Use element instead of a string
 2020-03-04 18:42:57 -05:00
Alezia Kurdis
206b1b12c5
Additional fixes about the formatting. 
Additional fixes about the formatting.
 2020-03-04 18:26:23 -05:00
Kasen IO
df08f77792 Update menu name from "goTo" to "Explore". 2020-03-04 11:20:57 -05:00
Kasen IO
9b385d91a8 Remove unnecessary var and update function name. 2020-03-04 11:08:38 -05:00
Kasen IO
30b5a28f4e Remove unnecessary checks. 2020-03-04 10:46:16 -05:00
Alezia Kurdis
ed9918a537
Fix for the multiselection. 
This is the fix for the multiselection case.
(It doesn't include the solution for User Data.)
 2020-03-03 19:21:14 -05:00
Alezia Kurdis
e6a45690ba
Color Adjustments 
The color has been attenuated on those 2 icons.
It was too present compared to the others.
 2020-03-02 23:53:55 -05:00
Alezia Kurdis
d1c641de49
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:13:47 -05:00
Alezia Kurdis
4a1926a901
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:11:45 -05:00
Alezia Kurdis
124b3fe6a2
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:10:33 -05:00
Kasen IO
8092220ea4 Code housekeeping, update URL for guide to link to repo. 2020-03-02 08:51:38 -05:00
Kasen IO
df1d2f28d8 Update app icon. 2020-03-02 08:14:20 -05:00
Alezia Kurdis
f3096ae74d
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:37:44 -05:00
Alezia Kurdis
5c7e6e43c2
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:36:43 -05:00
Alezia Kurdis
fa7143c87e
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:35:48 -05:00
Kasen IO
95f1c5da25 Add maintenance header. 2020-03-01 16:41:02 -05:00
Kasen IO
22169d9458 Fixes apps and metadata loading locally or remotely. 2020-03-01 16:13:02 -05:00
Kasen IO
aa8d8f0aef CR revisions. 2020-02-29 17:26:20 -05:00
Alezia Kurdis
0eb6f1f183
Fix page height blocking dropdown 
Fix the page height that blocked the correct use of the shape dropdown.
The layout looks more stable now.
 2020-02-29 15:52:06 -05:00
Alezia Kurdis
29e780e3f1
Sections reorganization 
1- Section "behavior" is now split in 2 sections: "behavior" and "scripts"

2- Particles sections: "particles_acceleration" and "particles_spin" 
has been joined as a new section: "particles_behavior"

3- Particles section: "particles_alpha"  has been merged under  section: "particles_color"
 2020-02-29 14:07:15 -05:00
Alezia Kurdis
bb422a3832
Icons for sections reorganization 
behavior will be split: behavior,  scripts
particles_behavior will replace: particles_acceleration and particles_spin
 2020-02-29 14:02:57 -05:00
Alezia Kurdis
2bd0950a01
Delete particles_spin.png 
Not going to be used.
 2020-02-29 14:00:10 -05:00
Alezia Kurdis
fd0186f997
Delete particles_acceleration.png 
No going to be used.
 2020-02-29 13:59:38 -05:00
Kasen IO
d8d84004ce Update file header. 2020-02-29 13:32:01 -05:00
Kasen IO
aa2ec12d8d Add missing files required for local running of the script. 2020-02-29 13:11:55 -05:00
Alezia Kurdis
3c4e073874
Properties Editor using tabs 
Properties Editor using tabs instead of collapsible sections to avoid painful scrolling.
 2020-02-28 23:52:24 -05:00
Kasen IO
1090c8e1be Adds menu toggle for beta default scripts. 2020-02-28 10:08:54 -05:00
Kasen IO
0f5a83b970 Adds more app as default script w/ beta branch pulling from repo URL. 2020-02-28 01:44:54 -05:00
Kasen IO
4c6be03865 Adds decentralizedGoTo as a default script, adds beta channel as well. 2020-02-28 01:20:21 -05:00
Kasen IO
4455fae3de staging -> interim metaverse location & terminology. 2020-02-27 14:41:50 -05:00
David Rowe
5db58bd9b8 Add inspect.js to default scripts 2020-02-27 21:14:49 +13:00
Kasen IO
33791875cb Add app-more.js to default scripts. 2020-02-26 21:46:45 -05:00
Kasen IO
f240cb9f46 Updates the var name and URL for the goto JSON for use in chat. 2020-02-26 14:24:06 -05:00
Kasen IO
6b4080b042 Fix module check. 2020-02-25 18:08:07 -05:00
Kasen IO
5dbd294166 Remove leftover cachebust on pickRayController.js 2020-02-25 02:11:12 -05:00
kasenvr
68d9ec81d9
Merge branch 'kasen/core' into feature/default-nametag 2020-02-25 02:09:30 -05:00
Kasen IO
1636175e4a Makes simplified namtag a default script, disabled while using inspect.js (alt key) 2020-02-25 01:40:17 -05:00
kasenvr
754e57ca78
Update FloofChat.js 
Created a chat relay on the metaverse server, grid chat now works again.
 2020-02-16 20:20:04 -05:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
Fluffy Jenkins
5492759a0c Made requested changes and changed how it loads 2020-01-29 19:50:23 +00:00
Fluffy Jenkins
a66bbcb125 Made fixes 2020-01-28 22:23:01 +00:00
Fluffy Jenkins
b8e41fd244 Added basic beta default scripts feature 2020-01-28 22:06:27 +00:00
George Deac
7b97fa879d
Update FloofChat.html 2020-01-26 01:18:15 +02:00
George Deac
bbae98e194
Merge branch 'kasen/core' into kasen/core 2020-01-23 23:21:22 +02:00
George Deac
8ad8457ebe
Add files via upload 2020-01-22 21:54:31 +02:00
kasenvr
31ea9e33c7
Merge pull request #107 from FluffyJenkins/feature/communityModules 
Fixed url parsing breaking with text formatting! <3
 2020-01-21 22:53:52 -05:00
Fluffy Jenkins
f77f629cad Fixed bug caused by code review changes uwu 2020-01-22 02:56:53 +00:00
Fluffy Jenkins
553b7d1f38 Code Review Changes 2020-01-21 22:54:35 +00:00
Fluffy Jenkins
d32fc6ab86 Fixed url parsing breaking with text formatting! <3 2020-01-21 22:02:53 +00:00
kasenvr
65dde00f6c
Merge pull request #95 from FluffyJenkins/feature/communityModules 
Add goto json support (defaults to darlings goto), etc
 2020-01-17 12:13:41 -05:00
Marcus Llewellyn
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes." 2020-01-16 18:51:49 -06:00
Fluffy Jenkins
6bed25ee27 Formatting (bloody ide not doing qml) 2020-01-16 19:44:34 +00:00
Fluffy Jenkins
1e47165303 fixed minor bug, whoops 2020-01-15 21:38:25 +00:00
Fluffy Jenkins
81f8c5bab8 fixed json support if invalid json 2020-01-15 21:20:23 +00:00
Fluffy Jenkins
bc35ef5776 Add goto json support (defaults to darlings goto), gotos (gotosudo) which bypasses the popup window and added history to the main chatbar so you can press up/down on there 2020-01-15 21:17:17 +00:00
Marcus Llewellyn
2a3b117f5d
Merge pull request #64 from ctrlaltdavid/feature/inspect 
inspect.js improvements
 2020-01-14 12:35:35 -06:00
Marcus Llewellyn
653b333060
Merge pull request #85 from kasenvr/fix/obsolete-apps 
Removed obsolete default scripts + more branding changes.
 2020-01-14 12:33:30 -06:00
Fluffy Jenkins
64149af8ce Fixed goto to go to in dialog I HOPE YOU'RE HAPPY KALILA ;w; 2020-01-13 23:54:57 +00:00
Fluffy Jenkins
ae620b78af Added /l /d /g chatbar switches and /goto 2020-01-13 23:45:38 +00:00
David Rowe
681bd3cb1e Fix inspect not working after change camera mode 2020-01-14 11:34:16 +13:00
Kasen IO
336b5e275b Removed obsolete default scripts + more branding changes. 2020-01-12 23:13:01 -05:00
David Rowe
316abaeedc Fix jitter when start moving camera in edit mode focused on entity 2020-01-12 17:37:58 +13:00
David Rowe
2abbdfbfe9 Fix unnecessary "away" enabling and disabling 2020-01-12 16:32:20 +13:00
David Rowe
4ebf4e5cfd Ignore invisible 2020-01-12 16:27:03 +13:00
David Rowe
37b7a9c5f4 Use Picks API and orbit about point in space if no intersection 2020-01-12 16:26:23 +13:00
Fluffy Jenkins
b8dbb4585f Changed css 2020-01-11 21:09:21 +00:00
Fluffy Jenkins
6b77f6023f Added use strict to the inworld JS's 2020-01-11 20:41:23 +00:00
Fluffy Jenkins
49fc4df07a Made more changes but still not all <3 2020-01-11 20:34:30 +00:00
Fluffy Jenkins
227be7062b Made most of requested changes 2020-01-11 20:17:47 +00:00
Fluffy Jenkins
71b708cedc Removed nonused assets 2020-01-11 04:29:01 +00:00
Fluffy Jenkins
cb9563ab09 Fixed chat history bug 2020-01-08 04:42:00 +00:00
Fluffy Jenkins
d27d9645bd Removed some debug 2020-01-08 01:03:09 +00:00
Fluffy Jenkins
3d8283bd8e added to DefaultScripts 2020-01-08 00:54:48 +00:00
Fluffy Jenkins
9066682d32 Prevent dragging 2020-01-08 00:37:00 +00:00
Fluffy Jenkins
27d2aaa8ce Added formatting and grid chat and mute and god knows send help please 2020-01-08 00:17:54 +00:00
David Rowe
32848ef8c6 Update description of operation 2020-01-06 11:41:05 +13:00
David Rowe
3857fa1a4d Restore "away" behavior when restart script 2020-01-06 11:35:53 +13:00
David Rowe
6749239e4e Reduce the duration of the initial look-at time 2020-01-06 11:27:39 +13:00
David Rowe
31b76a0a22 Don't go "away" when press Esc key while inspecting 2020-01-06 11:25:39 +13:00
David Rowe
a1056f34ed Cope with slight avatar position and orientation jitter when stationary 2020-01-06 11:14:12 +13:00
David Rowe
81e1dd4d6a Exit inspect mode when press Esc or move avatar 2020-01-06 11:10:10 +13:00
David Rowe
ac34d49c1b Leave camera where it is after releasing Alt key 2020-01-06 11:04:23 +13:00
David Rowe
fcc1f928a1 Lint 2020-01-06 10:58:49 +13:00
Fluffy Jenkins
d57ba9a337 Added chat WIP 2019-12-21 19:25:46 +00:00
Fluffy Jenkins
7d0343966a Made some changes to hopefully pass code review 2019-12-20 01:19:04 +00:00
Fluffy Jenkins
74de0c2f2c Creating communityModules folder with notificationCore.js 2019-12-20 01:09:31 +00:00
Brad Hefta-Gaub
bb68f92d3e
Merge pull request #16562 from ctrlaltdavid/DEV-2442 
DEV-2442: Fix main gamepad (XBox controller) controls
 2019-12-13 13:36:20 -08:00
Brad Hefta-Gaub
2d56d7c026
Merge pull request #16551 from ctrlaltdavid/DEV-1943 
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
 2019-12-13 10:53:24 -08:00
Marcus Llewellyn
c08e1a227c
Revert "Adds community script directory, adds chat as default app." 2019-12-12 11:10:01 -06:00
Marcus Llewellyn
67dca7639f Adds community script directory, adds chat as default app. 
This adds a community directory under the scripts directory. George Deacon's chat app has been placed within, and is loaded as a default script.
 2019-12-11 12:25:43 -06:00
David Rowe
6060dad638 Resurrect gamepad Y teleport button 2019-12-08 12:38:48 +13:00
Howard Stearns
11aa2e829f
Merge pull request #16540 from SimonWalton-HiFi/screenshare-zone 
DEV-2700: Add screenshare property to zones and evaluate in avatar mixer
 2019-12-02 10:17:42 -08:00
David Rowe
48680a0fe2 Remove now-unnecessary getEntityProperties() call from WebTablet.js 2019-12-01 21:46:35 +13:00
luiscuenca
f17caf48ca
Add automaticLookAt.js to the developer scripts 2019-11-26 13:42:01 -07:00
Simon Walton
6e23924ed9 Add screenshare zone-property - WIP 2019-11-25 13:22:35 -08:00
DouglasWilcox
b8d7f50eaf Put away animation into resource and update script to use local resource path. 2019-11-21 14:50:05 -08:00
luiscuenca
fbd6fd8703
Add comments and connect update signal only when is necessary 2019-11-20 16:42:33 -07:00
Shannon Romano
a5943f8ac8
Merge pull request #16443 from ctrlaltdavid/DEV-2646 
DEV-2646: Use Alt to clone entities on Mac
 2019-11-19 14:02:10 -08:00
Brad Hefta-Gaub
63b21af562
Merge pull request #16506 from ctrlaltdavid/DEV-2764 
DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart
 2019-11-19 12:05:10 -08:00
David Rowe
0b98885c7f Remove the BodyMart tip from the interstitial page 2019-11-19 10:33:30 +13:00
Sam Gateau
6370059a96
Merge pull request #16483 from AndrewMeadows/debug-workload-selection 
Add tools for debugging entity workload proxies
 2019-11-18 11:02:00 -08:00
Zach Fox
3b9a8b426f
Merge pull request #16502 from MiladNazeri/dev-2718/models-brought-in-at-incorrect-dimensions 
dev-2718/models-brought-in-at-incorrect-dimensions
 2019-11-15 15:54:08 -08:00
Zach Fox
b64ce343bd
Merge pull request #16429 from MiladNazeri/screenshareElectronApp 
Screenshare in Interface!
 2019-11-15 15:32:51 -08:00
milad
2fc0f01928 added natural dimensions after loading 2019-11-15 15:16:09 -08:00
milad
87adae6c6f cr 2019-11-15 12:48:32 -08:00
MiladNazeri
481e239a37
Update scripts/system/create/edit.js 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-11-15 12:43:25 -08:00
milad
4ae3c67493 added Entities.isLoaded 2019-11-15 11:45:05 -08:00
milad
b8b7e20c1a added clickToZoom header 2019-11-14 17:17:33 -08:00
Zach Fox
ee7c539d7e Add Click to Zoom to the repo and bootstrapper 2019-11-14 17:05:47 -08:00
David Rowe
7fbc9f5c5c emove the "acceleration" entity property from the Create app 2019-11-15 12:11:15 +13:00
David Rowe
45eda40466 Enable Alt action for cloning on Mac 2019-11-13 10:48:08 +13:00
Andrew Meadows
cf08a4162a add workload job to help debug entity proxies 2019-11-12 10:35:16 -08:00
Shannon Romano
895619c71f
Merge pull request #16461 from ctrlaltdavid/DEV-2649 
DEV-2649: Fix entities list "filter to frustum" eye button
 2019-11-08 10:28:24 -08:00
Shannon Romano
79df071c23
Merge pull request #16468 from RebeccaStankus/webEntities 
Made web entities not grabbable by default
 2019-11-08 10:27:44 -08:00
Sabrina Shanman
9180a639df
Merge pull request #16440 from ctrlaltdavid/DEV-2648 
DEV-2648: Fix Cmd-click multi-select in entity list on Mac
 2019-11-07 14:06:39 -08:00
Sabrina Shanman
deceb16a9b
Merge pull request #16451 from ctrlaltdavid/DEV-2650 
DEV-2650: Remove "user" icon from Entities List
 2019-11-07 13:59:28 -08:00
Rebecca Stankus
4173cc46e2 Made web entities not grabbable by default 2019-11-06 14:11:17 -08:00
Zach Fox
a2f784d225 DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI 2019-11-06 11:26:10 -08:00
David Rowe
eeceec35d6 Fix entities list "filter to frustum" button 2019-11-06 12:22:45 +13:00
David Rowe
5fb18566fe Use Alt to clone entities on Mac 2019-11-06 09:55:16 +13:00
David Rowe
a8173e9477 Remove "user" icon from Entity List 2019-11-05 13:55:31 +13:00
David Rowe
7db99cce6b Fix Cmd-clone entities on Mac 2019-11-02 12:07:11 +13:00
David Rowe
4e12750255 Typo 2019-11-02 11:00:16 +13:00
David Rowe
3bb65edafb Fix Cmd-click multi-select in entity list on Mac 2019-11-02 09:51:21 +13:00
Sam Gateau
52e80f15af Ending a joke 2019-11-01 12:57:45 -07:00
Sam Gateau
52ac59fad3 Ending a joke 2019-11-01 12:55:34 -07:00
Sam Gateau
a3d8cb8a78 Ending a joke 2019-11-01 12:52:22 -07:00
Zach Fox
c578eb2d9b DEV-2574: Make emote shortcuts case-insensitive 2019-10-28 11:24:42 -07:00
Zach Fox
4f7028ff0f DEV-2575: Automatically lower raised hand if talking 2019-10-25 14:05:29 -07:00
Zach Fox
a6bcbe4c66 DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial 2019-10-23 14:32:03 -07:00
Sam Gateau
32b23c70e6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-22 16:25:38 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Shannon Romano
a6842b5cba
Merge pull request #16346 from dooglifeSF/change_away_animation 
New AFK "away" animation
 2019-10-16 09:17:51 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction 
First Time User Experience Project
 2019-10-15 14:56:25 -07:00
Zach Fox
9b9110e163 Remove cachebusting code 2019-10-15 12:26:18 -07:00
Zach Fox
4770008383 DEV-2426: Update Emote Indicator icon 2019-10-15 11:39:00 -07:00
dooglifeSF
e757a6fd86 Merge branch 'master' into change_away_animation 2019-10-15 10:46:24 -07:00
dooglifeSF
589d4e992c Change away anim to hosted afk_texting animation. 2019-10-14 16:48:45 -07:00
RebeccaStankus
5831eb261f Changed calculation of overlay size 2019-10-14 16:08:01 -07:00
RebeccaStankus
4720c64af8 Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay 2019-10-14 13:02:54 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867 
DEV-1867: Fix toolbarTest.js
 2019-10-14 11:50:59 -07:00
Rebecca Stankus
4ac87ef503 Moved position of settings app 2019-10-11 16:20:37 -07:00
Rebecca Stankus
377ffe9698 Fixed calculation of overlay position 2019-10-11 16:02:55 -07:00
David Rowe
5292dddc39 Rewrite toolbarTest.js 2019-10-12 10:10:41 +13:00
Zach Fox
222b1fbd20 Fix bug with debugFTUE === 1 2019-10-11 12:26:12 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Zach Fox
3f00c524fb DEV-2379: Modify Shadow-related tooltips in Create 2019-10-10 11:47:40 -07:00
Sam Gateau
597d4b1af7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-10 09:02:44 -07:00
Zach Fox
a5caa36f07
Merge pull request #16318 from MiladNazeri/dev-2082/cannont-click-yourself-in-third-person-for-nametag 
dev-2082/cannot-click-yourself-in-third-person-for-nametag
 2019-10-09 19:34:00 -04:00
Zach Fox
609f6f9a25 Fix minimize bug; fix bug where FTUE window appears behind Interface window 2019-10-09 15:46:50 -07:00
Zach Fox
bed1192d70 A bunch of fixes, plus added a debug mode Settings switch 2019-10-09 14:18:36 -07:00
Seth Alves
1ce3cebe1f force LOD to be 20-20 on android, and force lodAngleDeg to 0.248 2019-10-09 14:04:44 -07:00
milad
77d17e0ff7 removed extra disconnect function 2019-10-09 13:26:53 -07:00
Zach Fox
601f7ac5e9 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-09 13:26:21 -07:00
milad
e2fee5361d updated startup/shutdown 2019-10-09 13:09:38 -07:00
milad
06244338d6 updated nametags to work in selfie mode 2019-10-09 12:36:44 -07:00
Sam Gateau
ff36b7a390 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-09 10:00:56 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals 
Added flag to ensure mouse event signals are not connected twice
 2019-10-08 15:58:24 -07:00
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -04:00
Zach Fox
753a61ed2c More iteration with Joshua 2019-10-08 17:31:10 -04:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Zach Fox
9feab869ad DEV-2350: Prevent duplicate default scripts from running 2019-10-08 14:48:19 -04:00
Zach Fox
42bf2bf30e All windows 'done' except for final tweaks; debug mode still ON 2019-10-08 13:17:04 -04:00
Zach Fox
b0adf1ef02 Almost done with init screen 2019-10-07 20:29:18 -04:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04:00
Sam Gateau
d714cc6da6 FIxing some stuff ? 2019-10-04 17:55:37 -07:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes 
Fix for Mat4.getForward, getRight and getUp
 2019-10-04 17:00:43 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp 
It should match the results from the same methods on the Quat class.
 2019-10-04 13:59:38 -07:00
RebeccaStankus
31dcbf532f Missed a Capital letter in a function name 2019-10-04 10:10:54 -07:00
RebeccaStankus
8089653784 CR Feedback changes 2019-10-04 09:43:47 -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
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Sam Gateau
a5c10abcac Working on improving the material inspector 2019-10-03 17:04:40 -07:00
Zach Fox
0e7dff05fb Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn 2019-10-03 12:55:02 -07:00
RebeccaStankus
1dd6aebede Handle minimized window 2019-10-03 12:16:39 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -07:00
RebeccaStankus
94e71e1bdd Still trying get QML gridLayouts to work 2019-10-02 17:14:50 -07:00
RebeccaStankus
b1fd6050c7 Merged Zach's work 2019-10-02 12:55:51 -07:00
RebeccaStankus
47841d9bcd Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-02 12:42:53 -07:00
RebeccaStankus
dc15b55aa5 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-02 12:05:34 -07:00
Zach Fox
6bfca4e587 DEV-2275: Move 'input device muted' banner and make it slightly smaller 2019-10-02 11:48:50 -07:00
Zach Fox
50b06a40d7 Improved random avatar selection logic, plus local avatars 2019-10-01 17:22:24 -07:00
RebeccaStankus
d2e62749c7 Ready for Zach to add default avatar changes 2019-10-01 16:36:06 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt 
DEV-442: Implement directional blending node for point reaction
 2019-10-01 11:46:30 -07:00
RebeccaStankus
3167dc9a35 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -07:00
RebeccaStankus
6658e6377c Adding 1 simplifiedUI constant import 2019-09-30 15:06:31 -07:00
RebeccaStankus
0f1190df8b Trying to make QML UI work second launch 2019-09-30 15:03:58 -07:00
RebeccaStankus
9a03058e88 Trying to make QML UI work 2019-09-30 12:09:22 -07:00
luiscuenca
02d889ba6e
account for point target validity 2019-09-30 11:35:00 -07:00
RebeccaStankus
b98d106a3b mend 2019-09-30 10:39:35 -07:00
RebeccaStankus
b25c874e5f More work on second launch UI 2019-09-30 10:38:11 -07:00
RebeccaStankus
44d9610048 Working on UI 2019-09-30 09:17:51 -07:00
Sam Gateau
57f8095506 Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script 2019-09-27 12:00:45 -07:00
RebeccaStankus
f4ecd3dcd8 Working on initial/second launch 2019-09-27 09:15:39 -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
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
Sam Gateau
3e3c4c2e70 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-24 18:58:29 -07:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
Sam Gateau
2a78fc7b38 Remove the auto refresh list of resource because it takes too much time, instead user has to press refresh button 2019-09-24 14:29:09 -07:00
Sam Gateau
8aaa5deb11 Clean up the sort and filter system 2019-09-24 12:37:01 -07:00
Sam Gateau
d940e70564 Adding a proper SortFilterModel 2019-09-24 00:31:16 -07:00
Sam Gateau
3e17c1007a understanding the delegateModelGroup mechanism... 2019-09-23 18:14:45 -07:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
Sam Gateau
ee5de175eb Better monitoring of the resource loading in flights 2019-09-19 16:56:55 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
Sam Gateau
a87db2636c SOme stuff workbetter 2019-09-18 18:25:42 -07:00
Zach Fox
59184edc89 DEV-521: Update Emoji window's search field to display emoji's name during hover 2019-09-18 13:37:46 -07:00
Sam Gateau
c0660329a3 Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family 2019-09-17 18:06:08 -07:00
Sam Gateau
802326d4da Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-12 17:01:37 -07:00
Sam Gateau
133a8b7d5e a bunch of changes to debug why... 2019-09-11 18:21:44 -07:00
Zach Fox
3cfb4db36e
Merge pull request #16177 from MiladNazeri/DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation 
DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
 2019-09-11 15:35:04 -07:00
milad
4c340746c5 removed references to the emoji destroy sound 2019-09-11 12:50:49 -07:00
milad
275350c2fa removed sound from the out 2019-09-11 12:38:29 -07:00
Zach Fox
e9eb07d388 BUGZ-1339: Disable the Emote Indicator animation to prevent it from being 'jittery' 2019-09-11 10:20:59 -07:00
milad
d32438586a added flag for flying 2019-09-10 16:06:50 -07:00
milad
bb0b51116a cr1 2019-09-06 11:29:29 -07:00
milad
b352d53083 removed space made on accident 2019-09-06 11:00:14 -07:00
milad
1d8bbc3529 removed startup time var 2019-09-06 10:55:35 -07:00
milad
1576a29916 toggled flag for discconecting from wearable signal 2019-09-06 10:53:17 -07:00
milad
120c678557 added a wearable check for avimojis on startup 2019-09-06 10:51:12 -07:00
milad
531dceae4d changed status indicator to be similar to nametag and emoji 2019-09-05 10:29:25 -07:00
milad
57a309db53 small formatting changes 2019-09-04 20:58:20 -07:00
milad
408656f6ec added line break 2019-09-04 17:06:00 -07:00
milad
c73ea11b37 lowecase object 2019-09-04 17:00:30 -07:00
milad
3f2d2996a0 removed comment region sections 2019-09-04 16:59:14 -07:00
milad
252e8a2ed6 removed commented out code 2019-09-04 16:49:46 -07:00
milad
79b7271729 removed startup/unload apis from the 3 main modules 2019-09-04 16:48:24 -07:00
milad
d316f014eb fixed double scriptEnding being called 2019-09-04 15:51:07 -07:00
Zach Fox
df3f7fcb72
Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix 
Dev-486 : emote indicator should still be showing
 2019-09-04 13:11:24 -07:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -07:00
milad
6c9c22a5fb removed old code 2019-09-03 18:14:15 -07:00
milad
669fef763a removed logs 2019-09-03 18:11:56 -07:00
milad
44e518f5a1 working fix 2019-09-03 18:06:25 -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
cda2943b9a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-03 12:01:12 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365 
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
 2019-08-30 13:10:09 -07:00
Zach Fox
c561bca79c BUGZ-1386: Update simplifiedStatusIndicator to use domainID as org name instead of location.hostname 2019-08-30 11:37:52 -07:00
Brad Davis
6aa967f29f fixing test code 2019-08-29 14:11:22 -07:00
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -07:00
Zach Fox
4098dd9999 BUGZ-1342: Add lock icon to Emote tray when it's locked open; Make tray close when unlocking it 2019-08-27 12:59:57 -07:00
RebeccaStankus
abd4f24770 Added unload check that timeout is not running 2019-08-26 15:15:25 -07:00
RebeccaStankus
96dbd4620d pull clear timeout into a separate function 2019-08-26 15:08:18 -07:00
RebeccaStankus
f66b696721 Clear timeout on selecting a different emote 2019-08-26 14:39:38 -07:00
RebeccaStankus
c3dfc4e8d8 Restore emote indicator after reaction emote 2019-08-26 14:23:27 -07:00
Zach Fox
701dd679c7 Change the icons' 2019-08-23 15:18:45 -07:00
Zach Fox
27574dd3f3 Prepare for new emote indicator icon 2019-08-23 14:48:49 -07:00
Zach Fox
98626b564c Couple more changes 2019-08-23 14:40:39 -07:00
Zach Fox
dfcf70b9b5 Tons of Emote/Emoji changes 2019-08-23 14:14:53 -07:00
Zach Fox
44ac3f3a7a Don't use entity creation library (reduce risk); use remote URL for broadcast image entity URLs 2019-08-22 13:58:35 -07:00
Zach Fox
a086d6fe6d Fix triggered reactions not showing their icon in the emote indicator 2019-08-22 11:54:28 -07:00
Zach Fox
177590614e Fix emote bar always visible on MacOS; small logic cleanup 2019-08-22 11:44:09 -07:00
Zach Fox
63d27fb002 Much smaller emoji wrt filesize; Fix emoji toolbar not sticking to window on MacOS 2019-08-22 11:00:15 -07:00
Zach Fox
3766ca8660 Add help/attributions popup to emoji popup window 2019-08-21 11:05:55 -07:00
Sam Gateau
e1e4d9ac6c Exposing the AA mode of the AA job 2019-08-20 18:15:35 -07:00
Zach Fox
5869ed3f20 Remove Emote App bar when in HMD mode and re-enable conditionally; don't allow keyboard shortcuts to work in HMD 2019-08-20 15:21:12 -07:00
Zach Fox
7f45a7b45c Show a not found message when the user searches for nonexistent emoji 2019-08-20 15:11:17 -07:00
Zach Fox
1cb4a31e09 Reticle update rate limiter; end reactions on shutdown 2019-08-20 15:02:36 -07:00
Zach Fox
cc9c9ec443 Fixup signal handling causing app errors; add keyboard navigation to emoji window 2019-08-20 14:52:19 -07:00
Zach Fox
8b79dc3020 Fix clapping silence issue 2019-08-20 14:22:13 -07:00
RebeccaStankus
0be3f133de Removed some Milad notes 2019-08-20 14:17:00 -07:00
RebeccaStankus
a78284871e more CR feedback changes 2019-08-20 13:59:41 -07:00
RebeccaStankus
cc22386f06 CR feedback changes 2019-08-20 13:29:02 -07:00
Sam Gateau
6cd37ef73c Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-20 09:41:08 -07:00
Sam Gateau
c5bd9ecf4f REfreshing the antialiasing qml na dconfig of the Jitter Job 2019-08-19 18:14:29 -07:00
RebeccaStankus
022d1aee8e Added check to remove persisting reticle entities on script startup 2019-08-19 15:36:21 -07:00
Zach Fox
b40d5658e3 Moved a timer from JS to QML; progress circle on Emote Indicator 2019-08-19 15:12:48 -07:00
Zach Fox
fd287654f4 Fixup keyboard shortcuts; Modify tooltips 2019-08-19 14:19:25 -07:00
Zach Fox
14a04dfb1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 13:52:35 -07:00
RebeccaStankus
e690d4f7ef Limited distance to rez a point reticle 2019-08-19 13:40:50 -07:00
RebeccaStankus
4787785660 first version of pointing reticle 2019-08-19 13:19:01 -07:00
Zach Fox
05abff1c0b
Merge pull request #16071 from zfox23/helpApp1 
Help App: Phase 1
 2019-08-19 11:16:44 -07:00
RebeccaStankus
44d0e0ba1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 09:16:19 -07:00
Sam Gateau
aeb407698d bloom ui 2019-08-18 22:15:20 -07:00
Sam Gateau
3ace52629c Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-16 17:35:15 -07:00
Sam Gateau
a934b79321 Updating the bloom debug ui 2019-08-16 17:34:16 -07:00
RebeccaStankus
0699433df8 Emoji app updates emoteIndicator 2019-08-16 16:34:08 -07:00
Zach Fox
30d552919a Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-16 14:06:58 -07:00
Zach Fox
a274e5c2b1 Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner 2019-08-16 12:31:50 -07:00
Zach Fox
301dca6937 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 12:14:52 -07:00
Zach Fox
c13697803d Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-16 12:14:44 -07:00
RebeccaStankus
18a9f3fbfb Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 12:09:17 -07:00
Zach Fox
4ac0c5902d 52px emojis and custom emoji 2019-08-16 12:08:30 -07:00
RebeccaStankus
2357934d49 Working tooltips 2019-08-16 12:08:26 -07:00
Zach Fox
b06b0b51df Mipmap the emoteIndicator Image 2019-08-16 10:07:22 -07:00
Zach Fox
92c5ca2d75 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 09:58:44 -07:00
RebeccaStankus
73941f1ece Fixed bug with emote indicator icon not restoring 2019-08-16 09:46:46 -07:00
RebeccaStankus
c64da85344 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-16 09:11:03 -07:00
RebeccaStankus
a06cb85f9e Indicator image swapping 2019-08-15 17:20:27 -07:00
Zach Fox
6176214d45 Remove extra log 2019-08-15 17:00:59 -07:00
Zach Fox
a053f9ed9e Impelement settingChanged; clean up some emoteIndicatorVisible code 2019-08-15 17:00:27 -07:00
RebeccaStankus
876ae771d4 Tray buttons swap color on hover 2019-08-15 16:44:50 -07:00
Zach Fox
98eff6ebb6 Mipmap the emoji bar images 2019-08-15 16:32:59 -07:00
RebeccaStankus
64dcb48925 Removed extra file, moved qml images 2019-08-15 16:31:37 -07:00
RebeccaStankus
f93d754f15 Button label characters are now images 2019-08-15 16:25:25 -07:00
RebeccaStankus
2fc603b85e Replacing button label characters with images 2019-08-15 15:35:41 -07:00
Zach Fox
d29cdffe8c Toggle reaction bugfix 2019-08-15 14:42:27 -07:00
Zach Fox
2149f1acc7 Reaction logic now nice and stable! 2019-08-15 14:40:33 -07:00
RebeccaStankus
af97384948 Adding icon swaps to emoteIndicator 2019-08-15 14:21:03 -07:00
Zach Fox
0497c10d69 Ensure mask covers non-circular emoji 2019-08-15 13:20:09 -07:00
Clement
5be1cfcb36 Fix linux specific script engine crash 2019-08-15 13:07:43 -07:00
Zach Fox
9ae5eba12a Remove reliance on QML timer - still need to fix non-circular emoji mask 2019-08-15 13:04:50 -07:00
Zach Fox
dcae607cfb Applause sound and fixup handler 2019-08-15 12:46:30 -07:00
Zach Fox
38743f924f Autofocus Emoji search text field 2019-08-15 12:23:29 -07:00
Zach Fox
0338b0258c Add Search to Emoji window and clean up some code 2019-08-15 12:21:29 -07:00
RebeccaStankus
078ff223a4 Emote animations start and stop correctly 2019-08-15 12:01:25 -07:00
Zach Fox
143c3e966c Big optimizations to Emoji window 2019-08-15 10:58:13 -07:00
Zach Fox
2c604d2c5b Simpler code! 2019-08-15 09:58:45 -07:00
Zach Fox
bfb4c0c49a Fixup emote indicator 2019-08-15 09:21:42 -07:00
RebeccaStankus
46a8e804b3 Working on tray functionality 2019-08-15 09:11:52 -07:00
RebeccaStankus
bc67241100 Finished changes for CR feedback 2019-08-14 14:09:48 -07:00
RebeccaStankus
0645796e74 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-14 13:28:08 -07:00
RebeccaStankus
8728640f60 Initial CR changes 2019-08-14 12:03:49 -07:00
Sam Gateau
f4c33d8392 Refining the look of the enable button of the TaskPropView 2019-08-14 11:33:30 -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
Zach Fox
52c4d4fe69 better FAQ 2019-08-14 09:31:08 -07:00
Zach Fox
7297ac9a09 Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-14 09:11:04 -07:00
Sam Gateau
5c085bd08d CLean the code of the task::COnfig changes 2019-08-13 18:58:35 -07:00
Sam Gateau
4a93b23d83 Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly 2019-08-13 18:47:57 -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
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation 
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
 2019-08-09 17:28:46 -07:00
Sam Gateau
fe08609b0c Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-09 11:25:03 -07:00
Zach Fox
e8b93998da Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-09 09:33:13 -07:00
Shannon Romano
5e5c5a27ab
Merge pull request #16041 from Atlante45/fix/oom 
BUGZ-830: Fix memory leak in the ESS
 2019-08-09 09:03:56 -07:00
Sam Gateau
67a13ee7cd Exploring differences in the polyline rendering 2019-08-08 17:10:46 -07:00
Clement
29d017bb65 CR 2019-08-08 13:49:15 -07:00
sabrina-shanman
71bc1a4258 Make simplifiedUI default to 20:20 vision 2019-08-08 13:03:39 -07:00
Zach Fox
72e14a32f9 Implement the Help App skeleton; Implement Help App Controls; Implement Help App About 2019-08-07 17:13:20 -04:00
Clement
ec9d13700d Break JS circular ref to help garbage collect 2019-08-07 13:19:53 -07:00
milad
b8c5192d7a add images 2019-08-06 19:59:10 -07:00
milad
c2fddbf03a cut down files 2019-08-06 19:55:48 -07:00
Ryan Huffman
609b533cf2 Fix create duplication key conflicting with camera orbit 2019-08-06 17:23:13 -07:00
milad
82f6c29923 updated emoji size info 2019-08-06 13:23:10 -07:00
milad
f1ff9207f9 removing empty js file 2019-08-06 13:20:15 -07:00
milad
c20933b813 removed saved emoji called and also add more info to description 2019-08-06 13:16:58 -07:00
milad
1a95c126c3 working version but taking a snapshot of added emoji code before removing for handoff 2019-08-06 13:13:38 -07:00
Sam Gateau
eb616452ec An afternounwatchign code 2019-08-05 17:54:46 -07:00
milad
d1efbc051a working UI 2019-08-04 15:11:55 -07:00
Sam
d84bebcc28 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-02 09:36:58 -07:00
Shannon Romano
2f6d79fb45
Merge pull request #15920 from annabrewer/combine-tone-map-resample 
BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines
 2019-08-01 17:39:38 -07:00
Sam
7948fb266e Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-07-31 11:46:09 -07:00
Sam
6e2ffe14a0 better ui 2019-07-31 11:44:42 -07:00
Shannon Romano
75146a104d
Merge pull request #15982 from sabrina-shanman/bug_lod_too-low 
(BUGZ-1040) Fix LOD randomly being too low in simplified UI
 2019-07-29 09:45:19 -07:00
Sam
767f413a2c merging the various job/task/switch congif into one 2019-07-29 00:07:16 -07:00
sabrina-shanman
601b579c42 Set the LOD angle in simplifiedUI to current effective default, to be adjusted later 2019-07-25 17:32:56 -07:00
sabrina-shanman
4b5a45209e Prefer using LODManager.lodAngleDeg for setting manual LOD 2019-07-25 17:15:22 -07:00
milad
f87e306ad4 adding extra padding to the initial textbox calculation 2019-07-25 16:35:30 -07:00
sabrina-shanman
3a4ce44633 On second thought, do not expose default octree size scale 2019-07-24 17:32:25 -07:00
sabrina-shanman
9d93a2f502 Fix simplifiedUI stuck on wrong LOD value 2019-07-24 16:27:24 -07:00
Anna
1df43fc83a Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample 2019-07-23 15:41:01 -07:00
Shannon Romano
b799abdac1
Merge pull request #15967 from sabrina-shanman/picks_too-many_grab-enabled 
(BUGZ-955) Disable unnecessary picking (conservative subset)
 2019-07-23 14:57:19 -07:00
sabrina-shanman
d48c8d897c Clarify that a Grabber member function toggles both picks and pointers 2019-07-23 12:58:07 -07:00
sabrina-shanman
abac1787a6 Fix using invalid pick API functions on HMD ray pointer 2019-07-23 12:58:07 -07:00
sabrina-shanman
79d09f68fd Disable grab.js picks when in HMD 2019-07-23 12:58:07 -07:00
Ryan Huffman
8b2c935f92
Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate 
Make Create app use Ctrl key to duplicate entities instead of Alt
 2019-07-23 08:52:22 -07:00
Simon Walton
8fb28bf4e8 Whitespace changes per code review 2019-07-22 10:36:57 -07:00
Simon Walton
63c3452cf2 Restore avatar theft functionality; banner-click to appropriate menu 2019-07-19 16:35:07 -07:00
MiladNazeri
25fc4fbb8f
Merge pull request #15937 from MiladNazeri/sessionDisplayNameChange 
[BUGZ-537] :: removed session display name from nametag
 2019-07-16 18:06:05 -07:00
sabrina-shanman
fcaa64b9ef Fix teleport collision picks always enabled if user never enters HMD 2019-07-16 17:46:59 -07:00
sabrina-shanman
e043d181cd Disable picks in controllerDispatcher when not in HMD 2019-07-16 17:46:54 -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
Shannon Romano
53a67dcfa9
Merge pull request #15872 from SamGondelman/bias 
DEV-202: Expose shadow bias and max distance to Zone Entity
 2019-07-16 15:22:37 -07:00
milad
77ec048947 added change to the statusIndicator for the same thing 2019-07-16 12:23:32 -07:00
milad
53ec19dd57 removed session display name from nametag 2019-07-16 10:27:56 -07:00
PrestonB1123
526b210fcd remembered that macs exist 2019-07-12 12:39:58 -07:00
PrestonB1123
aaf10cec39 added conditionals to shortcuts to remove overlap 2019-07-12 12:37:40 -07:00
David Rowe
f2d591dbe9 Take no action if Alt is pressed at mouse-down 2019-07-12 21:28:44 +12:00
David Rowe
db1137fa0f Use Ctrl to duplicate entities instead of Alt 2019-07-12 21:27:33 +12:00
PrestonB1123
07c71cbadb disabled P shortcut and re-enabled in metaverse 2019-07-11 12:05:15 -07:00
SamGondelman
6ce809fb2a merge with master 2019-07-11 09:01:30 -07:00
Zach Fox
712d608c15 Better logic in bootstrapper to not load alread running scripts 2019-07-10 13:23:50 -07:00
Zach Fox
85b563461a DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts 2019-07-10 12:06:08 -07:00
Zach Fox
4dfbc489e8 Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype 2019-07-09 15:40:16 -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
RebeccaStankus
714a3f6b08 Fixed path to tabletAssetServer in HMD, simplifiedUI system folder 2019-07-09 13:02:54 -07:00
Zach Fox
d622e53458 Some comments; changed the code to be backwards compatible 2019-07-08 17:10:11 -07:00
Zach Fox
5048b8bd89 Implement DEV-218 & DEV-219 and commit a starting point for the Emote app 2019-07-08 16:46:58 -07:00
Shannon Romano
cc57e92a81
Merge pull request #15890 from zfox23/SUI/noAutoLOD 
BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users
 2019-07-08 07:57:55 -07:00
Sam Gateau
f2cda426d8
Merge pull request #15884 from samcake/nut 
BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier
 2019-07-06 02:18:11 +02:00
RebeccaStankus
352f9590b1 Fixed Qt.resolvedUrl format 2019-07-05 16:23:29 -07:00
Zach Fox
eb79752455 BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users 2019-07-05 12:00:17 -07:00
Samuel Gateau
28fddc2fb3 full stack for windows 2019-07-04 18:13:08 +02:00
Samuel Gateau
12cc69e41c Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-07-04 01:56:06 -07:00
SamGondelman
72f52b069e cleanup, fix shadow qml 2019-07-03 16:21:47 -07:00
Sam Gondelman
0d9f639331
Merge branch 'master' into bias 2019-07-03 10:20:16 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit 
BUGZ-661: Add unlit property to text entities
 2019-07-03 18:43:26 +02:00
Samuel Gateau
3be8b80eff Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-07-03 01:01:26 -07:00
Zach Fox
ba7ed32135
Merge pull request #15874 from MiladNazeri/nameTagInBodyFix 
[Bugz-893] :: Name tag in body fix
 2019-07-02 16:56:46 -07:00
milad
c7f5a5064d removed bad log 2019-07-02 16:41:24 -07:00
milad
83546de9da removed distance check for redraw to prevent nametag in user's body 2019-07-02 16:40:23 -07:00
SamGondelman
692c776be5 expose shadow bias and max distance wip 2019-07-02 15:18:28 -07:00
RebeccaStankus
d840723fe3 Fixed space before function params 2019-07-02 15:08:34 -07:00
RebeccaStankus
0670147bf8 Fixed paths to included files and collision with 'clamp' 2019-07-02 14:24:02 -07:00
milad
ccc4b0d9e1 added unlit property 2019-07-02 10:33:19 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
Sam Gateau
2c412808e7 More information from the platform on mac 2019-07-02 14:48:25 +02:00
Shannon Romano
89f654175c
Merge pull request #15856 from PrestonB1123/defaultShortcuts 
DEV-173: Re-enable shortcuts
 2019-06-28 15:29:53 -07:00
Preston Bezos
1315677aec fixed doc and removed log spam 2019-06-28 15:02:33 -07:00
Preston Bezos
b9deb7bb58 formatting 2019-06-28 14:42:48 -07:00
Preston Bezos
09830dd40c removed white space 2019-06-28 14:41:07 -07:00
Preston Bezos
d1470d3323 readded ctrl+n and ctrl+b as shortcuts with a default script 2019-06-28 14:33:03 -07:00
raveenajain
17d127ecf3 modify shadow debugger for new bias input 2019-06-28 10:07:49 -07:00
Shannon Romano
b96db7517c
Merge pull request #15836 from RebeccaStankus/create 
BUGZ-659 Fix create menu paths
 2019-06-26 11:52:02 -07:00
MiladNazeri
7d6cff46ff
Merge pull request #15842 from MiladNazeri/refreshNametagLifetime 
[BUGZ 798] :: updated lifetime
 2019-06-25 19:32:33 -04:00
RebeccaStankus
d8daee49a8 Fixed bad path to gridControls 2019-06-25 16:31:21 -07:00
milad
72867437be updated lifetime 2019-06-25 15:38:02 -07:00
RebeccaStankus
e9777dc40f Merge branch 'master' of github.com:highfidelity/hifi into create 2019-06-25 09:28:43 -07:00
Sam Gateau
8d0b7a81f5 one more 2019-06-24 17:01:11 -07:00
Sam Gateau
b0ebcc745d Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-24 15:36:28 -07:00
RebeccaStankus
6aca2fcf07 Working on new file structure 2019-06-24 14:01:51 -07:00
Zach Fox
cccc241553 Actually fix the bug 2019-06-21 16:19:09 -07:00
Sam Gateau
aa160c4d0f Improving presentation of stats & debug information 2019-06-21 16:17:28 -07:00
Zach Fox
8044b33d65 This also works 2019-06-21 13:44:31 -07:00
Zach Fox
5067fd4cd2 OK this is definitely working 2019-06-21 13:41:11 -07:00
Zach Fox
21454f6256 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-21 09:44:54 -07:00
Sam Gateau
69bb9ac0b6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-20 22:23:15 -07:00
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
Shannon Romano
334e7414a7
Merge pull request #15811 from RebeccaStankus/migrateEditFiles 
Emergency fix to restore create in non-launcher builds
 2019-06-20 17:19:39 -07:00
Zach Fox
3334e06cf4 This fixes it! 2019-06-20 16:52:46 -07:00
Anthony J. Thibault
3a6d8dc383 Disable handTouch.js to prevent finger twitching 
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.

Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.

Also, three new items were added to the Developer > Show Animation Stats panel.

* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.

https://highfidelity.atlassian.net/browse/BUGZ-154
 2019-06-20 15:52:36 -07:00
Zach Fox
d546550c3f test this 2019-06-20 15:49:40 -07:00
RebeccaStankus
e7cec0f11f Fixed dialogs imports 2019-06-20 15:07:39 -07:00
Zach Fox
d49205be74 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-20 09:45:49 -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
b2631e89e9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 17:11:20 -07:00
Shannon Romano
3d72370d1a
Merge pull request #15792 from MiladNazeri/nametagFixes 
Bugz-504: more stable nametag updates
 2019-06-19 14:07:19 -07:00
Zach Fox
8fdfdbaae4 Another attempt, still not working 2019-06-19 13:31:21 -07:00
RebeccaStankus
f5fa44dc21 Revert "Changed icons path to be relative" 
This reverts commit e277070423.
 2019-06-19 12:06:34 -07:00
RebeccaStankus
e277070423 Changed icons path to be relative 2019-06-19 11:17:52 -07:00
RebeccaStankus
30dd667b17 Changed qml import method 2019-06-19 10:40:32 -07:00
Milad Nazeri
61e4155eda cr-r1 2019-06-19 07:30:28 -07:00
Zach Fox
7a4aa1e98c BUGZ-657; BUGZ-713: Add a copy of the system library JS files because lots of system scripts depend on them being in the default scripts location 2019-06-18 17:13:38 -07:00
Milad Nazeri
422c70f300 fixed cache and extra line 2019-06-18 14:35:00 -07:00
Milad Nazeri
6196c6b746 more stable nametag updates 2019-06-18 14:32:11 -07:00
RebeccaStankus
3b53e34c95 fixing paths 2019-06-18 11:35:00 -07:00
Sam Gateau
f30eb919c7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 11:24:04 -07:00
RebeccaStankus
cd508a5475 Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles 2019-06-18 09:10:41 -07:00
RebeccaStankus
5a49ac9a22 moved files 2019-06-17 16:45:54 -07:00
Preston Bezos
1801dc9d90 gave previous status a default value 2019-06-17 15:18:16 -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
RebeccaStankus
772bad58ca Increased bottom margin on muted overlay 2019-06-13 15:55:49 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut 
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
 2019-06-13 14:32:36 -07:00
Zach Fox
1a0002db0c BUGZ-676: Remove references to interstitial from SUI version of progress.js 2019-06-13 13:06:40 -07:00
Sam Gateau
b132a42e89 fixing the scroll view 2019-06-12 22:42:05 -07:00
Preston Bezos
e32d6e96ce code was backwards 2019-06-12 16:12:24 -07:00
Preston Bezos
2eeec3518d one last fix 2019-06-12 16:03:03 -07:00
Preston Bezos
3cd3f1a508 one last fix 2019-06-12 15:56:27 -07:00
Preston Bezos
8dcf6e6a03 removed a dead line of code, made a couple formating changes 2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b hopefully good now 2019-06-12 15:36:20 -07:00
Preston Bezos
8fa80f8935 fixed some formatting problems 2019-06-12 14:57:37 -07:00
Preston Bezos
038747e645 Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering 2019-06-12 14:55:37 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
5077ae1bd7
Merge pull request #15745 from PrestonB1123/hudRemnant 
BUGZ-355: Persistent UI Element
 2019-06-12 10:40:37 -07:00
Preston Bezos
6c0bbfae76 hopefully good now 2019-06-12 10:02:33 -07:00
Preston Bezos
266c08227f turned an else into an else if 2019-06-12 09:29:43 -07:00
Preston Bezos
a79a75702a reverted a couple of testing changes and added a variable 2019-06-12 09:17:18 -07:00
Preston Bezos
b32a715496 fixed persistant ui element when switching from HMD to Desktop. not a complete fix but sufficient for M1 2019-06-11 16:29:32 -07:00
Brad Hefta-Gaub
0a9552226d
Merge pull request #15713 from sethalves/fix-create-baked-indicator 
case BUGZ-599: CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list
 2019-06-10 14:37:29 -07:00
Shannon Romano
1748d0527f
Merge pull request #15698 from samcake/nut 
BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target
 2019-06-10 13:10:56 -07:00
amer cerkic
edc1018b2a simplified the check 2019-06-10 11:12:29 -07:00
amer cerkic
4cad49f561 adding undefined check on the toolbar object 2019-06-10 10:42:31 -07:00
Seth Alves
22d602a334 CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list 2019-06-07 16:36:29 -07:00
Sam Gateau
d406e52d71 Messing around 2019-06-06 16:37:49 -07:00
Sam Gateau
55ff39edaf Fixing an unecessary logging that was added during debug 2019-06-06 12:29:22 -07:00
Sam Gateau
34bae25d0e fixing the broken binding dependency for the propitems 2019-06-05 00:33:44 -07:00
Zach Fox
9150cd288f Add some logging instead of a scary popup 2019-06-04 13:36:00 -07:00
Zach Fox
19b2d35b87 Resolve DEV-99: Remove all menus from top bar 2019-06-04 13:25:03 -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
Zach Fox
25725bb91e Change 'your avatars' to 'your profile' 2019-05-31 11:46:13 -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
73d1c1888c Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-05-29 15:57:14 -07:00
Dante Ruiz
022aae60cc
Merge pull request #15642 from huffman/feat/ignore-pick-intersection-in-create 
BUGZ-403: Add ignorePickIntersection to Create
 2019-05-29 10:53:44 -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
Ryan Huffman
1894951f54 Add ignorePickIntersection to Create 2019-05-28 16:15:00 -07:00
Sam Gateau
a168109588 trying to clean up the asm for linux and macos 2019-05-28 12:27:26 -07:00
Sam Gateau
42d1b340cd Trying to unify the getCPUID function in CPUIdent 2019-05-28 00:00:45 -07:00
Sam Gateau
546639fdfe Adding a script and ui to check the values returned by the PlatformInfo ui 2019-05-26 12:30:50 -07:00
milad
03600f23ba removed terenary expression 2019-05-24 14:12:36 -07:00
milad
81dd097940 added an extra line 2019-05-24 14:00:32 -07:00
milad
46475c23c1 removed log 2019-05-24 13:59:01 -07:00
milad
27c4841887 Updated Nametag to use the sessionDisplayName or the displayName as default 2019-05-24 13:57:18 -07:00
milad
83171a7cde Merge branch 'master' of github.com:highfidelity/hifi 2019-05-24 13:55:54 -07:00
Zach Fox
f69e4cd47d Move default scripts again and make them actually work 2019-05-24 10:05:54 -07:00
milad
fb9ad762a2 merge conflict fix 2019-05-23 22:33:11 -07:00
Zach Fox
dc370d676a Fix BUGZ-203 2019-05-23 13:07:47 -07:00
Zach Fox
053576e29f Move SimplifiedUI folder and create new defaultScripts.js 2019-05-23 11:31:42 -07:00
Zach Fox
46ee148a69 Fix a bug and remove magic numbers 2019-05-22 15:24:33 -07:00
Zach Fox
7a88c8362b naming CR feedback 2019-05-22 15:01:22 -07:00
Zach Fox
3a4bf2e8f7 Fix the janky audio output settings UI 2019-05-22 14:27:06 -07:00
Zach Fox
6f7557b00d Implement BUGZ-305 and BUGZ-306 2019-05-22 09:56:28 -07:00
Zach Fox
5749392e83 New bg color; Final status indicator design; Fixed HMD icon 2019-05-21 14:10:27 -07:00
Zach Fox
15bdb66943 Integrate Status into top bar; improve Audio settings; improve spacing between settings 2019-05-17 17:25:48 -07:00
Brad Hefta-Gaub
4e86948c25
Merge pull request #15580 from MiladNazeri/simplifiedUINametag 
changed size of always on overlays to be smaller
 2019-05-17 14:42:29 -07:00
Zach Fox
e40e34856b Remove some extra menus from top bar; Only show VR button if headset connected 2019-05-17 13:28:59 -07:00
milad
0d80761cf0 added larger distance for on 2019-05-17 13:23:03 -07:00
milad
06056b9531 updated location in main UI 2019-05-17 13:00:26 -07:00
milad
935d152617 forgot to copy a folder in to the local repo 2019-05-17 12:42:10 -07:00
milad
df098cab2f changed size of always on overlays to be smaller 2019-05-17 12:36:03 -07:00
Zach Fox
90a5b25600 A bunch of changes here 2019-05-16 14:18:04 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI 
Simplified UI v1
 2019-05-14 17:45:30 -07:00
Brad Hefta-Gaub
7440ef3cf3
Merge pull request #15506 from SaracenOne/unify_primitives 
Case 19510: Unify cube and sphere edit menu entries into one.
 2019-05-14 15:31:06 -07:00
Zach Fox
f9b51df296 Reduce size of output muted overlay; restore scroll to 0 on settings tab switch 2019-05-14 15:05:26 -07:00
Zach Fox
c57ddf969a Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI 2019-05-14 09:32:07 -07:00
Zach Fox
89006cd9c5 Hide controls in top left; don't remove certain menus; fixup slider UIT 2019-05-13 17:26:19 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00
Shannon Romano
b1060bcb83
Merge pull request #15508 from dback2/materialTargetTooltip 
Case 22467: Fix material target tooltip
 2019-05-13 13:08:28 -07:00
milad
51cbadcad1 Removed Selection related logic 2019-05-10 14:41:55 -07:00
Zach Fox
112e13383b Dock it! 2019-05-10 12:03:29 -07:00
Zach Fox
314c04ab96 Simplified UI v1 2019-05-10 10:49:25 -07:00
SamGondelman
2bb522eea6 entity icons ignorePickIntersection when not visible 2019-05-09 14:16:59 -07:00
Saracen
b730c457ca Replace tabs with spaces 2019-05-09 18:08:36 +01:00
Saracen
fd3c69a905 Replace tabs with spaces. 2019-05-09 02:14:00 +01:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification 
Avatar verification
 2019-05-06 08:04:06 -07:00
unknown
0da318f2cd fix material target tooltip 2019-05-03 10:37:35 -07:00
Saracen
43ddf7ca23 Unify cube and sphere edit menu entries into one. 2019-05-02 22:40:11 +01:00
Angus Antley
c0da46453b made correction 2019-04-30 14:34:10 -07:00
Angus Antley
5c6ea082db changed away script to make you active if you turn on your mic 2019-04-30 14:06:18 -07:00
Simon Walton
ae68478aea Remove avatarTheftPrototype.js 2019-04-27 23:42:28 -07:00
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
Sam Gondelman
1540c5d203
Merge pull request #15401 from SamGondelman/grid 
Case 22229: Create Grid ignorePickIntersection
 2019-04-24 12:24:27 -07:00
Shannon Romano
42fb23ed5d
Merge pull request #15435 from samcake/blackProp 
Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci
 2019-04-24 09:22:11 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -07:00
Sam Gateau
6539482cc2 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-22 08:46:34 -07:00
Sam Gateau
ba02aa7098 making luci2 better 2019-04-19 16:56:55 -07:00
Sam Gateau
af3d981ad1 Bringing the Luci interface into the new Prop framework and moving some tools there too 2019-04-18 17:44:08 -07:00
Thijs Wenker
386d392144 The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = > 2019-04-18 19:05:40 +02:00
Sam Gateau
3d78592bb8 Adding more style widgets andbringing luci1 into the panels of luci2 2019-04-18 00:19:19 -07:00
Sam Gateau
9873c10353 Better canvas ICon qml and activation of the jobs 2019-04-17 17:58:48 -07:00
Thijs Wenker
dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2019-04-18 00:21:11 +02:00
SamGondelman
54d7bde91a grid ignorePickIntersection 2019-04-17 10:56:55 -07:00
Sam Gateau
92c1fd69c1 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-17 10:09:20 -07:00
Sam Gateau
4ce7d75720 FInding a path 2019-04-16 23:38:40 -07:00
Sam Gateau
f6001c178d Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-16 18:43:30 -07:00
Sam Gateau
f2b747a68d Adding indentation of the folder in the header and refining background color 2019-04-16 18:15:00 -07:00
unknown
2839879657 Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix 2019-04-16 15:26:47 -07:00
Shannon Romano
ec22f7847e
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster 
Case 22130: PR 15366 changes from v82 to Master
 2019-04-16 15:17:08 -07:00
Sam Gateau
1fd88e8269 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-15 14:05:33 -07:00
Thijs Wenker
ef7c34eadd addressed more CR feedback 2019-04-15 19:04:24 +02:00
Sam Gateau
e7e9715e10 merging up 2019-04-15 09:16:59 -07:00
unknown
d342d93ec9 fix material targets when re-opening properties to same entity 2019-04-12 14:49:59 -07:00
Thijs Wenker
00a024fde2 fixing materialTargets, after the rebase 2019-04-12 20:06:32 +02:00