18130 commits

Author	SHA1	Message	Date
David Rowe	492e98c31e	Fix up library link from Clara item page	2016-11-10 18:20:36 +13:00
David Rowe	5503adac3e	Display "image" option for each Clara marketplace item	2016-11-10 17:55:12 +13:00
David Rowe	84795439ea	Display Clara.io download information	2016-11-10 16:29:48 +13:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
samcake	f5fd4bf8d1	Merge pull request #9014 from jherico/texture_derez ... Re-enable downsampling for non-sparse textures	2016-11-09 17:18:03 -08:00
Brad Hefta-Gaub	770bf35d2b	CR feedback	2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub	cf3d1011f4	remove scripts from avatar attached entities for other avatars	2016-11-09 12:26:57 -08:00
Brad Davis	192c72ff99	Update menu, initial state for texture management	2016-11-09 12:09:25 -08:00
Howard Stearns	666d2dd2fc	Merge pull request #9031 from davidkelly/dk/2178 ... Log snapshot upload and user story creation errors	2016-11-08 12:11:16 -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
David Kelly	1766ebab2c	Added a bit more logging	2016-11-08 09:08:34 -08:00
Brad Hefta-Gaub	5454dca82e	Merge pull request #9030 from highfidelity/stable ... Update master with Stable hotfix	2016-11-07 18:48:54 -08:00
David Kelly	3105299670	Log snapshot upload and user story creation errors ... Plus, if the body of the error is empty, put something in there so the script will not think it was successful.	2016-11-07 18:13:10 -08:00
David Rowe	76de7bf03c	Fix typo	2016-11-08 13:53:37 +13:00
David Rowe	8cceda1cfe	Tidy UI text	2016-11-08 13:23:44 +13:00
David Rowe	afd2a900a3	Improve error handling for case that don't have permissions	2016-11-08 13:22:50 +13: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
Atlante45	f34cf64f3e	Disable updater on Steam	2016-11-07 16:09:56 -08:00
David Rowe	090065ee34	Add user feedback on download process	2016-11-08 13:05:35 +13: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
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
howard-stearns	84eb1721e7	fix numeric keyboard for hmd Window.prompt	2016-11-04 17:02:14 -07: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
David Rowe	d1e54a9217	Fix Clara download failing if move mouse after initiating download	2016-11-04 10:49:16 +13: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
David Rowe	427c8008c6	Merge branch 'master' into 21089	2016-11-03 09:18:25 +13:00