Commit graph

1800 commits

Author SHA1 Message Date
howard-stearns
5b57354624 crazy workaround for qt bug 2016-11-16 17:03:24 -08:00
howard-stearns
050d343849 styling changes 2016-11-16 15:54:11 -08:00
howard-stearns
fef68ac53a gap between top and scroll 2016-11-16 10:02:17 -08:00
howard-stearns
b0518feee4 split ToolbarButton.qml into a stateful image part 2016-11-15 14:59:27 -08:00
howard-stearns
182050c4b9 don't process stale query responses 2016-11-15 14:34:23 -08:00
howard-stearns
9809515853 styling 2016-11-15 14:12:27 -08:00
howard-stearns
6078b833a1 Merge remote-tracking branch 'origin/group-snapshots-by-place' into no-snapshots-welcome 2016-11-14 13:47:32 -08:00
howard-stearns
4cdda7c20f Merge remote-tracking branch 'origin/quasi-tabbed-goto' into no-snapshots-welcome 2016-11-14 13:13:58 -08:00
Atlante45
f8be4227d9 Fix Blast screen typos 2016-11-14 12:06:25 -08:00
Howard Stearns
fac5d1e12e group snapshots by place 2016-11-12 17:00:54 -08:00
Howard Stearns
17428d7ecb tab-like filtering of suggestions by type 2016-11-12 15:23:11 -08:00
Howard Stearns
fcbf4f421a no scroll margins 2016-11-12 10:04:15 -08:00
Brad Hefta-Gaub
0dc7f0bf17 Merge pull request #9055 from jherico/fix_stats
Fix buffer count in stats display
2016-11-11 13:31:55 -08:00
Brad Davis
0aec9400c7 Fix buffer count in stats display 2016-11-11 12:54:19 -08:00
Chris Collins
b9b90cc646 Merge pull request #9047 from jherico/stutter
Add stutter tracking
2016-11-11 11:39:00 -08:00
Brad Hefta-Gaub
a90a0fe8ba Merge pull request #8976 from druiz17/FixMenuOutOfView
Fixed menu out of view with HMD and Xbox controller
2016-11-10 18:49:34 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -08:00
Howard Stearns
0a56f7c4fe Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt
fix numeric keyboard for hmd Window.prompt
2016-11-08 12:05:13 -08:00
Chris Collins
eec8e2f19b Merge pull request #9000 from samcake/punk
Add Frame Timing and GPU memory to the Stats and user activity log
2016-11-07 16:17:20 -08:00
Dante Ruiz
e22c36b4b7 fixed menu pop up delay 2016-11-07 17:16:24 +00:00
howard-stearns
84eb1721e7 fix numeric keyboard for hmd Window.prompt 2016-11-04 17:02:14 -07:00
samcake
76aa541d4a Adding the frame gpu and batch timer 2016-11-04 11:49:52 -07:00
Andrew Meadows
836aad7d0b Merge pull request #8997 from howard-stearns/raise-desktop-when-showing-it
raise desktop when showing it
2016-11-04 10:45:05 -07:00
howard-stearns
c5ee1941d1 raise desktop when showing it 2016-11-03 17:02:47 -07:00
Clément Brisset
00a94bdd6d Merge pull request #8974 from huffman/feat/help-select-xbox-tab
Update help window to auto select xbox or vive controller tab on availability of device
2016-11-03 14:42:23 -07:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
howard-stearns
6aad78c8e8 Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar 2016-11-03 11:23:47 -07:00
Zach Fox
9a22c29788 Get ready for merge 2016-11-03 11:20:08 -07:00
Zach Fox
b74c1d3476 tabs to spaces 2016-11-03 10:42:15 -07:00
Zach Fox
a12e0325bf Making progress... 2016-11-03 10:39:55 -07:00
howard-stearns
f3d4821579 constrain toolbar based on setting. (ui for settings to come.) 2016-11-03 10:39:53 -07:00
howard-stearns
10309cc699 Merge branch 'master' of https://github.com/highfidelity/hifi into centered-toolbar 2016-11-02 15:38:24 -07:00
howard-stearns
90ebbb79c1 centered toolbar 2016-11-02 15:37:53 -07:00
Dante Ruiz
a948e03ed8 changed old icon to new icon 2016-11-02 08:23:10 -07:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Ryan Huffman
3147ea9e33 Update help window to auto select xbox or vive controller tab on availability of device 2016-11-01 13:43:55 -07:00
Chris Collins
6698b1617b Merge pull request #8945 from thoys/patch-8
Fix Oculus hand controllers to only work in HMD
2016-10-31 11:02:40 -07:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -07:00
Atlante45
8ebe92487a Update being of light model 2016-10-28 14:56:36 -07:00
Brad Hefta-Gaub
cec982b004 Merge pull request #8952 from jherico/openvr_min_spec
Updating min spec overlay image
2016-10-28 14:47:21 -07:00
Brad Davis
93be00fe79 Updating min spec overlay 2016-10-28 14:45:24 -07:00
Andrew Meadows
fe716b3641 Merge pull request #8941 from thoys/patch-7
QuickFix for weird avatar when switch Vive -> Desktop mode
2016-10-28 11:14:40 -07:00
Thijs Wenker
597e52636a Fix Oculus hand controllers to only work in HMD 2016-10-28 19:22:44 +02:00
Brad Hefta-Gaub
4f6cbf762d Merge pull request #8942 from jherico/openvr_min_spec
Updates for min spec check for Steam
2016-10-27 20:08:35 -07:00
Brad Hefta-Gaub
97f622f003 Merge pull request #8940 from hyperlogic/bug-fix/web-engine-crash-when-swiching-domains
Fix for crash in QtWebEngineCore when rapidly switching domains
2016-10-27 20:01:31 -07:00
Brad Davis
23fc865d40 Updates for min spec check 2016-10-27 19:28:46 -07:00
Thijs Wenker
2dcbe18e5b Fix for weird avatar Switch Vive -> Desktop mode 2016-10-28 04:07:20 +02:00
Anthony J. Thibault
1fc310434e Fix for crash in QtWebEngineCore when rapidly switching domains
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
Brad Davis
018d945b85 Display warning overlay instead of scene when below min spec 2016-10-27 15:51:26 -07:00