Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 21:20:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 72 branches 59 tags 1.2 GiB
Commit graph

4972 commits

Author SHA1 Message Date
Wayne Chen
6aebd000d6 changing api to match verbiage of overall code 2019-03-25 15:41:03 -07:00
Wayne Chen
49ce30d536 adding changes to design + truly separating muted/ptt 2019-03-25 15:35:05 -07:00
Thijs Wenker
0173c87695 Fix clashing hyperlinks in AvatarPackager project page 2019-03-25 22:48:30 +01:00
Roxanne Skelly
90b9de8623 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832 2019-03-25 14:48:26 -07:00
Roxanne Skelly
1608b24be1 ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
Shannon Romano
16d791703d
Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs 
Case 21353: Avatar Doctor documentation / Video URLs
 2019-03-25 14:36:30 -07:00
Wayne Chen
9a8c5e5a54
Merge branch 'master' into newAudioMuteStates 2019-03-25 13:33:24 -07:00
Shannon Romano
6710cd3e03
Merge pull request #15233 from roxanneskelly/Case20407 
Case 20407 - Pay-In API doesn't display error when no username specified
 2019-03-25 12:41:57 -07:00
Wayne Chen
59a420b160 adding signals + slots to when muted + display mode changes 2019-03-25 12:24:13 -07:00
Wayne Chen
f551d49f4f adding signal for updating push to talk variables 2019-03-25 11:32:08 -07:00
Wayne Chen
7f5d9cbd40 adding push to talk fix for loadData 2019-03-25 11:32:08 -07:00
Wayne Chen
4658e34b4b
update indent spacing 2019-03-25 11:29:27 -07:00
Wayne Chen
1952ad4be6
Merge branch 'master' into audio-mixer-volume-control 2019-03-25 11:28:14 -07:00
Wayne Chen
e9253a630b
Merge pull request #15211 from wayne-chen/fixAudioSettingsScreen-master 
Case 21781: show up audio screen using Settings > Audio
 2019-03-25 11:25:42 -07:00
Wayne Chen
7b5c379bb9
Merge pull request #15182 from wayne-chen/fixAudioSettingsScreenScrolling 
Case 21717: adding scrolling in audio settings window
 2019-03-25 11:25:30 -07:00
Ken Cooke
b5e8176b0f
Merge branch 'master' into audio-mixer-volume-control 2019-03-23 16:15:29 -07:00
Ken Cooke
649bb92e6c Prototype an updated Audio tab with 3 independent volume controls 2019-03-23 16:00:02 -07:00
Wayne Chen
b98eda4674 removing debug statemeng 2019-03-22 16:42:37 -07:00
Wayne Chen
3ea45de7c7 fixing qml bug in MicBar 2019-03-22 16:37:23 -07:00
Wayne Chen
390ce9bb26 wip for getting AvatarInputsBar to switch accordingly 2019-03-22 15:34:06 -07:00
Wayne Chen
0edbf12fa3 removing extra onLevelChanged 2019-03-22 15:26:57 -07:00
Wayne Chen
1f71a291a5 displaying offset values 2019-03-22 14:54:18 -07:00
Wayne Chen
554a144b0e adding tool to change avatar inputs properties 2019-03-22 14:54:17 -07:00
Wayne Chen
584fa1f17b more wip 2019-03-22 14:54:17 -07:00
Wayne Chen
6cf8b06c6d more wip on adding qml to adjusting ui position 2019-03-22 14:54:16 -07:00
Wayne Chen
d0116abc52 separating out bubble icon qml - adding support for transparency 2019-03-22 14:54:13 -07:00
Wayne Chen
cd7b6e7ed0 moving file as MicBarApplication 2019-03-22 14:50:12 -07:00
Wayne Chen
84fcd50b3b adding user speaking level rotated vertically and muted symbol 2019-03-22 14:49:11 -07:00
Wayne Chen
48b4fe37b4 don't display gated state 2019-03-22 14:35:01 -07:00
Wayne Chen
db6bf46ee7 adding more opacity, cleanup 2019-03-22 14:33:54 -07:00
Wayne Chen
8e8ceaac47 moving file as MicBarApplication 2019-03-22 14:21:24 -07:00
Wayne Chen
d063882d37 adding user speaking level rotated vertically and muted symbol 2019-03-22 14:18:19 -07:00
Wayne Chen
77b7cc2457 separating out bubble icon qml - adding support for transparency 2019-03-22 14:16:29 -07:00
Wayne Chen
5b6ce8736d adding new icons with gated icon 2019-03-22 14:16:28 -07:00
Wayne Chen
811fa8dcb2 allowing bubble icon to toggle 2019-03-22 14:16:28 -07:00
Wayne Chen
087f613d60 fixing muted text 2019-03-22 14:16:28 -07:00
Wayne Chen
835153c0df don't display gated state 2019-03-22 14:16:28 -07:00
Wayne Chen
e129201d2a adding more opacity, cleanup 2019-03-22 14:16:27 -07:00
Wayne Chen
ddacc0ee60 bubble icon opacity to 0.3 2019-03-22 14:16:27 -07:00
Wayne Chen
3ceb1598f6 adding working bubble icon 2019-03-22 14:16:27 -07:00
Wayne Chen
915d22bb15 adding bubble icon (not working) 2019-03-22 14:16:27 -07:00
Wayne Chen
1ba366c0d7 moving file as MicBarApplication 2019-03-22 14:16:27 -07:00
Wayne Chen
0def39dbaa adding user speaking level rotated vertically and muted symbol 2019-03-22 14:16:27 -07:00
Roxanne Skelly
efffb8b819
Merge pull request #15239 from roxanneskelly/Case20617 
Case 20617 - People app filter bar breaks when deleting connections
 2019-03-22 11:31:46 -07:00
