Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 12:07:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41961 commits 25 branches 0 tags 1.1 GiB
Commit graph

555 commits

Author SHA1 Message Date
Anthony Thibault
8b979b67ee neruonAvatar.js: now sets rotations in correct frame. 
The rotations from the neuron are effectively in world space and are deltas
from the default pose.

There still is an issue with the thumb, due to the missing joint from the Neuron.
The Neuron only has 3 thumb joints, not 4.
 2015-12-24 17:16:49 -08:00
Anthony J. Thibault
c44f69b370 WIP checkpoint 
Changed euler angle compisition based on experiments in maya.
Also, the neuronAvatar.js attempts to transform the neuron input quaternions into
a pose relative to the avatar's default pose, but doesn't it doesn't work.
 2015-12-23 17:13:52 -08:00
ericrius1
cd983db419 fixed merge conflicts 2015-12-23 15:13:45 -08:00
ericrius1
b4988b0998 Taking individual avatar hand size into consideration for grabbing objects 2015-12-23 15:09:10 -08:00
Brad Hefta-Gaub
f8a515de64 add a test script for HMD.getHUDLookAtPositionXX() 2015-12-23 14:46:18 -08:00
AlessandroSigna
2c72e7964d Fix assignment 2015-12-23 13:54:06 -08:00
Thijs Wenker
505f4ce7e4 Merge branch 'master' of https://github.com/worklist/hifi into 20736 
Conflicts:
	examples/controllers/handControllerGrab.js
 2015-12-23 02:37:38 +01:00
James B. Pollack
4115138b5b fix merge problems 2015-12-22 17:22:55 -08:00
Anthony J. Thibault
6afe3bae5e Copy Neuron joints into controller poses 
This makes the accessible for controller mapping and to JavaScript.

Added 'neuronAvatar.js' as an example of reading joints from the neuron and setting them
on the avatar.  NOTE: the rotations are currently in the wrong coordinate frame.
 2015-12-22 17:21:33 -08:00
James B. Pollack
64eb22bf22 merging 2015-12-22 16:34:01 -08:00
James B. Pollack
edd11a670a minor adjustments to particles 2015-12-22 14:38:53 -08:00
James B. Pollack
60f2314469 remove debugging print 2015-12-22 14:38:05 -08:00
Brad Davis
a6d9dbc5c4 Merge pull request #6728 from ZappoMan/rightClickMenu 
More Hand Reticle movement improvements
 2015-12-22 14:00:42 -08:00
