Atlante45
d9cd986db2
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-04 11:26:16 -08:00
Anthony Thibault
275b248547
Merge pull request #6302 from AndrewMeadows/fix-avatar-drift
...
fix slow drift of avatar when wearing HMD
2015-11-04 11:19:45 -08:00
samcake
d4259931b2
Setting the step yaw to 22.5 degrees
2015-11-04 10:57:39 -08:00
samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
U-GAPOS\andrew
9de5721a48
set _hmdFollowVelocity to zero when done following
2015-11-04 10:23:55 -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
Atlante45
3a545399e3
Remove our idle() from paintGL now that it's in master
2015-11-03 17:56:40 -08:00
Atlante45
55894f2eee
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 17:46:24 -08:00
Atlante45
eb990c9c1c
More basebal test code
2015-11-03 17:45:01 -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
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
samcake
4d62c532f5
Removing dead config files
2015-11-03 15:35:13 -08:00
U-GAPOS\andrew
d544b7a645
fix bug: avatar can't walking when HMD at rest
2015-11-03 13:59:15 -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
Atlante45
0508091130
Rebase fixes
2015-11-03 11:37:57 -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
Atlante45
52c61f069f
Merge branch 'master' of https://github.com/highfidelity/hifi into vive
2015-11-03 11:21:54 -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
Clément Brisset
c63fc8557c
More baseball test code
2015-11-03 11:14:59 -08:00
Clément Brisset
40ce2416e8
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:13:57 -08:00
Ryan Huffman
03a338dfe6
Merge branch 'baseball' of github.com:birarda/hifi into baseball
2015-11-03 11:13:56 -08:00
Stephen Birarda
8cd41b9383
resolve conflicts on merge with huffman/baseball
2015-11-03 11:13:15 -08:00
Ryan Huffman
55789fed99
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:11:26 -08:00
Ryan Huffman
67b43cafc1
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:10:47 -08:00
Ryan Huffman
ccb25f4b63
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:10:45 -08:00
Ryan Huffman
afffe7f5c6
Merge branch 'master' of github.com:Atlante45/hifi into baseball
2015-11-03 11:10:14 -08:00
Atlante45
f2ff0b40f7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 11:06:19 -08:00
Clément Brisset
31d92fd90a
Baseball test code
2015-11-03 11:00:35 -08:00
samcake
78e3f8ebbc
Merge pull request #6281 from AlessandroSigna/master
...
Vive - fix input drifting
2015-11-03 10:19:59 -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 Davis
764ecba2a8
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 21:55:35 -08:00
Anthony J. Thibault
0c12bb5a4e
Remove idleTimer and call idle directly from paintGL.
2015-11-02 18:47:18 -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
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
Anthony J. Thibault
2236573a9d
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 12:18:11 -08:00
Stephen Birarda
017cee6961
make shouldRenderLocally do the right thing
2015-11-02 11:59:09 -08:00
U-GAPOS\andrew
a77f888f15
more correct HMD offset correction velocity
2015-11-02 11:29:17 -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
Brad Hefta-Gaub
b00f572e1a
add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag
2015-11-02 09:21:15 -08:00