Shannon Romano
9f19ee61e2
Merge pull request #15236 from howard-stearns/termsofservice 
update terms of service links
 2019-03-21 19:35:34 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio 
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
 2019-03-21 18:03:58 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui 
Case 21771: Possible Entity Scipt Ban Incident
 2019-03-21 13:10:54 -07:00
Roxanne Skelly
87d75ec75c Case 20617 - People app filter bar breaks when deleting connections 2019-03-21 12:08:42 -07:00
Howard Stearns
5888adfd90 update terms of service links 2019-03-20 17:08:42 -07:00
Roxanne Skelly
3775633cc3 Case 20407 - Pay-In API doesn't display error when no username specified 2019-03-20 15:29:13 -07:00
Shannon Romano
e256c34823
Merge pull request #15191 from roxanneskelly/Case21467 
Case 21728 - tab in marketplace search bar causes an update of search results
 2019-03-20 14:22:10 -07:00
Shannon Romano
a6d4f98ee7
Merge pull request #15204 from roxanneskelly/Case21025 
Case 21025 conditionalizing TabletWebView features
 2019-03-20 14:21:37 -07:00
Shannon Romano
4ac25121e0
Merge pull request #15190 from roxanneskelly/Case20393 
Case20393 - Add item counts to interface categories
 2019-03-19 17:53:30 -07:00
Roxanne Skelly
27fa0dc4c6 CR fixes 2019-03-19 17:24:19 -07:00
Roxanne Skelly
ab61f65ea2 CR fix 2019-03-19 17:08:04 -07:00
Roxanne Skelly
94739aa7c7 Case 21769 - updatable items not showing up as updatable 
after clicking 'show updates' button.
 2019-03-19 13:44:16 -07:00
