25 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	eeb08fb401	Merge pull request #8014 from imgntn/leaphands ... add leap hands to /system	2016-06-04 16:43:30 -07:00
James B. Pollack	da023bfbe3	leap	2016-06-03 15:40:04 -07:00
howard-stearns	a3f1ece978	Do button mapping in C++ and simplify vive.json accordingly. Vive and ... Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.	2016-05-24 16:10:12 -07:00
howard-stearns	fdcd667d3c	Fix hand controller pointer after input changes.	2016-05-23 13:33:42 -07:00
Brad Hefta-Gaub	5906f88226	Merge pull request #7952 from sethalves/fix-walking-far-grab ... fix distance-grabbing and walking at the same time	2016-05-20 16:54:52 -07:00
Seth Alves	a24d63a39c	make distance-grab work better when avatar is walking	2016-05-20 15:45:00 -07:00
howard-stearns	c299aef8f2	fix 588, 558	2016-05-20 12:15:30 -07:00
Brad Hefta-Gaub	8ff7af28be	Merge pull request #7925 from sethalves/overlay-or-grab-not-both ... fix mouse-grab moving both an overlay and an entity at the same time	2016-05-19 17:38:32 -07:00
Brad Hefta-Gaub	53956c8210	reduce log spam	2016-05-19 07:50:06 -07:00
Seth Alves	b4df7cada7	don't mouse-grab things through an overlay	2016-05-18 16:16:31 -07:00
howard-stearns	fa90d823d5	Turn off hand-controller pointer when Interface doesn't have focus.	2016-05-18 11:49:12 -07:00
Seth Alves	009c288745	revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out	2016-05-12 13:29:40 -07:00
Brad Hefta-Gaub	757eea16a6	Merge pull request #7809 from howard-stearns/hand-controller-pointer ... Hand controller pointer	2016-05-10 16:37:26 -07:00
Howard Stearns	64dc31cd61	switch statement whitespace	2016-05-10 09:43:00 -07:00
Howard Stearns	2b3f6506b7	more whitespace	2016-05-10 09:38:39 -07:00
howard-stearns	9edd18c017	Fix mouse seek bugs.	2016-05-09 14:05:59 -07:00
howard-stearns	6f4204ca5b	Remove alert for route remapping on hardware change.	2016-05-09 11:41:00 -07:00
Seth Alves	9db839bc13	don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0	2016-05-04 15:01:00 -07:00
Seth Alves	44beca1687	try having all spring derived actions agree on a target	2016-05-04 11:29:17 -07:00
howard-stearns	fdf9c0a217	Fix offset so that non-full-size window can be located anywhere on screen.	2016-05-03 16:26:45 -07:00
howard-stearns	eb0517f3cd	fix updateSeeking	2016-05-03 14:36:52 -07:00
Howard Stearns	5bd77bf343	Matching "final" version of test script.	2016-05-03 13:23:04 -07:00
Howard Stearns	773770a7fc	All but origin-correction.	2016-05-03 07:01:23 -07:00
Seth Alves	ec554c3c0b	Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes	2016-05-01 17:28:20 -07:00
James B. Pollack	06171f6063	move default to system	2016-04-26 14:47:02 -07:00