Brad Hefta-Gaub
9a3d72c7b6 tweak sleep cycle slightly 2015-12-22 13:55:01 -08:00
Brad Hefta-Gaub
119f3e9895 make both hands and mouse work 2015-12-22 13:35:16 -08:00
James B. Pollack
7bc7bddc3a set defaults 2015-12-22 12:00:45 -08:00
James B. Pollack
80e8fcf502 Merge branch 'master' into particle_grab 2015-12-22 11:49:51 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Thijs Wenker
c62ff3e5be Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-22 14:14:04 +01:00
Brad Hefta-Gaub
025e769a9f average both hands, enabled both mouse clicks, and detect base station resting hand 2015-12-21 18:25:30 -08:00
Brad Hefta-Gaub
da86686533 fix reticle drive 2015-12-21 17:10:01 -08:00
ericrius1
1cdee11784 Merge branch 'master' into polylineOptimizations 2015-12-21 12:49:00 -08:00
Thijs Wenker
5d1e5b054a Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-21 21:48:55 +01:00
Brad Hefta-Gaub
248b3d09ac add absolute rotation based hand reticle movement 2015-12-21 10:49:49 -08:00
ericrius1
45ba7a3d35 merged 2015-12-21 10:46:54 -08:00
ericrius1
0dd7287e61 mergedq 2015-12-21 10:46:45 -08:00
ericrius1
7a7befafb9 arc balls working 2015-12-21 10:43:59 -08:00
Brad Hefta-Gaub
e929e3f789 more work on angular velocity tests 2015-12-18 19:20:32 -08:00
ericrius1
1beec0dbe7 balls 2015-12-18 18:15:05 -08:00
Brad Hefta-Gaub
a621579f17 add philips version of hand movement 2015-12-18 15:44:21 -08:00
Brad Hefta-Gaub
4075f355a3 more work on hand movement 2015-12-18 15:44:01 -08:00
James B. Pollack
387c30d83f close button 2015-12-18 15:04:13 -08:00
Brad Hefta-Gaub
5701ad2e8c update to new angular velocity 2015-12-18 12:38:50 -08:00
Brad Hefta-Gaub
762aefbbca add hand driven reticle 2015-12-17 17:38:20 -08:00
James B. Pollack
a25feb5578 switching branches 2015-12-17 16:58:38 -08:00
James B. Pollack
8e2128c692 update light volume when you move light parent 2015-12-17 11:59:21 -08:00
Brad Hefta-Gaub
63a63152a4 add procedural hand pose example 2015-12-17 11:10:49 -08:00
James B. Pollack
5cc5a2ab33 working non kinematic release 2015-12-17 10:58:14 -08:00
James B. Pollack
cd911b31d2 dont accidentally constrain all objects 2015-12-17 10:26:54 -08:00
Brad Hefta-Gaub
0b9bd858a7 implement support for pose ScriptEndpoints 2015-12-16 21:28:27 -08:00
James B. Pollack
40a096ca8d kinematic grab things 2015-12-16 14:34:01 -08:00
James B. Pollack
e37d68449b rename folder 2015-12-16 13:57:40 -08:00
James B. Pollack
b09575dc40 Merge branch 'master' into light_mod 2015-12-16 09:56:17 -08:00
James B. Pollack
9a2d9997e9 prep for feedback 2015-12-15 18:20:12 -08:00
James B. Pollack
d4f55ed6d2 working lsiders 2015-12-15 15:55:03 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
James B. Pollack
e3e1bc1dc6 updates 2015-12-14 13:01:44 -08:00
James B. Pollack
76487bca7a updates 2015-12-14 13:01:03 -08:00
James B. Pollack
4d9cb6a6df other variations 2015-12-14 11:41:34 -08:00
James B. Pollack
e43b60f9f5 other variations 2015-12-14 11:40:47 -08:00
James B. Pollack
a0b698c028 reorg props 2015-12-12 17:33:54 -08:00
James B. Pollack
0ddc2ba76e rename lasers to lines 2015-12-12 16:18:15 -08:00
James B. Pollack
fe05542440 more vis 2015-12-12 14:30:34 -08:00
Thijs Wenker
cfd2c2785c Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-12 21:16:02 +01:00
Thijs Wenker
cb948e0608 allow entity scripts to attach entities to a hand with handControllerGrab.js 2015-12-12 21:15:06 +01:00
James B. Pollack
70a0e51cc9 back to default state 2015-12-11 17:59:03 -08:00
James B. Pollack
1b1edf6f7a actually delete lights now that it doesnt crash 2015-12-11 17:23:35 -08:00
James B. Pollack
11aaeb1ec0 only create particle beams if set 2015-12-11 14:48:07 -08:00
James B. Pollack
4e9d81f187 add support for various beam visualizations 2015-12-11 11:38:16 -08:00
James B. Pollack
2acc0df1f0 beams with spotlights 2015-12-10 17:39:29 -08:00
James B. Pollack
16ab7e74de cleanup spotlights 2015-12-10 16:53:13 -08:00
James B. Pollack
efaa30a509 rotatable light 2015-12-10 16:18:40 -08:00
James B. Pollack
9fc456697e merge 2015-12-10 14:30:55 -08:00
James B. Pollack
c3e9cde7fb beamz 2015-12-10 13:44:53 -08:00
James B. Pollack
1000b60280 far beams 2015-12-10 12:21:50 -08:00
James B. Pollack
31526091d3 create beams at start 2015-12-10 11:13:35 -08:00
James B. Pollack
1134d12ea0 particles 2015-12-09 16:08:32 -08:00
Atlante45
65bc6aa371 Fix left hand grab 2015-12-09 14:25:18 -08:00
James B. Pollack
2fb318cc53 work with clements branch 2015-12-08 17:52:23 -08:00
Leonardo Murillo
5d789095b5 Merge pull request #6570 from ctrlaltdavid/20740 
Update Leap Motion script to use animation state handlers
 2015-12-07 16:37:42 -08:00