Roxanne Skelly
b6e583087e Stand-alone Tagging: tagged places not coming first in GOTO list 2019-03-18 17:40:01 -07:00
Roxanne Skelly
fe28eaca7c fix typo 2019-03-18 11:23:48 -07:00
Wayne Chen
db22fa9eec show up audio screen using Settings > Audio 2019-03-18 09:23:17 -07:00
danteruiz
5f3e31b119 add ui to kick api 2019-03-15 18:15:18 -07:00
Thijs Wenker
714115adef - Video, and new Docs url in QML 2019-03-16 02:09:01 +01:00
Roxanne Skelly
9182db8bd4 Case 21025 conditionalizing TabletWebView features 2019-03-15 12:56:43 -07:00
Roxanne Skelly
b220b76874 Merge branch 'master' of https://github.com/highfidelity/hifi into Case21467 2019-03-14 13:05:08 -07:00
Roxanne Skelly
f971d17acc Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-14 12:36:42 -07:00
Roxanne Skelly
4470cf9ae5 Marketplace category dropdown UI tweaks 2019-03-14 12:35:54 -07:00
Wayne Chen
10eae54d8c changing content height and snap mode to allow scroll 2019-03-14 12:08:08 -07:00
Wayne Chen
a3dfd09e26 adding scrolling in audio settings window 2019-03-13 17:03:53 -07:00
Roxanne Skelly
c3ecc29c4b Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-13 16:04:34 -07:00
Roxanne Skelly
559351a6eb Case 21701 - Items were showing up in marketplace as "updates" when they 
weren't
 2019-03-13 15:33:46 -07:00
Roxanne Skelly
42bf812019 Case 21704 - marketplace button formatting fixes 2019-03-13 15:03:29 -07:00
Roxanne Skelly
822e5ceb98 Case 21703 - Disable SUBMIT before balance is retrieved 
to prevent sending a send-money request with too large
of a balance
 2019-03-13 13:42:55 -07:00
Roxanne Skelly
2dc38df779 Case 20393 - Display item counts in categories dropdown in Marketplace 2019-03-13 10:17:39 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
Wayne Chen
6b82b8cd7f fix for steam complete profile bug 2019-03-12 17:55:14 -07:00
Shannon Romano
95bdf29f35
Merge pull request #15151 from roxanneskelly/Case20622 
Case 20622 - Qml Marketplace - Fix categories dropdown UI issues
 2019-03-12 17:42:47 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Wayne Chen
80821e8b7e changing mic bar indicator when muted in PTT 2019-03-11 16:15:47 -07:00
Wayne Chen
ca5ff3381b changing position of the mute warning setting 2019-03-11 16:02:18 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Roxanne Skelly
c9cb284c19 Case 21467 - only update search when search field content has changed 2019-03-11 14:33:00 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero 
Case 21639: RC81: Adding Hero support in simulation of avatars
 2019-03-11 14:13:49 -07:00
r3tk0n
8aedc98a58 Fix QML formatting issue. 2019-03-11 10:54:48 -07:00
r3tk0n
c1ed01115d Fix logic for HMD vs Desktop. 2019-03-11 09:58:35 -07:00
Wayne Chen
cf3694e8e3 fixing error in master + getting ptt to show up 2019-03-10 19:00:41 -07:00
Wayne Chen
15eb90f634
Merge pull request #16 from wayne-chen/pttSwitchToItem 
fixng ptt checkbox
 2019-03-10 17:18:47 -07:00
Wayne Chen
54973375a4 fixng ptt checkbox 2019-03-10 17:18:18 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
Wayne Chen
2eaa1e63d3 switch from column layout to item 2019-03-10 17:07:02 -07:00
Sam Gateau
3464fe09c1 Applying the hero changes to master soon to be rc81 2019-03-08 18:13:20 -08:00
Roxanne Skelly
74320fe7be Case 20622 - Qml Marketplace - Fix categories dropdown UI issues 2019-03-08 17:24:43 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
88d8163b04 updating compile failure + icons/settings update 2019-03-08 16:07:46 -08:00
Wayne Chen
39db3979b9 changing text display 2019-03-08 16:07:09 -08:00
Wayne Chen
cb0fdd2ef2 laying groundwork for audio app + fixing deadlocks 2019-03-08 16:06:45 -08:00
r3tk0n
88a125aff0 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:05:24 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
8a5924077a changing text display 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
Shannon Romano
c3b8f6ed93
Merge pull request #15145 from roxanneskelly/StandaloneTags 
Case 21642 - verification dialog when user hits return in goto search
 2019-03-08 15:29:34 -08:00
