Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
Stephen Birarda
5da5bd47af
add a missing rename for socket Q_ASSERT_X
2015-09-30 21:45:22 -04:00
Brad Hefta-Gaub
066e25bb4a
Merge pull request #5965 from hyperlogic/tony/avatar-lean-bug-fixes
...
Bug fix for deriveBodyFromHMDSensor calculations
2015-09-30 16:54:59 -07:00
Anthony J. Thibault
d993d39718
Bug fix for deriveBodyFromHMDSensor calculations
...
The calculation that determined where the body position relative to the HMD
was incorrect, one of the components was in the wrong coordinate frame.
Now use the skeleton's bind pose to compute the proper avatar offsets for the eyes, neck and hips.
Use these offsets to calculate where the hips should be given a specific hmd position and orientation.
Also, added a bug fix for Rig, which would cause a -1 index deference when an avatar was missing
certain named joints, such as, "LeftEye", "Neck" and "Head".
2015-09-30 16:28:33 -07:00
Ryan Huffman
b7cfc07748
Merge pull request #5957 from ZappoMan/fixSentPacketHistoryCrash
...
fix possible crash from null coming from _sentPackets
2015-09-30 15:12:09 -07:00
Brad Hefta-Gaub
9cf49597a6
fix possible crash from null coming from _sentPackets
2015-09-30 14:16:41 -07:00
Seth Alves
b34ea6ded4
store action lifetime as an expires integer
2015-09-30 13:46:23 -07:00
Seth Alves
06f7f92951
Merge branch 'master' of github.com:highfidelity/hifi into debug-grab
2015-09-30 13:09:47 -07:00
Seth Alves
7c6846c260
add lifetime and tag arguments to actions
2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub
88f0c7017e
Merge pull request #5953 from hyperlogic/tony/avatar-mixer-crash-fix
...
Prevent taking a reference to a QUrl rvalue.
2015-09-30 12:36:45 -07:00
Brad Hefta-Gaub
46e1a298c8
Merge pull request #5951 from huffman/cc-rng-fix
...
Fix infinite recursion error with CC rng
2015-09-30 12:36:35 -07:00
Anthony J. Thibault
83c3f65b1f
Prevent taking a reference to a QUrl rvalue.
2015-09-30 11:34:38 -07:00
Ryan Huffman
1e9593029c
Fix infinite recursion error with CC rng
...
On some std::random implementations tryin get a range [low, high) where
high < low will cause infinite recursion.
2015-09-30 11:34:11 -07:00
Stephen Birarda
82ac0b1a27
use a mutable mutex to keep const-ness
2015-09-30 14:23:18 -04:00
Stephen Birarda
f7e7b07441
fix constness of SentPacketHistory in OEPS
2015-09-30 14:15:22 -04:00
Stephen Birarda
cc6b0adb7d
guard insert/get in SentPacketHistory
2015-09-30 14:15:04 -04:00
Ryan Huffman
b4ca03ac3f
Merge pull request #5940 from ericrius1/polyLineFix
...
Made polyline painting experience smoother- no more flickering
2015-09-29 18:22:01 -07:00
ericrius1
1760720b2b
added check for normals and vertices
2015-09-29 17:42:20 -07:00
ericrius1
5ce3b13a4c
Fixed spacing issues
2015-09-29 17:31:02 -07:00
ericrius1
d1b016b483
untabbified lines
2015-09-29 16:38:21 -07:00
Eric Levin
614312f04f
Update PolyLineEntityItem.cpp
2015-09-29 16:32:07 -07:00
Eric Levin
36be35a836
Update RenderablePolyLineEntityItem.cpp
2015-09-29 16:30:42 -07:00
Seth Alves
58d98d3ce4
Merge pull request #5932 from howard-stearns/default-animation-and-quieter
...
Set default animation and quiet state logging
2015-09-29 16:12:28 -07:00
ericrius1
e7834365f5
Made polyline painting experience smoother- no more flickering
2015-09-29 15:33:39 -07:00
Brad Hefta-Gaub
04115052b3
Merge pull request #5938 from samcake/calvin
...
Fixing the lighting view matrix for stereo again
2015-09-29 15:08:41 -07:00
samcake
1bd07b58c3
Fixing the lighting view matrix for stereo again
2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub
00c32fc7cd
Merge pull request #5924 from jherico/marge
...
Support for accessing IPD in scripts
2015-09-29 14:24:53 -07:00
Brad Davis
9b13aac37d
PR comments
2015-09-29 14:23:56 -07:00
Howard Stearns
96e3c722ed
Quiet once/second logging/updating of other people's default avatars.
2015-09-29 13:04:59 -07:00
Howard Stearns
745a59af1c
Default animation is anim graph.
...
Remove state change logging from animation graph state machine.
2015-09-29 12:48:57 -07:00
samcake
a7e3ec58b9
Merge pull request #5927 from ZappoMan/fixSkybox
...
fix skybox not always loading when you haven't moved or if the texture is slow in loading
2015-09-29 10:04:49 -07:00
Brad Hefta-Gaub
dccf121cd3
Merge pull request #5928 from jherico/homer
...
Disabling vertex attrib format due to crashes
2015-09-29 10:01:36 -07:00
Brad Davis
daf803e8ea
Disabling vertex attrib format due to crashes
2015-09-29 09:52:41 -07:00
samcake
73b458c72e
Cleaning the normal texture load path
2015-09-29 09:38:01 -07:00
Brad Hefta-Gaub
2040fb4507
fix skybox not always loading when you haven't moved or if the texture is slow in loading
2015-09-29 09:32:34 -07:00
samcake
103e1c76b3
Member initialization respecting the standard
2015-09-29 09:26:29 -07:00
samcake
8a8411c8d1
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-29 09:15:53 -07:00
Brad Hefta-Gaub
8da52e2f17
Merge pull request #5906 from kencooke/audio-src
...
Algorithmic optimization of new resampler
2015-09-28 20:44:27 -07:00
samcake
833c31a6a6
Merge pull request #5923 from jherico/lisa
...
Fix broken textures in stereo/HMD
2015-09-28 18:21:08 -07:00
samcake
1e9c19d535
Clean the Material FBX code and how we use the factor components for diffuse and specular
2015-09-28 17:46:48 -07:00
Brad Davis
adee97b95c
Merge pull request #5922 from ZappoMan/fixFlicker
...
fix the slight flicker that's being caused by error in calculating the model inverse matrix
2015-09-28 17:37:32 -07:00
Brad Hefta-Gaub
670df7e443
fix coding standard issue and comment
2015-09-28 17:36:42 -07:00
Brad Hefta-Gaub
bd52b17861
Merge pull request #5914 from jherico/homer
...
Remove duplicate DeferredBufferWrite.slh
2015-09-28 17:29:33 -07:00
samcake
202d2944ab
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-28 17:24:59 -07:00
samcake
2a487a79a3
Getting something done today
2015-09-28 17:24:31 -07:00
Eric Levin
e8e9957846
Merge pull request #5911 from ZappoMan/rayIntersectionWork
...
adding surface normals to ray intersection
2015-09-28 17:21:40 -07:00
Brad Davis
375d783997
Better fix for texture issues in stereo
2015-09-28 17:13:51 -07:00
Brad Davis
7b1c04512a
Adding support for accessing IPD in scripts
2015-09-28 16:24:38 -07:00
Brad Davis
88d48994ed
Disabling glVertexAttribFormat for now because of an issue with instancing
2015-09-28 16:17:56 -07:00
Brad Hefta-Gaub
32b56a4bf7
fix the slight flicker that's being caused by error in calculating the model inverse matrix
2015-09-28 16:09:57 -07:00
