Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 06:48:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

3292 commits

Author SHA1 Message Date
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Wayne Chen
eba1f271ef
Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master 
Case 21892: Mac Audio Push To Talk fix
 2019-04-01 12:19:10 -07:00
Wayne Chen
0a8d195f6f adding top padding for my name card 2019-04-01 11:32:52 -07:00
Wayne Chen
c4cccc6ef7
fix opacity for containing mouse only 2019-03-29 17:04:44 -07:00
Shannon Romano
dbecf1f611
Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing 
Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.
 2019-03-29 17:04:37 -07:00
Wayne Chen
426ffe5a14
Fixing typo 2019-03-29 15:38:42 -07:00
Wayne Chen
2622408792 warn when muted only affects hmd 2019-03-29 10:45:40 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables 
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
 2019-03-29 10:41:21 -07:00
Wayne Chen
248f9ba375 adding mute overlay back into HMD and have warn when muted disable in desktop 2019-03-29 10:32:13 -07:00
Thijs Wenker
7e21a3f372 disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx) 2019-03-29 01:48:57 +01:00
Wayne Chen
3241d2f960 don't allow clicking on push to talk in MicBarApplication 2019-03-28 16:24:37 -07:00
Wayne Chen
f2b0e47c39 changing opacity 2019-03-28 16:19:35 -07:00
Roxanne Skelly
73cf51182e
Merge pull request #15262 from roxanneskelly/Case20832 
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
 2019-03-28 12:01:24 -07:00
Wayne Chen
8627a92f29 adding functions to update variables 2019-03-28 11:29:34 -07:00
Wayne Chen
c3e5c49f69
update muted in AudioScriptingInterface 2019-03-28 10:40:39 -07:00
Wayne Chen
9349514ff7 make audio screen inputs/outputs unflickable 2019-03-28 10:35:28 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
Ken Cooke
abb0a166b1
Merge pull request #15260 from kencooke/audio-mixer-volume-control 
Case 21902: System-wide independent volume controls
 2019-03-27 13:19:30 -07:00
Seth Alves
e085a00256 cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open 2019-03-27 10:12:58 -07:00
Seth Alves
d25d290394 refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term 2019-03-27 10:12:58 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables. 
allow grabbing / adjusting others' wearables if they are unlocked.
 2019-03-27 10:12:57 -07:00
Seth Alves
16f842b2ac missed one 2019-03-26 16:07:18 -07:00
Seth Alves
7d21222232 the test-audio button causes a local audio-loopback rather than a server one 2019-03-26 16:03:56 -07:00
Wayne Chen
c0b71150ea removing an extra button 2019-03-26 10:58:04 -07:00
Wayne Chen
e44cdb0d7b
Merge branch 'audio-mixer-volume-control' into addNewAudioControls 2019-03-26 10:39:29 -07:00
Wayne Chen
a2d754cebd fixing audio screen with master 2019-03-26 10:26:29 -07:00
Ken Cooke
7b56bef838 Prototype an updated Audio tab with 3 independent volume controls 2019-03-26 09:41:58 -07:00
Wayne Chen
c54e8f5569 showing ptt text always + hmd mode switch fix 2019-03-25 17:32:03 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Brad Davis
91e18f569b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 10:15:36 -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
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -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
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
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
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
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
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
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
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
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
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
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
Ryan Huffman
93f53cf43d Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 14:18:40 -08:00
Ryan Huffman
847496048f Fix waiting-for-inventory sticking around on avatar uploader 2019-01-03 13:51:45 -08:00
Thijs Wenker
68521e11a7 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
#	interface/resources/qml/hifi/avatarPackager/InfoBox.qml
 2019-01-03 22:13:04 +01:00
Thijs Wenker
ecc578c2dd - error messages 
- style changes
 2019-01-03 22:00:22 +01:00
Ryan Huffman
7953507cb8 Update avatar project rename to have audio and highlighting 2019-01-03 11:59:16 -08:00
Ryan Huffman
c13badcbc8 Fix project rename focus and create project not initializing 2019-01-03 10:20:13 -08:00
Ryan Huffman
9c96f7bd01 Add RalewayButton 2019-01-03 08:21:52 -08:00
Ryan Huffman
61ac9d0050 Update various styling in Avatar Packager 2019-01-02 16:47:09 -08:00
Anthony Thibault
95c93e59a7 Make the Out of Range Strategy drop down wider 
So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.
 2018-12-31 09:23:33 -08:00