Howard Stearns
1d52ed1524
Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox 
do not scroll inventory items underneath modal dialog
 2019-03-08 15:27:44 -08:00
Howard Stearns
fac162c2bc
Merge pull request #15144 from howard-stearns/about-blockchain 
Change "about" blockchain from Elements to EOS
 2019-03-08 15:17:31 -08:00
Shannon Romano
cc154be12d
Merge pull request #15090 from danteruiz/oculus-tracking-controllers 
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
 2019-03-08 14:56:56 -08:00
Roxanne Skelly
b3f5d76d0f CR Fix 2019-03-08 14:37:15 -08:00
Howard Stearns
8791252acd do not scroll inventory items underneath modal dialog 2019-03-08 14:27:56 -08:00
Roxanne Skelly
88a4b5c983 Case 21642 - verification dialog when user hits return in goto search 
text entry+return should throw up verification dialog for first time to
non-optimized domain
 2019-03-08 14:01:47 -08:00
Howard Stearns
24b08bd25d Change "about" blockchain from Elements to EOS 2019-03-08 13:59:16 -08:00
Roxanne Skelly
70cc6594c7 CR fixes 2019-03-08 12:43:43 -08:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
Roxanne Skelly
750dbfae21 Stand-alone Tags: Throw up popup for first unoptimized domain 
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
 2019-03-08 10:48:42 -08:00
Shannon Romano
ef44218fe3
Merge pull request #15128 from roxanneskelly/case21315etc 
Case 21315, Case 21326, Case 21370
 2019-03-08 08:37:23 -08:00
danteruiz
d1e376de0e destroy modal dialogs that prevent interface from getting input 2019-03-07 14:29:38 -08:00
Roxanne Skelly
cce43357d0 Case 21315, Case 21326, Case 21370 
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled

Also, a few minor font sizing and other graphics tweaks
 2019-03-07 13:58:51 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Howard Stearns
8ebab88613 Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master 2019-03-06 13:08:19 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus 
Case 21340: avatar doctor project page status
 2019-03-06 12:36:18 -08:00
Howard Stearns
ddfd437696 ensure error message when marketplace update fails 2019-03-06 11:37:17 -08:00
Howard Stearns
366dd935dd trading in has nothing to do with whether you own the new item 2019-03-06 11:36:34 -08:00
Howard Stearns
416cde4c1f fix uses of updated_item_id that got lost 2019-03-06 11:36:08 -08:00
Howard Stearns
f5afc2033f work through stocking vs update issues, and cleanup 2019-03-06 11:35:36 -08:00
Thijs Wenker
a84a43320c added spacing between lines 2019-03-06 19:15:01 +01:00
Thijs Wenker
59200103af Not for sale explanation 2019-03-06 07:06:48 +01:00
danteruiz
1941e53cc3 track oculus controllers while in oculus home 2019-03-05 15:32:18 -08:00
Wayne Chen
f1cf11de85 moving gain slider to audio settings 2019-03-05 10:53:55 -08:00
Wayne Chen
a00d6ec9f6 removing debug statement 2019-03-04 19:42:30 -08:00
Wayne Chen
0f2792930a adding switches and buttons to testing audio 2019-03-04 19:28:12 -08:00
Wayne Chen
a68aaaa7a4 adding timer and ui color changes 2019-03-04 16:06:50 -08:00
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
9614216006 don't disable server echo when audio qml page is closed 2019-03-04 13:47:55 -08:00
Seth Alves
d5e8cba1ee make server-audio-loopback button work in HMDs 2019-03-04 13:47:55 -08:00
Seth Alves
6ee236e783 added a button to enable server loopback of audio 2019-03-04 13:47:55 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Wayne Chen
7860db68eb culling hearing oneself and testing sound 2019-03-04 13:33:16 -08:00
Seth Alves
0523a0d06d don't disable server echo when audio qml page is closed 2019-03-04 11:08:07 -08:00
Seth Alves
9ff99c7213 make server-audio-loopback button work in HMDs 2019-03-04 11:08:07 -08:00
Seth Alves
6f40079621 added a button to enable server loopback of audio 2019-03-04 11:08:07 -08:00
Seth Alves
38256df0f2 add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 11:08:06 -08:00
Wayne Chen
028cce5394 change short username to 14 characters, displaying as normal text 2019-02-26 12:26:50 -08:00
Wayne Chen
650b34c463 adding clock 2019-02-25 18:00:56 -08:00
Roxanne Skelly
292ac88c96 Update with new standalone-optimized icon 2019-02-25 11:36:45 -08:00
Thijs Wenker
79d0a0a0a8 avatar doctor project status 2019-02-25 19:28:38 +01:00
Roxanne Skelly
8c058f147e Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-20 14:24:47 -08:00
Roxanne Skelly
dca166f821 Stand-alone Optimized Tagging - Add tagging for GOTO User Stories 2019-02-20 14:23:54 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
Roxanne Skelly
d957b38f10 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-19 12:34:10 -08:00
Howard Stearns
d7d6ff53ca
Merge pull request #14765 from howard-stearns/artist-stocking-inventory 
Case 20657: artist stocking inventory
 2019-02-19 10:46:01 -08:00
