EdgarPironti
|
d99838de9c
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-11-03 12:25:19 -08:00 |
|
Brad Hefta-Gaub
|
b366011d22
|
Merge pull request #6293 from jherico/lisa
Disabling billboard rendering, source of the evil black rectangles
|
2015-11-03 12:13:51 -08:00 |
|
Brad Davis
|
4c076d8b12
|
Disabling billboard rendering, source of the evil black rectangles
|
2015-11-03 11:34:05 -08:00 |
|
Stephen Birarda
|
db7bb61209
|
Merge pull request #6288 from sethalves/fix-grab-some-more
fix grab
|
2015-11-03 11:10:14 -08:00 |
|
Brad Davis
|
27551b8532
|
Merge pull request #6289 from thoys/patch-6
Fix: Vec3.UP was pointed to Vectors::UNIT_X
|
2015-11-03 10:29:03 -08:00 |
|
samcake
|
78e3f8ebbc
|
Merge pull request #6281 from AlessandroSigna/master
Vive - fix input drifting
|
2015-11-03 10:19:59 -08:00 |
|
Thijs Wenker
|
73d7fd4648
|
Fix: Vec3.UP was pointed to Vectors::UNIT_X
This fixes the scripting property Vec3.UP to point to Vectors::UP which is equal to {X: 0, Y: 1, Z: 0}.
|
2015-11-03 19:19:12 +01:00 |
|
Seth Alves
|
27b239176f
|
fix grab
|
2015-11-03 10:16:56 -08:00 |
|
James B. Pollack
|
be33b40ced
|
Merge pull request #6287 from jherico/homer
Removing iviewhmd due to broken production builds
|
2015-11-02 23:56:26 -08:00 |
|
Brad Davis
|
eeabc9b093
|
Removing iviewhmd due to broken production builds
|
2015-11-02 23:49:03 -08:00 |
|
EdgarPironti
|
5d695da630
|
Do not merge - Spacemouse
|
2015-11-02 23:31:10 -08:00 |
|
EdgarPironti
|
603405ad61
|
Do not merge - Spacemouse
|
2015-11-02 23:29:15 -08:00 |
|
Brad Hefta-Gaub
|
79f7284c32
|
Merge pull request #6285 from jherico/lisa
Adding diagnostics to track down the 'black rectangles of death'
|
2015-11-02 22:18:16 -08:00 |
|
Brad Davis
|
764ecba2a8
|
Adding diagnostics to track down the 'black rectangles of death'
|
2015-11-02 21:55:35 -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 |
|
Philip Rosedale
|
61109d09af
|
Merge pull request #6277 from sethalves/adjust-distance-grab
distance grab works better with hmd on
|
2015-11-02 16:36:32 -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 |
|
James B. Pollack
|
9851ddb39c
|
Merge pull request #6270 from ericrius1/hoopName
Removing bball hoop from reset scripts- will be saved in SVO instead
|
2015-11-02 16:14:15 -08:00 |
|
AlessandroSigna
|
b77945d430
|
Vive - fix input drifting
Conflicts:
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
|
2015-11-02 16:06:17 -08:00 |
|
Brad Davis
|
699a13b2a7
|
Merge pull request #6275 from ZappoMan/mappingTweaks
Mapping tweaks to match Controllers spec
|
2015-11-02 16:06:08 -08:00 |
|
Brad Davis
|
5d957e6535
|
Merge pull request #6255 from samcake/controllers
Controllers : Adding support for 'NOT' ito the conditional endpoint
|
2015-11-02 16:03:52 -08:00 |
|
Brad Hefta-Gaub
|
02288e84e8
|
CR feedback
|
2015-11-02 15:35:30 -08:00 |
|
samcake
|
3d2739c7b4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-11-02 15:34:57 -08:00 |
|
Brad Hefta-Gaub
|
f532607cca
|
add touch and other gestures to standard
|
2015-11-02 15:06:38 -08:00 |
|
samcake
|
0211e00c86
|
Cleaning the feature not conditional do the true design
|
2015-11-02 15:01:59 -08:00 |
|
Seth Alves
|
181901ed19
|
distance grab works better with hmd on
|
2015-11-02 14:42:28 -08:00 |
|
samcake
|
c2687b4998
|
Cleaning the feature not conditional do the true design
|
2015-11-02 14:17:07 -08:00 |
|
Brad Hefta-Gaub
|
5a93516330
|
Merge pull request #6276 from sethalves/lazy-smi-init
don't initialize SMI sdk unless we need it
|
2015-11-02 14:05:38 -08:00 |
|
Seth Alves
|
310a5c9bfb
|
don't initialize SMI sdk unless we need it
|
2015-11-02 13:42:12 -08:00 |
|
Brad Hefta-Gaub
|
d359aa3b65
|
more tweaks
|
2015-11-02 13:41:16 -08:00 |
|
Brad Hefta-Gaub
|
46bedf7667
|
more tweaks to hydra mappings
|
2015-11-02 13:35:49 -08:00 |
|
Howard Stearns
|
cdd150f24e
|
Merge pull request #6158 from hyperlogic/tony/anim-sync-blend
Synced blending for avatar movement animations
|
2015-11-02 12:59:38 -08:00 |
|
Brad Hefta-Gaub
|
354157ccec
|
Merge pull request #6272 from jherico/externals
Try using the VS2010 build of the latest SDK.
|
2015-11-02 12:26:35 -08:00 |
|
Anthony J. Thibault
|
2236573a9d
|
Merge branch 'master' into tony/anim-sync-blend
|
2015-11-02 12:18:11 -08:00 |
|
Anthony Thibault
|
f896a84391
|
Merge pull request #6269 from AndrewMeadows/avatar-velocity
proper avatar velocity for HMD motion
|
2015-11-02 12:16:48 -08:00 |
|
Brad Hefta-Gaub
|
b94258f953
|
add example of overriding default rightClick behavior
|
2015-11-02 11:55:50 -08:00 |
|
U-GAPOS\andrew
|
a77f888f15
|
more correct HMD offset correction velocity
|
2015-11-02 11:29:17 -08:00 |
|
Brad Davis
|
edf3e5b17a
|
Try using the VS2010 builds from the new Sixense SDKs
|
2015-11-02 11:15:51 -08:00 |
|
Eric Levin
|
7838683909
|
Merge pull request #6189 from imgntn/fjs
Add functional.js library
|
2015-11-02 11:10:19 -08:00 |
|
ericrius1
|
3019886344
|
Removing basketball hoop from reset scripts
Hoop will be saved in SVO instead
|
2015-11-02 11:08:06 -08:00 |
|
U-GAPOS\andrew
|
a545d770d8
|
fix bug preventing avatar motion in 2D mode
|
2015-11-02 11:07:43 -08:00 |
|
Andrew Meadows
|
9799693135
|
remove extra whitespace
|
2015-11-02 11:07:41 -08:00 |
|
Andrew Meadows
|
fd557c4e52
|
route HMD-following through the physics simulation
|
2015-11-02 11:07:40 -08:00 |
|
Andrew Meadows
|
9b1b009b8b
|
Merge pull request #6271 from sethalves/fix-seths-build
get interface building on seth's linux box
|
2015-11-02 11:02:08 -08:00 |
|
Seth Alves
|
c381da24a7
|
get interface building on my linux box
|
2015-11-02 10:42:06 -08:00 |
|
ericrius1
|
b067abe2d9
|
Added name to basketball hoop in reset scripts
|
2015-11-02 09:58:23 -08:00 |
|
Brad Hefta-Gaub
|
8431ef9b98
|
Merge pull request #6267 from jherico/externals
Update external version of Sixense.
|
2015-11-02 09:49:29 -08:00 |
|
samcake
|
543f322ffe
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-11-02 09:48:32 -08:00 |
|
Brad Davis
|
a79933b7f8
|
Merge pull request #6268 from ZappoMan/rightClickMenu
add mouseClicked inputs vs mouseButton inputs
|
2015-11-02 09:48:07 -08:00 |
|