6436 commits

Author	SHA1	Message	Date
David Rowe	7dba2e6a2e	Merge branch 'master' into M17428-f	2018-09-08 12:45:11 +12:00
David Rowe	8eeed772eb	Update button layout	2018-09-08 12:40:36 +12:00
David Rowe	c0a153482a	Update mini tablet model	2018-09-08 11:55:47 +12:00
John Conklin II	e578b047b0	Merge pull request #13838 from danteruiz/fix-hmd-debug-window ... fixing scripting window visiblity and size issues	2018-09-07 11:47:44 -07:00
David Rowe	f206a8f158	Display mini tablet on hand being gazed at if there is a choice	2018-09-07 19:43:51 +12:00
David Rowe	12454d7ec7	Increase mini tablet grow/shrink time	2018-09-07 16:48:36 +12:00
David Rowe	f3cbca6cee	Change "bubble" button to "goto"	2018-09-07 16:43:21 +12:00
David Rowe	d0e73b00f7	Restructure mini tablet code	2018-09-07 15:41:30 +12: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	9e2a540bab	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-30 12:12:24 -07:00
John Conklin II	f5ebdfa233	Merge pull request #13905 from zfox23/fixPr13870 ... Fixup PR13870: Make the feature work in Master	2018-08-30 11:08:23 -07:00
Sam Gateau	6c502e79e3	Fine tuning a LOD regulator PV that works	2018-08-29 22:56:44 -07:00
David Rowe	73253977fe	Merge branch 'M17428-c' into M17428-d ... # Conflicts: # scripts/system/miniTablet.js	2018-08-30 16:21:31 +12:00
David Rowe	ec20fb7edb	Reorient and reposition mini tablet	2018-08-30 16:16:49 +12:00
David Rowe	a01a5e3b39	Merge branch 'M17428-c' into M17428-d	2018-08-30 13:44:02 +12:00
David Rowe	a5c3450bfc	Tweak mini tablet UI layout	2018-08-30 13:43:31 +12:00
Sam Gateau	4844f06e5e	brain freeze	2018-08-29 17:33:39 -07:00
Zach Fox	b8cd5dd8b9	Fixup PR13870: Make the feature work in Master	2018-08-29 16:58:19 -07:00
Sam Gateau	349f782697	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-29 16:07:50 -07:00
Sam Gateau	ed4dbaa4c7	Refining the plot widget to be able to represent negative values	2018-08-29 16:07:30 -07:00
John Conklin II	7298cb4654	Merge pull request #13888 from dback2/editControllerMapping ... Edit mode controller mapping using new platform state variables	2018-08-29 16:06:47 -07:00
John Conklin II	47ce8be526	Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 ... MS16847: Tablet button doesn't load in HMD mode	2018-08-29 13:20:04 -07:00
David Back	96d2ba660c	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-29 12:05:51 -07:00
David Back	0e53fa3f8b	only focus with selection	2018-08-29 12:05:46 -07:00
David Back	dcf2074d7e	remove [ camera key, allow F to enter camera without selection	2018-08-29 11:56:37 -07:00
David Rowe	c6d0ad39c0	Merge branch 'M17428-c' into M17428-d	2018-08-29 22:13:43 +12:00
David Rowe	15fcafa2f5	Use SVGs for buttons	2018-08-29 22:13:09 +12:00
David Rowe	b338c9f6fa	Updated tiny table model and layout	2018-08-29 22:10:24 +12: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
David Rowe	91c1e1b276	Different expansion points and delta rotations if grabbed by other hand	2018-08-29 09:59:04 +12:00
David Rowe	f5c49026ab	Expand tablet after it's been released from grab by other hand	2018-08-29 09:49:42 +12:00
David Rowe	49f5d5f2b7	Display mini tablet rotated in palm	2018-08-29 08:55:46 +12:00
David Rowe	e5c733e7f2	Merge branch 'master' into M17428-c	2018-08-29 08:20:00 +12: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
David Back	511478a563	use not Mac instead of Windows	2018-08-27 18:11:19 -07:00
David Back	f81fe6b29f	add more inputs to controller mapping	2018-08-27 16:35:36 -07:00
Seth Alves	52bbb4d2ab	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
David Back	b6edb2c9d6	platform states, edit controller mapping, separate mac/win delete	2018-08-27 14:53:13 -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	699240027e	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2018-08-23 19:29:14 -07:00
Howard Stearns	9a472fa388	Merge pull request #13870 from zfox23/wallet_autologout ... Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 18:04:38 -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
Zach Fox	dddb2141f0	Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 15:45:29 -07:00