Howard Stearns
e9b323a807 fix HFC symbol location at checkout, and the display of unavailable items 2019-02-15 16:56:31 -08:00
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor 
Case 21012: Avatar Doctor
 2019-02-15 15:43:18 -08:00
Howard Stearns
f16eb1c029 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 15:15:13 -08:00
Thijs Wenker
e900d3784b fixes 2019-02-15 23:58:42 +01:00
John Conklin II
09d8221582
Merge pull request #14834 from gcalero/connection_failure_dialog 
Case 20936: Set message dialog text width so wrap mode takes effect
 2019-02-15 14:16:02 -08:00
Brad Davis
578bc4fc89 Suppress logspam with missing Controller in QML 2019-02-15 14:15:24 -08:00
Roxanne Skelly
2c4f485079 QmlMarketplace invert arrow direction on sort. 2019-02-15 12:31:01 -08:00
Thijs Wenker
74ce98a075 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor 2019-02-15 20:57:20 +01:00
Thijs Wenker
556a55ff16 Better scale and texture checks 2019-02-15 20:55:27 +01:00
Roxanne Skelly
fb524f8900 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-15 11:35:06 -08:00
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -08:00
Howard Stearns
490ef3542e update for marketplace-in-qml, and make specific to username 2019-02-15 10:58:09 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
Howard Stearns
30c0dda9ed Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 09:27:48 -08:00
Simon Walton
748747da2d
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist 
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
 2019-02-15 09:24:34 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
Brad Davis
292602afd7 Resolving more master differences 2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -08:00
Sam Gateau
969c62d0df
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac 
Case 21157: Fix Desktop.qml crash on local mac build
 2019-02-14 12:15:50 -08:00
Thijs Wenker
3026fd625a Avatar Doctor 2019-02-14 18:52:50 +01:00
Roxanne Skelly
20d7e00ea8 Standalone Tags - Checkpoint 2019-02-14 08:48:37 -08:00
danteruiz
562e159ab4 the proper fix for browser qml issues 2019-02-13 10:45:07 -08:00
danteruiz
a111aa1724 fix blocks app 2019-02-12 16:45:45 -08:00
Shannon Romano
10e5e9e0c3
Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix 
Fixed MS21059: Avatar App Keyboard Raise in Desktop
 2019-02-12 15:02:28 -08:00
