2788 commits

Author	SHA1	Message	Date
Seth Alves	e6ac07d43d	equipping mostly works	2017-08-15 11:45:45 -07:00
Seth Alves	b2d7eefc97	equip highlight works now	2017-08-15 10:30:47 -07:00
Seth Alves	774cb33303	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-15 09:17:52 -07:00
Seth Alves	b52a406ff1	trying to get equipping working	2017-08-14 18:25:57 -07:00
Seth Alves	13424eb792	kinematic-grab defaults to true	2017-08-13 17:42:08 -07:00
Seth Alves	9015d69c71	fix pop at start of far-grab	2017-08-13 17:21:55 -07:00
Seth Alves	f10dc7cbd5	allow far to near-grab transition	2017-08-13 16:54:37 -07:00
Seth Alves	58b199e9f9	far-grab sort-of works	2017-08-13 15:54:03 -07:00
Seth Alves	c2861d29d2	trying to get highlighting to work	2017-08-13 13:49:17 -07:00
Seth Alves	327bc23b5c	get ready for highlighting	2017-08-13 11:41:12 -07:00
Seth Alves	e7437d66ef	if a raypick hits something that's very close, put it into the nearby-entities list	2017-08-12 17:49:02 -07:00
Seth Alves	ec93172676	far-search rays work, but nothing else about far-grab.	2017-08-12 17:27:48 -07:00
Seth Alves	505b564c62	sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase	2017-08-12 13:14:00 -07:00
Seth Alves	92cb1c9bf2	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-12 12:40:18 -07:00
Seth Alves	9fb1835a26	grabbing overlays works, again	2017-08-12 12:38:36 -07:00
Seth Alves	7ae41064db	tablet stylus works again	2017-08-12 11:19:39 -07:00
Zach Fox	c38837c200	Remove fixmes	2017-08-11 16:21:39 -07:00
Zach Fox	a21ff75a49	Big progress!	2017-08-11 12:54:55 -07:00
Seth Alves	b4a54b017a	plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict	2017-08-11 12:15:41 -07:00
Zach Fox	080c6da71a	Get HFC balance from QmlCommerce API	2017-08-11 10:49:11 -07:00
Zach Fox	d2362e6329	addInventoryButton() under setting	2017-08-11 10:31:32 -07:00
Zach Fox	e1064938cd	Add inventory; also fix some bugs	2017-08-11 10:31:32 -07:00
Seth Alves	128be5c2c1	Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1	2017-08-11 08:52:47 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
howard-stearns	ca13d58b0b	blance and inventory stubs	2017-08-10 12:44:50 -07:00
Seth Alves	0d0f147056	port action-near-grab to dispatcher	2017-08-09 17:48:35 -07:00
Zach Fox	2d256a62a9	Fix marketplaces message passing	2017-08-09 17:04:36 -07:00
Seth Alves	5e3b573d19	Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher	2017-08-09 14:08:07 -07:00
Seth Alves	2c8aac53cd	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher	2017-08-09 14:05:49 -07:00
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -07:00
Howard Stearns	cc634a2d1b	Merge pull request #11148 from zfox23/commerce_singleSetting ... New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key	2017-08-09 13:25:10 -07:00
SamGondelman	6157f4fa55	script fixes	2017-08-09 11:56:25 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	33fa8c4f86	Fix bugs and also change to single setting	2017-08-09 11:44:09 -07:00
Zach Fox	61526256bc	Remove personalized comment	2017-08-09 09:30:18 -07:00
Zach Fox	9d60d5153f	Clarifying comment and turn setting off first	2017-08-08 18:00:17 -07:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	b2c5a1f899	Fancy MutationObserver!	2017-08-08 17:12:06 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Andrew Meadows	71ba6ba10a	Merge pull request #10807 from jmo7/21356 ... 21356 - Reorder Edit.js	2017-08-08 15:15:37 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
SamGondelman	684001a756	workaround deadlock in editRenderState	2017-08-08 11:11:19 -07:00
Zach Fox	1493a310af	Beginning of stack stuff	2017-08-07 17:02:24 -07:00
Zach Fox	7e922cb2c2	Layout	2017-08-07 16:16:17 -07:00
Zach Fox	517128a939	More steps	2017-08-07 16:03:42 -07:00
Zach Fox	d7dd331685	Bugfixes	2017-08-07 14:39:31 -07:00
Zach Fox	7d4fd995f2	First steps	2017-08-07 14:29:47 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00