Commit graph

3308 commits

Author SHA1 Message Date
Vegaslon
6db15510db Change name of variable and fix indention 2020-02-10 16:20:22 -05:00
Vegaslon
e74fccb49d Allow users to set avatar thumbnails that show in avatar app. 2020-02-01 08:54:06 -05:00
Kasen IO
428a5b65ff Lint 2020-01-27 13:13:36 -05:00
kasenvr
fc73f76ab7
Update interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
Co-Authored-By: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
2020-01-25 19:02:01 -05:00
Kasen IO
aa0c225809 Merge branch 'kasen/core' into fix/whitelist-qml-adds 2020-01-24 19:55:23 -05:00
David Rowe
7ed117dfcb Replace links to docs.highfidelity.com 2020-01-24 10:18:55 +13:00
Kasen IO
1979a4bd94 Further housekeeping. :) 2020-01-23 03:15:18 -05:00
Kasen IO
c121a8ef2a Housekeeping. 2020-01-23 03:06:58 -05:00
David Rowe
cfde36c9f5 Fix up scrollbars and separators 2020-01-23 11:25:48 +13:00
Kasen IO
7a985b445e removed extra debug, added debug for user awareness. 2020-01-22 14:53:55 -05:00
Kasen IO
98473abbb4 QML works, C++ works but does a manual set to true, does not see updates from QML set setting. 2020-01-22 11:29:37 -05:00
David Rowe
6c81f597af Display vertical scrollbar in Settings dialogs that scroll 2020-01-22 20:55:50 +13:00
Kasen IO
bd066adbf6 Whitelist toggle not working c++ side. 2020-01-20 16:03:48 -05:00
David Rowe
eae3336f57 Fix up docs links 2020-01-20 15:06:32 +13:00
96dc01fcc6 Made requested changes to About dialog.
Removed dash from "open source"
Fixed missing and unecessary periods.
2020-01-12 12:47:17 -06:00
00855cba3d Redo the About menu dialog
Change project name, remove references to EOS blockchain, add Project Athena copyright, add attribution to Opus.
2020-01-10 16:09:20 -06:00
kasenvr
19bca588ca
Merge pull request #58 from ctrlaltdavid/fix/avatar-packager-update
Update Avatar Packager
2020-01-07 22:43:34 -05:00
kasenvr
be08a949c2
Merge pull request #67 from FluffyJenkins/feature/fixedClaraRubbish
Fixed clara rubbish
2020-01-07 21:44:23 -05:00
Fluffy Jenkins
e488a66840 changed quote types 2020-01-07 20:59:00 +00:00
Fluffy Jenkins
ead359ce67 Fixed clara rubbish 2020-01-07 05:14:38 +00:00
David Rowe
1d9aec6fec Improve order of dialog contents 2020-01-05 18:24:56 +13:00
David Rowe
977d498004 Add an "Open Project Folder" button 2020-01-05 17:53:36 +13:00
David Rowe
30c63fc305 Remove "Upload" button and associated items 2020-01-05 17:11:23 +13:00
David Rowe
cd6669ec8b Comment out the "Video" button 2020-01-05 17:00:40 +13:00
David Rowe
d79c87b2d4 Change Avatar Package docs links 2020-01-05 16:59:51 +13:00
Kasen IO
7489505f99 Updated whitelist info and name to include QML. 2019-12-26 22:27:58 -05:00
Kasen IO
d4c3504c8d Updated about dialog (old logo still there), application name, and readme.md 2019-12-14 23:12:54 -05:00
kasenvr
b470a765aa
Merge pull request #9 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
2019-12-10 21:10:06 -05:00
Kasen IO
297e039de5 Added a confirmation message + instructions to the QML. 2019-12-09 19:57:57 -05:00
Kasen IO
5fe27cdfc9 Added github link to about 2019-12-08 23:50:09 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
Anthony J. Thibault
befbdcef48 Upgraded OSC plugin with changes from ARKit blendshape work. 2019-11-19 13:13:56 -08:00
David Rowe
60d2845953 Remove further related dead code 2019-11-19 10:31:54 +13:00
David Rowe
748999b8d6 Remove reference to BodyMart in Avatar app 2019-11-19 09:59:59 +13:00
David Rowe
a912e97f1e Remove reference to AvatarIsland in Avatar app 2019-11-19 09:53:58 +13:00
Zach Fox
ca8a61f085 DEV-2701: Remove the home icon from the profile app 2019-11-06 11:11:57 -08:00
Zach Fox
683c3f1300 An experiment with the top bar. Will you notice? 2019-11-05 09:33:11 -08:00
amerhifi
ddfbb55e19 fixed old ui filtering of audio devices 2019-10-29 15:36:43 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re
case Dev 471: HMD default audio behavior
2019-10-24 16:23:14 -07:00
Shannon Romano
15f27e53cb
Merge pull request #16372 from ctrlaltdavid/DEV-2055
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
2019-10-24 15:20:34 -07:00
Zach Fox
df782edcd9 DEV-2541: Update 'Jump To' top bar expanded text 2019-10-23 11:14:22 -07:00
David Rowe
378c47d16c Replace world detail quality float with enum 2019-10-22 19:18:11 +13:00
amerhifi
68681fdb2e Merge branch 'master' into amer-dev471-re 2019-10-21 21:04:24 -07:00
amerhifi
c7e1fdaeac adding hmd audio device info to deviceslist
changing locations