Brad Davis
db121957d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-12 15:00:03 -08:00
Dante Ruiz
5e9b63b352 fix-qml-crash-on-mac 2019-02-12 13:56:56 -08:00
Roxanne Skelly
a82221d2a5 Case 21118 - descending sorts don't work in new (qml) marketplace 2019-02-12 13:20:47 -08:00
Brad Davis
a6f23f48d6 Merge branch 'feature/quest_custom_plugins' into feature/quest 2019-02-12 09:53:12 -08:00
Mark
9d81ace243 Fixed MS21059: Avatar App Keyboard Raise in Desktop 2019-02-12 09:45:51 -08:00
Simon Walton
73296aa986
Change update rate to 1 Hz 2019-02-11 16:59:18 -08:00
Cristian Luis Duarte
009f24dda1 Android - Make minWidth of message dialog wider so error messages like protocol version error fits in two lines 2019-02-11 21:28:31 -03:00
Cristian Luis Duarte
37b5f11489 Merge remote-tracking branch 'origin/master' into connection_failure_dialog 2019-02-11 19:53:11 -03:00
Simon Walton
4f2223ced3
Change max update to 10 Hz 2019-02-11 14:17:55 -08:00
Roxanne Skelly
4f8de7ed0b Case 21123, Case - marketplace license display has weird crud in it (new qml version) 2019-02-11 12:48:04 -08:00
Roxanne Skelly
a0199c5884 Case 21119, 21120 
Case 21119 - text filter doesn't change as you type in new (qml) marketplace
Case 21120 - text filter doesn't clear in new (qml) marketplace
 2019-02-11 12:27:02 -08:00
Simon Walton
44c163b7cc Tweak inventory-delete message to be more accurate 2019-02-11 10:30:51 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub
a23f436a9f
Merge pull request #14880 from kencooke/audio-meter-improvements 
Case 21091: Improved audio metering
 2019-02-08 19:08:31 -08:00
Roxanne Skelly
93665fa501 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-08 14:21:29 -08:00
danteruiz
76a56c679a making requested changes 2019-02-08 10:03:05 -08:00
Cristian Duarte
d034b080f7 Increase min width so texts like protocol mismatch fit and let the OK appear 2019-02-08 14:19:44 -03:00
Ken Cooke
5681a996a1 Fix meter color gradient, to encourage proper mic levels. 
High levels are now yellow, actual digital clipping sets red indicator light.
 2019-02-07 16:33:41 -08:00
Ken Cooke
d2abf1a56d Add "clipping" indicator to audio level meter 2019-02-07 15:52:29 -08:00
Ken Cooke
52aa20b4d5 Add "gated" indicator to audio level meter 2019-02-07 15:47:56 -08:00
Roxanne Skelly
4bbb030ad7 Show only free items when running from the oculus store 2019-02-07 15:34:44 -08:00
danteruiz
d71fb2a100 moved missed QtWebEngine references to +webengines 2019-02-07 14:57:25 -08:00
SamGondelman
c217f8d80f remove overlay picks from stats qml 2019-02-07 14:25:07 -08:00
Roxanne Skelly
c775a9b23f Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-07 13:23:59 -08:00
Roxanne Skelly
d04445c244 Qml Marketplace - remove some quest incompatibilities and disable 
links for quest
 2019-02-07 13:22:49 -08:00
danteruiz
95d30e5cbf Merge branch 'master' of github.com:highfidelity/hifi into feature/quest 2019-02-07 10:41:44 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
Sam Gateau
632d6e8a73
Merge pull request #14863 from danteruiz/android-apps-directories 
Case 20877: Support CMake time configuration of QmlFileSelectors
 2019-02-07 09:30:49 -08:00
Simon Walton
58d8945aa5 Limit re-sort rate to 2 Hz. 2019-02-06 14:41:27 -08:00
Brad Davis
8b70f1771e Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 13:16:22 -08:00
Simon Walton
a2da59271d If sorting PAL by loudness re-sort upon loudness updates 2019-02-06 11:38:48 -08:00
danteruiz
d0fecac0d8 +android -> +android_interface 2019-02-06 11:37:52 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace 
Qml marketplace
 2019-02-06 11:20:49 -08:00
Brad Davis
91e18f569b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 10:15:36 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector 
Case 20879: Migrate  webEngine referencing  QML into +webengine folder
 2019-02-05 12:57:38 -08:00
Roxanne Skelly
d3bc536b58 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-05 11:35:28 -08:00
Roxanne Skelly
2b40260953 QmlMarketplace - disable HTML for quest 2019-02-05 09:27:12 -08:00
Roxanne Skelly
364a1698fe QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions 2019-02-04 17:24:30 -08:00
Roxanne Skelly
db9b44a71a QmlMarketplace - The QML Text object has sufficient markup to handle 
all of our needs, so use that instead of webengineview
 2019-02-04 15:30:53 -08:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7 QmlMarketplace - fix issue with footer not appearing in marketplaces list 2019-02-04 15:04:18 -08:00
