U-GAPOS\andrew
f260c6b12b
fix bad time measurment in AtRestDetector
2015-11-04 10:47:39 -08:00
Seth Alves
1e498a41f0
rework search logic
2015-11-04 10:46:20 -08:00
Howard Stearns
7b9245022c
Merge branch 'away' of https://github.com/howard-stearns/hifi into away
2015-11-04 10:46:16 -08:00
U-GAPOS\andrew
9de5721a48
set _hmdFollowVelocity to zero when done following
2015-11-04 10:23:55 -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
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
Howard Stearns
4a54f2052e
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 17:42:38 -08:00
ericrius1
af0c0e6a1b
spacing fix
2015-11-03 17:32:22 -08:00
ericrius1
31fe5fa953
Bump version num, use different shader for additive blending effect
2015-11-03 17:15:10 -08:00
ericrius1
470f814776
Fixed glitches with large particles being sorted along wrong axis
2015-11-03 16:39:16 -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
ericrius1
a722ad46f6
Merge branch 'master' into particleSorting
2015-11-03 15:47:44 -08:00
ericrius1
60f35ce8c7
discarding pixel if alpha is below threshold
2015-11-03 15:46:58 -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
ericrius1
0c8a712935
removed comment
2015-11-03 15:36:11 -08:00
howard-stearns
4bf9861350
Forgot license header.
2015-11-03 15:36:02 -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
howard-stearns
fb4174b9a2
Control alphaVar, and deal with overlapping cycles.
2015-11-03 13:11:31 -08:00
howard-stearns
a7162eefbe
Add alphaVar for ik.
2015-11-03 13:10:25 -08:00
ericrius1
777fbe6d83
moved additive_blending flag to proper location
2015-11-03 12:43:41 -08:00
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
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
Zach Pomerantz
6bf9a4518a
Bail early from ScriptEngine::run if stopped
...
evaluate() bails anyway, so this will avoid the cost of init().
If run() is invoked from runInThread(), this may avoid a race
where _isRunning is set after it is checked because the check
occured during init().
2015-11-03 11:24:04 -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
ericrius1
0ed868077d
Added additive blending as option for particle effect
2015-11-03 10:02:51 -08:00
Howard Stearns
70b1165393
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 10:01:36 -08:00