Thijs Wenker
cb33a91a34 - rename functionality 
- avatar packager works in tablet now
 2018-12-29 03:31:56 +01:00
Ryan Huffman
24aaeee5fd Disable back button on avatar upload page 2018-12-27 22:55:54 -08:00
Ryan Huffman
83a60a541b Fix styling and flow issues in avatar uploader 2018-12-27 18:53:07 -08:00
Ryan Huffman
c21d037800 Fix marketplace uploader not working with projects larger than 128MB 2018-12-27 17:51:27 -08:00
Ryan Huffman
9e7f89e2b0 Update link text for avatar project files 2018-12-27 14:38:46 -08:00
Ryan Huffman
89b03a3cdc Add info popup box for avatar project files 2018-12-27 14:30:44 -08:00
Thijs Wenker
656d96c725 Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
 2018-12-27 21:52:57 +01:00
Thijs Wenker
1a38abe230 - add jointIndexes to new 
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
 2018-12-27 21:47:10 +01:00
Ryan Huffman
882975f01c Update icons in avatar packager 2018-12-27 12:43:43 -08:00
Thijs Wenker
2f32458f72 recent projects 2018-12-27 19:52:56 +01:00
Ryan Huffman
1da179dc04 Update avatar packager styling 2018-12-27 00:13:45 -08:00
vladest
8d9cff3c58 Merge branch 'master' into avatar_app_warnings 2018-12-23 16:45:59 +01:00
Ryan Huffman
8c56e35f69 Add granular status to avatar upload 2018-12-23 00:13:01 -08:00
Ryan Huffman
b717188ed0 Update avatar project styling 2018-12-22 21:57:09 -08:00
Ryan Huffman
9955de6288 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 11:43:49 -08:00
Ryan Huffman
748135eef9 Fix login-required size and projectFiles warning 2018-12-21 11:43:20 -08:00
Thijs Wenker
ad2d9bc79a - fst read/write should work 
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
 2018-12-21 19:34:54 +01:00
Thijs Wenker
1da5b3fae2 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 19:20:16 +01:00
Ryan Huffman
7602da6f92 Add AvatarProjectUpload.qml 2018-12-21 08:16:18 -08:00
Thijs Wenker
ea901aa179 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 01:59:11 +01:00
Ryan Huffman
556f516be6 Update uploader screen 2018-12-20 16:30:08 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
Thijs Wenker
79a9c82168 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-20 18:56:33 +01:00
Jeff Clinton
3d4311b7d4
Merge pull request #14613 from zfox23/MS20253_eventBridge 
MS20253: Only emit screenChanged once screen has changed
 2018-12-20 08:58:53 -08:00
Zach Fox
b0ce3a54d5 Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash 2018-12-19 15:16:55 -08:00
Zach Fox
d0998174ff Un-wear things when trashing them if worn 2018-12-19 15:16:48 -08:00
Zach Fox
46e00cf1b3 Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash 2018-12-19 15:03:36 -08:00
Ryan Huffman
202326dbac Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager 2018-12-19 12:03:30 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Ryan Huffman
c2aca64b11 Add start of opening uploaded avatar in inventory 2018-12-19 11:30:21 -08:00
Thijs Wenker
cb74313de8 create projects / style changes 2018-12-19 19:23:24 +01:00
Zach Fox
7fee0fc1e4 Fix MS20253: Only emit screenChanged once screen has changed 2018-12-19 09:50:52 -08:00
Zach Fox
116edcc224
I have no idea how this happened 2018-12-19 09:36:05 -08:00
Jeff Clinton
a7e7a2426e
Merge pull request #14538 from ElderOrb/FB19355 
FB19355 - When I have avatar entities as children of my avatar, the A…
 2018-12-19 09:09:54 -08:00
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing 2018-12-18 17:11:10 -08:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
Ryan Huffman
ad471387f7 Integrate marketplace upload API 2018-12-18 13:08:55 -08:00
vladest
63aa27475e Merge branch 'master' into avatar_app_warnings 2018-12-15 19:08:56 +01:00
Shannon Romano
a89c53cc52
Merge pull request #14581 from zfox23/MS20308_unknownItems 
Fix MS20308: Allow users to checkout uncertifiable items
 2018-12-15 00:44:50 +00:00