Roxanne Skelly
1840f874ab Add Attributions to Qml Marketplace 2019-02-04 13:29:06 -08:00
Roxanne Skelly
39ad36a4d0 QmlMarketplace - bugfixes and Markup rendering of descriptions 
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
 2019-02-01 15:27:17 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -08:00
Gabriel Calero
a1d18feb0a Set message dialog text width so wrap mode takes effect 2019-01-31 16:30:02 -03:00
Dante Ruiz
93a91cdba2 webengine fileselector 2019-01-30 13:57:49 -08:00
Brad Davis
10a7403d44 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-01-30 10:19:46 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering 
Case 20902: Give SendAsset.qml a background color
 2019-01-30 08:54:03 -08:00
Dante Ruiz
ccf02d8b65 fix SendAssets.qml 2019-01-29 17:16:27 -08:00
Roxanne Skelly
0fdbca8ade QmlMarketplace Bugfixes 
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
 2019-01-29 16:07:27 -08:00
Simon Walton
e45634d4ea Merge remote-tracking branch 'upstream/master' into pal_username_update 2019-01-29 11:55:39 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
Simon Walton
d2af7eed3d Don't update PAL namecard with empty strings 2019-01-28 17:44:04 -08:00
Brad Davis
b1e4e17f47 Santa Cruz 2019-01-28 15:52:36 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization 
case 20883: GPU frame serialization and related tools
 2019-01-28 15:47:55 -08:00
Roxanne Skelly
2fe78383ed QmlMarketplace - Fix issues found during test 
* command line --url hifiapp:MARKET was not bringing up correct
marketplace
* Search field was not being cleared when 'home' button was clicked
after a search
* tablet button was not lit when marketplace was launched
 2019-01-28 15:14:49 -08:00
Roxanne Skelly
d3cffa50d6 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-28 11:11:28 -08:00
Roxanne Skelly
8357f1f9b5 CR fixes 2019-01-28 11:10:35 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Shannon Romano
fe874ca5b1
Merge pull request #14511 from danteruiz/spinbox-fixes 
case 20100: fix SpinBox.qml in ControlsUit and adjusting OpenVrConfiguration SpinBoxes
 2019-01-25 17:30:16 -08:00
Roxanne Skelly
dfac0d88a2 QmlMarketplace - Add 'logged out' behavior, fix issue with search scope 
display
 2019-01-25 16:41:13 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature 
MS20311: Oculus login feature
 2019-01-25 16:16:32 -08:00
Howard Stearns
2070e9a173 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-01-25 15:40:04 -08:00
Howard Stearns
49a3a13d57 use space a bit better 2019-01-25 14:13:58 -08:00
Howard Stearns
52a43ca4cd support artist's stocking to inventory 2019-01-25 14:09:00 -08:00
Roxanne Skelly
49e6120e73 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 14:06:44 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10 
Case 20585: Add missing Web Overlay functionality to Web Entities
 2019-01-25 14:00:52 -08:00
Roxanne Skelly
6123c4ec96 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 13:45:04 -08:00
Roxanne Skelly
ff2d51701e QML Marketplace 
Add keyboard while in search
General cleanup
 2019-01-25 13:41:16 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature 2019-01-25 11:44:14 -08:00
Shannon Romano
90c7423dfb
Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio 
MS20825: Login Screen Aspect/Crop with resizing
 2019-01-25 11:16:10 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
Roxanne Skelly
cfaf01b22a Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace 
Checkpoint full functionality
 2019-01-24 17:20:42 -08:00