David Rowe
404deba78d Adjust avatar thumb root joint angle to look better 2015-12-05 16:26:21 +13:00
David Rowe
560b9f012f Get hand positioning and orientation working again 2015-12-05 16:25:28 +13:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Seth Alves
4246672813 enable head-moving of distance grabbing 2015-12-04 10:38:24 -08:00
Seth Alves
17b5ade9c0 allow moving distantly grabbed objects with head 2015-12-03 16:45:46 -08:00
Seth Alves
a600df5ea6 try a different method of exagerating hand motion onto distanly held object 2015-12-03 16:04:39 -08:00
David Rowe
a0dcf72a3b Use animation handlers to control hand position and orientation 2015-12-03 14:09:46 +13:00
David Rowe
0f3722a05c Fix Leap Motion calibration avatar pose 2015-12-03 13:14:22 +13:00
Eric Levin
34234da2d1 fixed spacing 2015-12-01 17:05:51 -08:00
ericrius1
40fb45c6d3 fixed accidental newline in handgrab 2015-12-01 17:04:10 -08:00
ericrius1
0fd1bdaec5 fixed accidental newline in handgrab 2015-12-01 17:03:11 -08:00
ericrius1
e4199439af added collision sounds to some toys 2015-12-01 17:00:43 -08:00
Eric Levin
948479b0e8 Merge pull request #6517 from imgntn/disable2hands 
Support disabling both hands in handControllerGrab.js
 2015-12-01 16:25:23 -08:00
James B. Pollack
aca0fa7beb support disabling both hands 2015-12-01 16:03:19 -08:00
James B. Pollack
52d6fdac1a Merge pull request #6487 from ctrlaltdavid/20740 
Get the Leap Motion working again
 2015-12-01 15:40:48 -08:00
Atlante45
c4e43c4e0b Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball 2015-12-01 15:16:05 -08:00
Atlante45
97454ae446 Update handControllerGrab.js 2015-12-01 14:32:59 -08:00
Seth Alves
e0eae23dd3 Merge pull request #6515 from imgntn/personal_lasers 
Personal lasers in handControllerGrab.js
 2015-12-01 13:29:05 -08:00
James B. Pollack
31d2f6463f cleanup 2015-12-01 13:03:51 -08:00
James B. Pollack
25422084b9 make it so that only you can see your beams until youre grabbing something 2015-12-01 13:02:40 -08:00
Philip Rosedale
8e40889068 Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion 
possible fix for observers not seeing a held entity moving
 2015-12-01 11:41:08 -08:00
Seth Alves
7f95e1eec6 make sure observed held objects are active in bullet, disable equip spring action 2015-12-01 10:49:07 -08:00
James B. Pollack
1ba6bfa2e0 lazers 2015-11-30 18:58:53 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
James Pollack
55f797838f remove unused key 2015-11-28 23:22:00 -08:00
James Pollack
1e2398cbea use constants 2015-11-28 23:04:52 -08:00
James Pollack
1315201bdc update name of function 2015-11-28 22:55:44 -08:00
James Pollack
8f51ee6f58 rename hand disabler 2015-11-28 22:29:12 -08:00
James B. Pollack
9ec2a01475 isolate grab script changes from bow branch 2015-11-27 12:13:53 -08:00
David Rowe
6e076985f2 JSLint 2015-11-25 16:46:53 +13:00
David Rowe
46cbc349d1 Fix laserPointer.js for Hydras 
Leap Motion working already.
 2015-11-25 16:39:09 +13:00
