Roxanne Skelly
2dc38df779
Case 20393 - Display item counts in categories dropdown in Marketplace
2019-03-13 10:17:39 -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
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
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