one more

merge

working on the threading issue

changing offices, working on qml

simple qml filtering

fixed spacing problem when item is removed
2019-10-18 15:29:10 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -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
c8b975b2f1
Merge pull request #16342 from zfox23/newInvalidatedLanguage
DEV-2334: New 'Item Invalidated' language in Inventory
2019-10-14 13:28:33 -04:00
Zach Fox
7bd550e37b DEV-2334: New 'Item Invalidated' language in Inventory 2019-10-14 09:30:44 -07:00
Rebecca Stankus
21503137d4 Added blank placeholder text on focus to text field 2019-10-11 14:42:39 -07:00
Zach Fox
2220234d68 Removed yellow 2019-10-09 14:33:28 -07:00
Zach Fox
bed1192d70 A bunch of fixes, plus added a debug mode Settings switch 2019-10-09 14:18:36 -07:00
Zach Fox
5871e6b83a Host avatars remotely 2019-10-08 17:39:57 -04:00
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -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
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -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
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -07:00
RebeccaStankus
68f52584cf Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-30 09:19:15 -07:00
David Rowe
cd6d9b57c4 Fix Blocks script displaying a blank page 2019-09-28 11:30:56 +12:00
RebeccaStankus
de4e8b9cc4 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-27 09:16:26 -07:00
RebeccaStankus
f4ecd3dcd8 Working on initial/second launch 2019-09-27 09:15:39 -07:00
milad
aba6a28d54 updated camera modes 2019-09-25 11:05:32 -07:00
milad
39d96b76a6 fixed help text 2019-09-25 08:41:38 -07:00
milad
677dbe59cc fixed qml typo 2019-09-24 16:47:07 -07:00
milad
edb135776a Added selfie view and updated help 2019-09-24 16:44:34 -07:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
dante ruiz
b478a22ed2 fix edge case 2019-09-20 15:25:10 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
2019-09-20 12:39:01 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
Zach Fox
97ef2c030e
Merge pull request #16223 from zfox23/simplifiedGoToIteration
Whoops! New placeholder text color
2019-09-19 16:40:48 -04:00
Zach Fox
10352f1cb2 New placeholder text color 2019-09-19 13:38:37 -07:00
Zach Fox
a472e723e2
Merge pull request #16222 from zfox23/simplifiedGoToIteration
BUGZ-1529: Iteration on JumpTo Field visuals/interaction states
2019-09-19 16:13:21 -04:00
Zach Fox
5077089518 BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap 2019-09-19 11:15:53 -07:00
Zach Fox
5e96ce8822 DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR 2019-09-19 09:48:11 -07:00
Zach Fox
f92c5d0882 DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO 2019-09-18 14:39:11 -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
Zach Fox
60f4189eb3 BUGZ-1485: Fix Copyright date in About dialog 2019-09-17 11:36:12 -07:00
Zach Fox
a5504c3780
Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
2019-09-11 15:05:44 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
MiladNazeri
a9da5b8f16
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-09-11 12:45:18 -07:00
MiladNazeri
d95a803324
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-09-11 12:44:59 -07:00
milad
3cf56210b2 modified Audio.qml to handle desktop audio level meter visible 2019-09-11 12:30:24 -07:00
Zach Fox
50ba55a988 Protect against engine not returning a valid CPU/GPU object 2019-09-10 13:03:40 -07:00
RebeccaStankus
33b78bea4f Changed textField module sounds 2019-09-09 10:36:35 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -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
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -07:00
Shannon Romano
86518d222d
Merge pull request #16089 from RebeccaStankus/MuteIssues
Push To Talk Bugs 1207/1208
2019-08-23 10:42:16 -07:00
Andy Howell
f5767168ed
Merge pull request #16035 from MiladNazeri/emojiAppAdd
Using my superpowers to get this in the build.
2019-08-22 16:10:22 -07:00
RebeccaStankus
6e96b800b6 Engine handles turning PTT off if unmuting 2019-08-22 13:22:45 -07:00
Zach Fox
7c4a0545c4 BUGZ-1327: Fix PTT icon when PTTing and clipping 2019-08-22 12:51:34 -07:00
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -07:00
Zach Fox
70b3f44f8c Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 14:04:35 -07:00
RebeccaStankus
cc22386f06 CR feedback changes 2019-08-20 13:29:02 -07:00
Zach Fox
780a081d16 Remove unused TabletAddressDialog internal property, fixing BUGZ-1294 2019-08-20 12:05:00 -07:00
Zach Fox
bb97b4f866 Fix BUGZ-1303: Make 'View All Controls' go to knowledge base 2019-08-20 11:17:05 -07:00
Zach Fox
0cc28c58ae DEV-415: Implement Support tab in Help app 2019-08-20 10:54:58 -07:00
Zach Fox
78edfb9af9 Remove 'About' tab from Settings 2019-08-19 17:22:38 -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
14a04dfb1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 13:52:35 -07:00
Zach Fox
35a2cb7f27 BUGZ-1295: Fix typo in Help > Controls > Turn Right 2019-08-19 13:08:42 -07:00
Zach Fox
42705c2fea
Combine conditional statements 2019-08-19 11:04:54 -07:00
Zach Fox
2b86947d4a Mipmap images; better padding 2019-08-19 10:32:08 -07:00
Zach Fox
3de9f44bf3 It's working 2019-08-16 16:00:30 -07:00
Zach Fox
4c006c50aa Controls almost done 2019-08-16 15:53:30 -07:00
Zach Fox
a053f9ed9e Impelement settingChanged; clean up some emoteIndicatorVisible code 2019-08-15 17:00:27 -07:00
Zach Fox
0338b0258c Add Search to Emoji window and clean up some code 2019-08-15 12:21:29 -07:00
Zach Fox
143c3e966c Big optimizations to Emoji window 2019-08-15 10:58:13 -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
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
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
Zach Fox
66199297cb button 2019-08-09 12:24:37 -07:00
Zach Fox
dc2e08ef6b Initial integration of browser 2019-08-09 12:05:03 -07:00
sabrina-shanman
49f1ecb1bf Fix new bugs in TabletLODTools.qml 2019-08-09 11:41:11 -07:00
sabrina-shanman
8347d9d23e Update LODManager setter in TabletLODTools.qml 2019-08-08 13:59:50 -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
sabrina-shanman
bc3acfa3c0 Clean up and re-name to reflect what uses octreeSizeScale and what uses
visibilityDistance
2019-08-06 15:46:10 -07:00
milad
75708170dd Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-06 13:23:32 -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
Zach Fox
2a4c0a3ecd BUGZ-1103: Use 'Master GPU' information in About screen 2019-08-06 14:13:31 -04:00
milad
d1efbc051a working UI 2019-08-04 15:11:55 -07:00
Seth Alves
d8b940cc96 add control to enable/disable acoustic echo cancellation to simplified UI 2019-07-30 14:09:34 -07:00
Seth Alves
8ec4505b95 add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything. 2019-07-30 14:09:32 -07:00
MiladNazeri
b81d0ecce3
Merge pull request #16002 from MiladNazeri/addNewTextSizeAPI
[BUGZ-972] :: changed root to micBar which had the gated property
2019-07-30 09:59:40 -07:00
Shannon Romano
f29284198c
Merge pull request #15978 from roxanneskelly/bugz829
BUGZ-829 DEV-168 - domain backup/content management improvements
2019-07-29 15:28:49 -07:00
milad
2ea8b9efa4 changed root to micBar which had the gated property 2019-07-29 14:05:55 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
Kalila R
bac59b52aa Added checkbox for script plugins to security.qml 2019-07-26 01:32:14 -04:00
Roxanne Skelly
130e68c9b5 DEV-168 - make interface-installed content sets display info on web
installed content section
2019-07-25 14:37:41 -07:00
Zach Fox
e1c198903d
Merge pull request #15973 from zfox23/fixGatedLog
BUGZ-972: Fix errant log involving 'gated' property
2019-07-24 11:19:02 -07:00
Zach Fox
03b5f9f7f8 BUGZ-972: Fix errant log involving 'gated' property 2019-07-24 10:18:03 -07:00
Zach Fox
b918979fab DEV-301: Adjust size of VR-mode header icon 2019-07-24 10:02:26 -07:00
milad
a3b8ded56a changed sessionDisplayName logic 2019-07-17 14:17:58 -07:00
Zach Fox
1cd136f178 Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings 2019-07-16 15:15:08 -07:00
Zach Fox
5828f46c6b Incorrect ID fixed - thanks Milad 2019-07-12 12:27:55 -07:00
Zach Fox
e0392642f7 Don't enable supersampling from graphics settings 2019-07-12 11:18:34 -07:00
Zach Fox
56a55efbb3 Fix a quick renderer bug 2019-07-11 16:12:40 -07:00
Zach Fox
4c7d0fc6f4 Updated layout 2019-07-11 14:46:05 -07:00
Zach Fox
ce2b7e5baa Finish all of the logic and most of the layout 2019-07-11 12:05:13 -07:00
Zach Fox
2471a3eb72 Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings 2019-07-11 09:02:42 -07:00
Zach Fox
4caa00d6cc Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface 2019-07-10 16:42:48 -07:00