405 commits

Author	SHA1	Message	Date
sam gateau	9ada9a7ad3	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-11-07 12:07:15 -08:00
Alexander Ivash	82313f9464	update imports for utilities / all other qml files found	2018-11-06 14:21:14 +05:30
Wayne Chen	2296848fcb	Adding potential fix for showing audio stats - depends on PR#13401	2018-11-06 14:21:14 +05:30
sam gateau	4565422876	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-10-23 14:02:15 -07:00
Brad Hefta-Gaub	405b1d5725	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
Sam Gateau	7007abf6f9	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-22 20:02:25 -07:00
Alexander Ivash	64f67d5eb7	update imports for utilities / all other qml files found	2018-10-18 22:03:50 +03:00
Wayne Chen	aa8da5ade8	Adding potential fix for showing audio stats - depends on PR#13401	2018-10-18 21:05:20 +03:00
sam gateau	5f22928006	consolidating the tools under luci	2018-10-17 12:12:13 -07:00
sam gateau	4837fd86de	Desperataly trying to be efficient in js	2018-10-16 17:29:46 -07:00
divya	91df342ae9	Merge pull request #14094 from wayne-chen/interstitialMerged ... Merged interstitial page/redirect domain improvements	2018-10-08 10:32:29 -07:00
Sam Gateau	d1d4920c35	Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport	2018-10-01 21:35:18 -07:00
sam gateau	d8984dafa0	ui allows to enable/disable the deformer componenets	2018-09-21 16:45:21 -07:00
Dante Ruiz	d3368146ce	saving work	2018-09-21 11:42:26 -07:00
sam gateau	cae2c60e7f	Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off	2018-09-20 17:29:31 -07:00
sam gateau	d3ff4b8630	Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off	2018-09-20 17:26:26 -07:00
John Conklin II	b184ad1334	Merge pull request #13722 from wayne-chen/fixAudioStats-RC71-13955 ... MS13955: Audio Stats are blank	2018-09-10 17:03:31 -07:00
Sam Gateau	969d16262f	Removing cruft and warnings	2018-08-30 22:20:30 -07:00
sam gateau	194903692e	clening up the code in LODmanager and the associated js/qml	2018-08-30 18:09:11 -07:00
Sam Gateau	6c502e79e3	Fine tuning a LOD regulator PV that works	2018-08-29 22:56:44 -07:00
Sam Gateau	4844f06e5e	brain freeze	2018-08-29 17:33:39 -07:00
Wayne Chen	796a18a48a	Merge branch 'master' of https://github.com/highfidelity/hifi into fixAudioStats-RC71-13955	2018-08-29 16:13:54 -07:00
Sam Gateau	ed4dbaa4c7	Refining the plot widget to be able to represent negative values	2018-08-29 16:07:30 -07:00
Sam Gateau	37b4cf6223	Picking pid values	2018-08-28 17:39:35 -07:00
Sam Gateau	0da22db837	Picking pid values	2018-08-28 16:05:57 -07:00
Sam Gateau	7dfdc79644	Picking pid values	2018-08-28 12:21:15 -07:00
Sam Gateau	63eb57c741	Exploring PID again	2018-08-28 08:58:25 -07:00
Sam Gateau	d97d655148	USing a simpler halfTan test for culling	2018-08-26 23:17:29 -07:00
Sam Gateau	294fe51fde	Trying to simplify the LOD culling test	2018-08-24 16:48:23 -07:00
Sam Gateau	8f8bcc1901	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-24 15:23:37 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
Sam Gateau	57fd824005	working on the LOD behavior	2018-08-23 17:30:23 -07:00
Sam Gateau	cee9b90930	working on the LOD behavior	2018-08-23 16:48:42 -07:00
Sam Gateau	473f8d0ca5	Working on the LOD system	2018-08-23 11:39:47 -07:00
Wayne Chen	5cf6b57f7f	removing description - hassle-free fix	2018-08-21 17:25:21 -07:00
Wayne Chen	9a0807ee0e	Merge branch 'master' of https://github.com/highfidelity/hifi into fixAudioStats-RC71-13955	2018-08-21 16:16:07 -07:00
Sam Gateau	1914f1f103	Extending the default size of the regions to 16km	2018-08-21 10:10:39 -07:00
Sam Gateau	d5cfe95a0a	merging with master	2018-08-10 15:03:33 -07:00
John Conklin II	61f0e9323a	Merge pull request #13800 from samcake/zvork-shadow ... Fixing PR13731 shader error on Mac	2018-08-10 14:10:47 -07:00
SamGondelman	a0c3c09b05	Merge remote-tracking branch 'upstream/master' into bloom	2018-08-08 14:44:02 -07:00
Sam Gateau	16bf46ea34	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-08-08 14:22:52 -07:00
Sam Gateau	9295007d99	fixing the ui script and trying to get shadow	2018-08-08 09:22:31 -07:00
SamGondelman	6ff0b9d417	fix debug tools	2018-08-07 15:25:56 -07:00
Sam Gateau	09d33177fc	Adjust Workload and better representation of the workload debuging features	2018-08-06 15:36:25 -07:00
Olivier Prat	f2a01021f3	Improvement of debug shadow script	2018-08-03 18:01:22 +02:00
Wayne Chen	f19a553e27	adding fix for HMD mode	2018-07-31 10:49:30 -07:00
Wayne Chen	b020e17ee7	rectifying toggle graph behavior	2018-07-31 10:46:19 -07:00
Wayne Chen	78001a4e31	adding fix	2018-07-30 18:44:39 -07:00
Andrew Meadows	222756371e	set max region radiuses in workload UI	2018-06-18 10:31:41 -07:00
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00