David Rowe
566b27156c Fix hand and finger joint control in leapHands.js for HMD mode 2015-11-25 15:45:33 +13:00
David Rowe
6736eefbc1 Fix arm and finger joint control in leapHands.js for desktop mode 2015-11-25 14:14:22 +13:00
James B. Pollack
23f10659b0 update to new trigger method 2015-11-24 14:00:23 -08:00
James B. Pollack
6f76f0cbc0 release grasp at cleanup 2015-11-19 16:22:54 -08:00
James B. Pollack
3f89d73fc6 add grasp to equip and example 2015-11-19 16:15:34 -08:00
ericrius1
4bf1c36fd6 Firing works 2015-11-18 14:32:49 -08:00
ericrius1
aed5629eca equipping 2015-11-18 12:50:42 -08:00
ericrius1
47c2119888 Adding generic pistol 2015-11-18 12:25:36 -08:00
Seth Alves
94f18672d4 equip from a distance uses a spring to pull the object to the hand before equipping it 2015-11-17 17:18:16 -08:00
Seth Alves
5ae3c5aea0 adjust size of near-grab radius. 2015-11-17 14:59:06 -08:00
Seth Alves
c6051bb325 reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab 2015-11-17 14:58:20 -08:00
Seth Alves
d21a2fee20 don't use spatial-key for normal grab, only equip. allow switching from a near or far grab to an equip. 2015-11-17 13:12:22 -08:00
Seth Alves
b062d23f61 bumper is now an equip toggle 2015-11-17 09:51:52 -08:00
Seth Alves
8a434c8ab1 don't attempt to near-grab things that aren't physical 2015-11-09 14:10:26 -08:00
James B. Pollack
bf4320e5cc re-add this example 2015-11-06 22:55:33 -08:00
AlessandroSigna
715b183a3c unified two ways to do the mapping in a single JS 2015-11-05 19:10:06 -08:00
AlessandroSigna
f9ebbea585 Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS 2015-11-05 19:09:49 -08:00
Seth Alves
c4194f2359 don't try to grab polylines. set wantTrigger on various whiteboard parts 2015-11-05 13:26:23 -08:00
Seth Alves
4a3b434fd4 change grabbing-non-colliding to trigger. fix whiteboard and some other scripts 2015-11-05 10:35:02 -08:00
Brad Davis
86b852231e Merge pull request #6286 from EdgarPironti/master 
Spacemouse migration
 2015-11-04 19:15:35 -08:00
AlessandroSigna
eac73671e0 Added some documentation and examples for the new mapping system 2015-11-04 17:40:35 -08:00
Seth Alves
05a977e31b get rid of code that computes release velocity 2015-11-04 16:26:30 -08:00
Seth Alves
adb9118dc1 don't set release velocity 2015-11-04 16:21:02 -08:00
Seth Alves
1cbe6c4463 don't attempt to grab particles or zones 2015-11-04 13:59:37 -08:00
Seth Alves
c2f9a49598 don't grab light 2015-11-04 11:15:57 -08:00
Seth Alves
1e498a41f0 rework search logic 2015-11-04 10:46:20 -08:00
EdgarPironti
ade0862948 Spacemouse fixes 2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-04 00:36:38 -08:00
Brad Davis
439bdbc0e4 Merge pull request #6298 from samcake/controllers 
Controllers : Removing dead files
 2015-11-03 19:57:37 -08:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 18:22:29 -08:00
Atlante45
d8797ef9d7 Initialize relativePosition/Rotation 2015-11-03 16:07:37 -08:00
samcake
57bc2f3093 Removing dead js files 2015-11-03 15:37:36 -08:00
Stephen Birarda
8346ce27b3 allow a non-colliding grab of locked entities 2015-11-03 14:22:41 -08:00
EdgarPironti
d99838de9c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 12:25:19 -08:00
Seth Alves
27b239176f fix grab 2015-11-03 10:16:56 -08:00
EdgarPironti
5d695da630 Do not merge - Spacemouse 2015-11-02 23:31:10 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu 
add example of overriding default rightClick behavior
 2015-11-02 18:58:12 -08:00
Seth Alves
fe2c0effd0 oops left debug on 2015-11-02 16:17:46 -08:00
Seth Alves
0a5f43bba7 fix up boolean test 2015-11-02 16:16:13 -08:00
Seth Alves
181901ed19 distance grab works better with hmd on 2015-11-02 14:42:28 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
Brad Hefta-Gaub
286905c20c Merge pull request #6250 from jherico/peek 
Adding peek support for endpoints
 2015-10-31 16:09:27 -07:00
Seth Alves
9346366fc5 fix grab script 2015-10-31 14:28:54 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
46f9a432ab fix handControllerGrab.js 2015-10-31 14:21:50 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
Seth Alves
944f0965c0 some refactoring and a bug fix -- grab script can throw things again 2015-10-30 16:35:50 -07:00
Seth Alves
cf83ca22bb change how kinematic objects get data back to entity when an action is active 2015-10-30 15:30:54 -07:00
Seth Alves
b102081f2f upon release, set velocity after returning entity to being dynamic 2015-10-30 11:35:51 -07:00
Seth Alves
93503d0a21 make kinematic grab set entities kinematic in bullet and update entity position 2015-10-30 11:03:13 -07:00
Brad Davis
f21633e368 Merge pull request #6222 from ZappoMan/hardwareChanged 
Handle input plugin register/remove when activated/deactivated by menus
 2015-10-29 12:24:17 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