Wayne Chen
4880c7081e adding blurred images 2019-01-24 16:00:24 -08:00
Wayne Chen
5c55761e4d adding fill mode for aspect/crop 2019-01-24 15:57:04 -08:00
Wayne Chen
9da7465698 readding render session, adding newlines for oculus failure 2019-01-24 15:33:50 -08:00
SamGondelman
5d19666f60 merge with master 2019-01-23 17:58:56 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Dante Ruiz
df34d8dcc0 fix spinbox and adjusting OpenVrConfiguration spin boxes 2019-01-23 14:59:37 -08:00
Wayne Chen
049282e2b3 fixing text alignment issues, adding some oculus user log 2019-01-23 14:38:06 -08:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
Wayne Chen
e6426cb680
fixing bug with cancel button 2019-01-23 10:26:51 -08:00
Clement
61be5a3cc4 Enable "Add To World" Asset Browser button for glTF 2019-01-22 17:01:06 -08:00
Roxanne Skelly
8010d86210 QML Marketplace support 
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
 2019-01-21 13:39:16 -08:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp 
Change Avatar App design for avatar collisions
 2019-01-17 16:06:17 -08:00
Wayne Chen
238f020392
remove trailing whitespace 2019-01-17 14:20:47 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
John Conklin II
19e4a7389b
Merge pull request #14676 from wayne-chen/updateLoginUserLogging 
case 20654: Updating user activity logging for login experience
 2019-01-17 12:59:12 -08:00
Wayne Chen
123f2d71e5 dismissing login dialog on popup if bad linking 2019-01-17 11:38:42 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
673c4ad434 fixing error message spacing 2019-01-16 17:22:00 -08:00
Wayne Chen
3ad0f60dd5 fixing error message spacing 2019-01-16 17:20:01 -08:00
Wayne Chen
8e916ea41b linking oculus acct creation to spinner 2019-01-16 17:05:59 -08:00
Wayne Chen
f4d4220e58 adding final create failure message handling, ui improvements 2019-01-16 17:05:56 -08:00
Wayne Chen
c54bce3953 fixing desktop login page crash 2019-01-16 17:05:55 -08:00
Wayne Chen
d38a657c54 filling username with oculus username, checking create error 2019-01-16 17:05:54 -08:00
Wayne Chen
671f15b63c removing isLogIn 2019-01-16 17:05:53 -08:00
Wayne Chen
3b3b86888e adding blur to login bg 2019-01-16 17:05:53 -08:00
Wayne Chen
fbc2dc5103 adding changes to forms 2019-01-16 17:05:52 -08:00
Wayne Chen
5c54930910 adding tablet close upon login 2019-01-16 17:05:52 -08:00
Wayne Chen
ca0916886a adding more qml for oculus login 2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
970798705c improving flow from Oculus API to login dialog wip 2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018 adding more staging 2019-01-16 17:05:48 -08:00
Wayne Chen
1fc51445d0 adding files for staging login 2019-01-16 17:05:47 -08:00
Wayne Chen
3b913db609
fixing typo 2019-01-15 14:21:37 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings 
Fix Avatar apps warnings.
 2019-01-15 11:03:43 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
luiscuenca
824a93f900 Fix menu update on app reopened 2019-01-14 12:27:59 -07:00
luiscuenca
43d967329c Change Avatar App design for avatar collisions 2019-01-14 10:13:12 -07:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
Wayne Chen
ba8620b644 updating user activity logging 2019-01-09 13:51:40 -08:00
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type 
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
 2019-01-08 18:35:28 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Thijs Wenker
5d40e1e480 - CR/style fixes 
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
 2019-01-04 23:39:04 +01:00
Thijs Wenker
a3f72a7a08 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-04 21:10:35 +01:00
Ryan Huffman
6d5b9a88e4 Remove dead code in AvatarUploadStatusItem 2019-01-04 11:29:07 -08:00
Ryan Huffman
c2ceeb3d76 Apply AvatarPackager code review cleanup 2019-01-04 09:41:31 -08:00
Ryan Huffman
f27ee1767c Fix rename not working correctly in AvatarPackager 2019-01-04 08:43:43 -08:00
Thijs Wenker
8625037285 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats 
Fix network stats to use low-level values
 2019-01-03 16:54:03 -08:00