Zach Fox
47a46c1d1b Fix MS20308: Allow users to checkout uncertifiable items 2018-12-14 11:17:56 -08:00
Shannon Romano
131b53e4df
Merge pull request #14315 from wayne-chen/loginInitiative2 
2nd initiative for encouraging login
 2018-12-14 01:59:35 +00:00
Ryan Huffman
2269447741 Fix AvatarPackager QML size 2018-12-13 15:27:10 -08:00
Shannon Romano
3e10bea1ce
Merge pull request #14567 from davidkelly/dk/18639 
Return more connections in pal
 2018-12-13 22:48:00 +00:00
Ryan Huffman
78c4c2599e Add start of marketplace uploading and project file list 2018-12-13 13:27:31 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
Thijs Wenker
96673bb5b9 show project page 2018-12-12 21:15:44 +01:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Thijs Wenker
c0bd9121fb open avatar projects 2018-12-12 19:55:14 +01:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Zach Fox
dff7804cdc Change username to trashbot 2018-12-11 16:26:49 -08:00
Zach Fox
d74f7eb098 Implement MS20187: Add trash can feature to Inventory 2018-12-11 15:44:42 -08:00
David Kelly
b2645bc23b Return more connections in pal 2018-12-11 14:47:18 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings 
Adding menu settings to disable teleporting
 2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot 
Fix MS20161: Fix INVENTORY notification dot state
 2018-12-11 13:03:26 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Zach Fox
75ba1cb3c7 I forgot to clear dot immediately 2018-12-11 10:30:12 -08:00
Thijs Wenker
3943fe2861 avatar packager initial 2018-12-10 21:29:03 +01:00
Jeff Clinton
40f50eccb1
Merge pull request #14550 from zfox23/MS20208_assetsToInventory 
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
 2018-12-10 10:49:06 -08:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -08:00
vladest
c05e3e7d09 Fix Avatar apps warnings. Added notification for HMD.active property 2018-12-08 19:12:02 +01:00
Sam Gondelman
4c5ff0dc3e
Merge branch 'master' into NOverlays3 2018-12-07 14:26:59 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking 
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
 2018-12-07 12:09:44 -08:00
Zach Fox
4cc5fc755f Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY' 2018-12-07 11:42:03 -08:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1 
Pay-Out API Frontend, Part One
 2018-12-06 15:25:54 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
 2018-12-06 11:18:39 -08:00
Zach Fox
a2af50a9d0 Show pre-auth'd transactions in Recent Activity before redemption 2018-12-06 11:07:26 -08:00
Zach Fox
235b27a198 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308 Secret to Coupon ID 2018-12-05 16:34:53 -08:00
Alexander Ivash
090bc4fc0d FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables 2018-12-05 23:33:34 +03:00
Wayne Chen
a30f4ed0b3 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-05 08:17:06 -08:00
Wayne Chen
2a77a29f8a
Delete LoginScreenDialog.qml 2018-12-04 17:07:03 -08:00
Wayne Chen
57b21730de Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 17:01:56 -08:00
Anthony Thibault
7f2e427584 Added DropAfterDelay strategy to Vive Tracker Calibration Dialog 
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
 2018-12-03 18:56:45 -08:00
Zach Fox
ab184c5c2b Authorized Script to Coupon 2018-12-03 15:16:06 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
Anthony Thibault
c0bf832e39 Head and Hand offsets for Vive Trackers now function as expected 
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now.  This gives you the ability to adjust
the offsets of the pucks to the hands/head.  For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
 2018-12-02 16:18:36 -08:00
Zach Fox
0d66d230c5 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-11-30 16:45:03 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2 2018-11-30 13:05:17 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix 
Fix QML achoring warnings on Layouts
 2018-11-30 10:50:30 -08:00