samcake
b90af1a1ce Fixing typo and review comments 2015-10-28 13:21:45 -07:00
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns 
Controller Branch - Fix gun.js
 2015-10-26 10:51:08 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
3e50174114 Updating gun.js to new controller API 2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub
394511ac1b fix frisbee.js to work with new API 2015-10-24 09:50:09 -07:00
Brad Hefta-Gaub
6cffe8cb6a Merge pull request #6169 from EdgarPironti/controllers2 
fix toyball.js
 2015-10-23 20:21:00 -07:00
samcake
eae316100a Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 18:18:27 -07:00
samcake
d400c694f6 Cleaning up for release 2015-10-23 18:09:54 -07:00
Brad Davis
304fe49628 Merge pull request #6170 from ZappoMan/fixScripts 
various controller script updates
 2015-10-23 17:43:54 -07:00
Brad Hefta-Gaub
060f87d14a CR feedback 2015-10-23 17:33:45 -07:00
samcake
be843a0035 adding a rnning average on the velocity values returned by the hydra and adding a simple js to test 2015-10-23 17:32:54 -07:00
EdgarPironti
0959c98132 Fixed tab 2015-10-23 17:26:44 -07:00
Brad Hefta-Gaub
9ba1b800d9 CR feedback 2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub
090dc5409b CR feedback 2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub
ed20e7d209 CR feedback 2015-10-23 17:14:13 -07:00
EdgarPironti
c64290b5cd Removed unused variables 2015-10-23 17:13:29 -07:00
Brad Hefta-Gaub
6b795364c8 make handGrab treat shoulder bumbers and triggers as merged control 2015-10-23 16:30:40 -07:00
EdgarPironti
5c09391170 fix toyball.js 2015-10-23 16:19:40 -07:00
AlessandroSigna
5d8d8c8f0d Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 15:50:39 -07:00
AlessandroSigna
37e1e43ce0 Fix paddleBall.js 2015-10-23 15:48:29 -07:00
Brad Hefta-Gaub
7e3192d0f6 fix drumstick.js 
fix drumstick.js
 2015-10-23 14:22:50 -07:00
AlessandroSigna
6001968d92 Fix paddleBall.js 2015-10-23 13:52:22 -07:00
AlessandroSigna
c2078aca3f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 11:27:16 -07:00
Brad Davis
63df9fb959 Fixing raw sound playback and air guitar 2015-10-22 22:37:18 -07:00
AlessandroSigna
ae2f7f6ff6 Fix paddleBall.js 2015-10-22 18:50:23 -07:00
Brad Davis
103fe3c545 Merge pull request #6155 from ZappoMan/fixScripts 
fix airGuitar.js
 2015-10-22 18:19:26 -07:00
samcake
2db87e0d2d Remove hydramove.js and expose the velocity and angular Velocity for hydra 2015-10-22 15:55:36 -07:00
Brad Hefta-Gaub
c826b48c92 fix airGuitar.js 2015-10-22 15:05:59 -07:00
Brad Hefta-Gaub
3e7364608b make handControllerGrab.js work with new API 2015-10-22 09:17:29 -07:00
Brad Davis
21a3079a39 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-21 10:05:32 -07:00
Seth Alves
f85ef9267b oops 2015-10-20 18:29:27 -07:00
Seth Alves
311254c395 require user-data to have wantsTrigger in it before non-colliding calls will happen 2015-10-20 18:26:12 -07:00
samcake
e0615309bb Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 17:48:38 -07:00
Brad Davis
0e419e3fbb Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 17:47:37 -07:00
Seth Alves
7dcbb5849a another bug 2015-10-20 17:44:12 -07:00
Seth Alves
ed480f651f missed a line 2015-10-20 17:43:31 -07:00
Seth Alves
f16b62df83 - grab script: possible fix for line disappearing 
- grab script: go from 3 pickrays back to 1
- grab script: put "sphere" test back in, but with fixed distance test
 2015-10-20 17:34:35 -07:00
James B. Pollack
8e1c3c32d1 additions to debug and also to handle some two handed situations 2015-10-20 16:24:17 -07:00
samcake
16f96715a3 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 10:16:08 -07:00
Brad Davis
8d0148a1ca Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 10:13:31 -07:00