18093 commits

Author	SHA1	Message	Date
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
Seth Alves	24556fc70d	Merge pull request #8980 from huffman/feat/default-to-hmd ... Update interface to default to HMD display plugin	2016-11-07 13:36:39 -08:00
Atlante45	ae29fe8ab2	Logging improvements	2016-11-04 14:26:19 -07:00
samcake	449add6b34	Fix bad variable initialization	2016-11-04 13:29:27 -07:00
Ryan Huffman	0cec62b3a3	Revert "Update interface to default to HMD display plugin" ... This reverts commit bbef071723.	2016-11-04 12:27:15 -07:00
Ryan Huffman	0dac2c999e	Revert "Remove unused 'first' variable" ... This reverts commit 26e0d02d60.	2016-11-04 12:27:04 -07:00
Ryan Huffman	3ad9c1a797	Add check to go into HMD on first run if available	2016-11-04 12:26:20 -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
samcake	3db1831841	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2016-11-04 09:59:28 -07:00
samcake	7655f906f1	Starting adding a timer for the frame	2016-11-03 19:26:30 -07:00
howard-stearns	c5ee1941d1	raise desktop when showing it	2016-11-03 17:02:47 -07:00
Brad Hefta-Gaub	7cca8f0a66	Merge pull request #8993 from samcake/blue ... Prevent sparse texture on AMD gpus for now	2016-11-03 16:48:52 -07:00
samcake	1086585559	fixing the test to actually capture ati correctly and add the report to the ui	2016-11-03 15:15:05 -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
Brad Hefta-Gaub	206f1ead1a	Merge pull request #8990 from howard-stearns/centered-toolbar ... centered toolbar	2016-11-03 14:18:32 -07:00
howard-stearns	b6e440f891	delete this and formatting	2016-11-03 13:26:50 -07:00
howard-stearns	7c45a78cb0	Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file	2016-11-03 13:17:47 -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	e9e1d0cb2f	Remove erroneous exclamation mark	2016-11-03 11:10:32 -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
Ryan Huffman	3d160cca75	Merge pull request #8969 from huffman/feat/task-manager-app-name ... Add "High Fidelity" to sandbox and interface description in Windows Task Manager	2016-11-02 14:21:19 -07:00
Dante Ruiz	a948e03ed8	changed old icon to new icon	2016-11-02 08:23:10 -07:00
Ryan Huffman	26e0d02d60	Remove unused 'first' variable	2016-11-01 16:40:41 -07:00
Ryan Huffman	bbef071723	Update interface to default to HMD display plugin	2016-11-01 16:23:53 -07:00
Zach Fox	b98c6cb50f	Change 'Snapshot' to 'snapshot' and use smaller font	2016-11-01 14:49:18 -07:00
howard-stearns	52cc03c5a2	Get snapshot location data from file, which now uses shareable place info.	2016-11-01 14:44:39 -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
Ryan Huffman	5f8cee787f	Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename	2016-11-01 09:07:56 -07:00
Ryan Huffman	0cc98d4501	Add VersionInfo.rc to interface	2016-11-01 09:00:08 -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
Chris Collins	3b6faefe05	Merge pull request #8931 from sethalves/possible-fix-for-2068 ... Possible fix for 2069	2016-10-31 10:21:01 -07:00
Brad Hefta-Gaub	8fbac58091	remove mute icons	2016-10-30 09:33:02 -07:00
Seth Alves	3ad748cfe2	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 16:41:39 -07:00
Stephen Birarda	207d26091c	Merge pull request #8953 from Atlante45/being-of-light ... Update being of light model	2016-10-28 15:36:19 -07:00
Chris Collins	d9d9119dcb	Merge pull request #8951 from zzmp/fix/crash-on-web-wasapi ... fix crash on shutdown from web audio captures	2016-10-28 15:23:39 -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
Zach Pomerantz	be23668ca8	delete websurfaces on shutdown	2016-10-28 14:29:52 -07:00
Seth Alves	e15043754c	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 11:36:09 -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