Zach Fox
bc39dbba8b Finish out the feature 2018-11-29 12:44:30 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2 2018-11-28 19:10:20 -08:00
Zach Fox
371c50b2ab Start work on Pay Out UI 2018-11-28 11:01:40 -08:00
Zach Fox
a4175b0428 Error handling in checkout 2018-11-27 14:17:28 -08:00
Zach Fox
67dfccafec Show item name when sending item 2018-11-27 10:19:14 -08:00
Zach Fox
a9fd443f28 'improve' UI slightly 2018-11-26 16:03:07 -08:00
Zach Fox
31f7d747c8 Bugfixes; enable purchase asset from marketplace screen raise 2018-11-26 15:48:49 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
Wayne Chen
b8d8710604 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-19 09:02:16 -08:00
vladest
db82994b4d Merge branch 'master' into qml_warning_fix 2018-11-18 16:10:21 +01:00
Alexander Ivash
fe43c733f8 FB19400 during shutdown -- TypeError: Cannot read property 'buttons' 2018-11-17 22:56:59 +05:30
vladest
53b7cc1376 Fix QML achoring warnings on Layouts 2018-11-17 15:06:25 +01:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading 
Fixing case of interstitial not finishing loading
 2018-11-16 14:53:01 -08:00
Howard Stearns
8e1785bd90 security settings post-oculus-store wording 2018-11-15 15:59:52 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697 
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
 2018-11-15 14:54:26 -08:00
Dante Ruiz
20ad05726e entity server timout 2018-11-15 10:52:40 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859 
Fix Goto app clicks not working
 2018-11-15 09:56:56 -08:00
Wayne Chen
c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-14 14:47:56 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238 
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
 2018-11-14 14:38:34 -08:00
David Rowe
9c5d318341 Fix highlighting 2018-11-15 10:15:30 +13:00
Seth Alves
1593c1185a revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it. 2018-11-14 12:29:09 -08:00
David Rowe
010f7121a3 Fix Goto app clicks not working 
Includes better card highlighting fix.
 2018-11-14 15:27:18 +13:00
Thijs Wenker
0248323bee fix test path 2018-11-14 01:05:38 +01:00
Thijs Wenker
afd69d04dd Make ctrl+shift shortcuts work for create app 2018-11-14 01:05:37 +01:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
 2018-11-13 15:07:21 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Seth Alves
e5114c9b43
Merge pull request #14283 from ctrlaltdavid/M14836 
Make tablet page indicators clickable to scroll tablet
 2018-11-13 09:38:43 -08:00
Seth Alves
4ac719a87f
Merge pull request #14298 from ctrlaltdavid/M17640 
Fix Goto app cards staying highlighted if move off dialog while dragging
 2018-11-13 09:32:24 -08:00
Alexander Ivash
b16efb2afb set minimum shoulder width to 25 cm (based on discussion with Tony) 2018-11-13 19:06:10 +05:30
Alexander Ivash
3a62184afd specify min/max/stepsize 2018-11-13 19:06:09 +05:30
Alexander Ivash
95c51c2ffa unfocus spinboxes on finishing editing 2018-11-13 19:05:20 +05:30
Alexander Ivash
a9ff1f4ecd add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog 2018-11-13 19:03:50 +05:30
Howard Stearns
3431bdbb0e new inventory icons, and align message waiting light in items tab 2018-11-12 14:51:32 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Wayne Chen
ea325acef9 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-12 10:28:03 -08:00
Seth Alves
500b2b7adf
Merge pull request #14381 from zfox23/MS19803_retry 
Actually fix MS19803: Replace missing imports
 2018-11-09 16:38:26 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859 
Make material entities to be presented in avatarapp
 2018-11-09 15:32:27 -08:00
Zach Fox
8d325d8dd9 Actually fix MS19803: Replace missing imports 2018-11-09 15:02:57 -08:00
Zach Fox
1ce6079c5a Remove extra as 2018-11-09 11:26:18 -08:00
Wayne Chen
f66326fc4d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-08 15:51:24 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2 2018-11-08 11:17:24 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug 
Fix MS19743: Fix case where user couldn't update certain items
 2018-11-07 14:57:35 -08:00
Wayne Chen
a05d70cd8b Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-07 14:21:13 -08:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396 
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
 2018-11-07 13:36:41 -08:00
Wayne Chen
51586625e7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-07 12:02:38 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage" 2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
Wayne Chen
7c2dd973b7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-06 15:34:34 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00