samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
Philip Rosedale
bbe74f2e55
Merge pull request #6301 from sethalves/fix-grab-velocity
...
make held objects move tightly with hand (again)
2015-11-04 09:28:20 -08:00
Seth Alves
270b4b97fc
remove a left-over kludge that was causing the appearence of frame-lag in held objects
2015-11-04 02:26:02 -08:00
Brad Davis
439bdbc0e4
Merge pull request #6298 from samcake/controllers
...
Controllers : Removing dead files
2015-11-03 19:57:37 -08:00
Brad Hefta-Gaub
71e4092276
Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render
...
Remove idleTimer and call idle directly from paintGL.
2015-11-03 16:38:43 -08:00
Seth Alves
a85358085d
Merge pull request #6299 from Atlante45/master
...
handControllerGrab.js fix
2015-11-03 16:11:18 -08:00
Atlante45
d8797ef9d7
Initialize relativePosition/Rotation
2015-11-03 16:07:37 -08:00
Anthony J. Thibault
31f361d49c
Moved fps timing to beginning of paintGL
...
This should improve accuracy.
However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
2015-11-03 15:51:18 -08:00
Brad Hefta-Gaub
d21415b00d
Merge pull request #6295 from imgntn/cleanup_tests
...
Remove timers test file
2015-11-03 15:43:02 -08:00
samcake
57bc2f3093
Removing dead js files
2015-11-03 15:37:36 -08:00
samcake
4d62c532f5
Removing dead config files
2015-11-03 15:35:13 -08:00
Howard Stearns
022a83528b
Merge pull request #6296 from AndrewMeadows/fix-walk-with-hmd
...
fix bug preventing avatar from walking when HMD is at rest
2015-11-03 14:45:39 -08:00
Seth Alves
e5da29e08a
Merge pull request #6297 from birarda/grab-locked
...
allow non-colliding grab of locked entities
2015-11-03 14:31:19 -08:00
Stephen Birarda
8346ce27b3
allow a non-colliding grab of locked entities
2015-11-03 14:22:41 -08:00
U-GAPOS\andrew
d544b7a645
fix bug: avatar can't walking when HMD at rest
2015-11-03 13:59:15 -08:00
James B. Pollack
b83b24b096
remove strange test file
2015-11-03 13:42:18 -08:00
Andrew Meadows
4215ce5d25
Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds
...
Don't play other avatar's collision sounds.
2015-11-03 13:40:27 -08:00
Andrew Meadows
498cec3abd
Merge pull request #6294 from AndrewMeadows/fix-hydra-sans-hmd
...
fix hydra sensor matrix when no HMD is attached
2015-11-03 13:37:03 -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
Andrew Meadows
e160e2a7ae
the minimal fix
2015-11-03 11:37:30 -08:00
Brad Davis
4c076d8b12
Disabling billboard rendering, source of the evil black rectangles
2015-11-03 11:34:05 -08:00
Andrew Meadows
12ff9734e0
init _bodySensorMatrix in ctor
2015-11-03 11:26:49 -08:00
Anthony J. Thibault
c139b62217
fps calculation now based on moving average
...
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
2015-11-03 11:19:49 -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
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
Anthony J. Thibault
0c12bb5a4e
Remove idleTimer and call idle directly from paintGL.
2015-11-02 18:47:18 -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
