1782 commits

Author	SHA1	Message	Date
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
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
Ryan Huffman	5326202313	Update help image for gamepad to include Note	2016-10-27 10:54:49 -07:00
Brad Hefta-Gaub	863bf067b7	Merge pull request #8893 from jherico/texture_force_sparse ... Changes to texture loading rules	2016-10-25 18:22:42 -07:00
Brad Hefta-Gaub	b0b950e132	Merge pull request #8898 from ctrlaltdavid/fix-overlaywebwindow-keyboard ... Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes	2016-10-25 17:59:46 -07:00
Brad Davis	ce627eeea1	Updated metrics	2016-10-25 17:49:51 -07:00
Brad Hefta-Gaub	001cfc7e15	Merge pull request #8901 from samcake/blue ... Adding more detailed counters for texture memory consumption	2016-10-25 16:19:56 -07:00
samcake	507d3e5a39	IMprove the counting and namoing of the new couters the gl swapchain	2016-10-25 12:28:07 -07:00
sam	6b2b68e691	trying to add counters for the default FBO	2016-10-25 03:36:23 -07:00
David Rowe	34b9d3eecc	Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes	2016-10-25 20:25:34 +13:00
Brad Hefta-Gaub	62f63f32a7	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers	2016-10-24 20:24:29 -07:00
samcake	58b81e3b0c	Adding counter for the amount of memory used in texture for Framebuffers	2016-10-24 18:34:16 -07:00
Clément Brisset	dd45500313	Merge pull request #8891 from huffman/fix/disconnected-dialog-updates ... Fix several aspects of the "disconnected" dialog	2016-10-24 15:39:16 -07:00
Ryan Huffman	e7023b3d99	Add ConnectionFaiureDialog qml	2016-10-24 10:52:46 -07:00
Brad Hefta-Gaub	0f8967970a	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers	2016-10-24 08:11:31 -07:00
Brad Davis	861b69aa94	Add free GPU memory to the displayed stats	2016-10-23 13:07:38 -07:00
Brad Davis	62de2af944	Add more GPU stats, make stats easier to read	2016-10-22 14:38:46 -07:00
Brad Hefta-Gaub	ee1f3ac38c	Merge pull request #8881 from jherico/offscreen_texture_memory_stats ... Report offscreen texture memory usage in stats	2016-10-21 19:15:59 -07:00
Anthony J. Thibault	c431c69d60	Merge branch 'master' into feature/controller-display	2016-10-21 13:48:07 -07:00
Brad Davis	1bd398ae5e	Report offscreen texture memory usage in stats	2016-10-21 11:31:37 -07:00