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
Howard Stearns
e6b9cbacf7
Merge pull request #5910 from hyperlogic/tony/small-anim-debug-improvements
...
Fix for Head when switching between HMD and Desktop mode
2015-09-28 14:13:03 -07:00
Brad Davis
e284cbe355
Remove duplicate DeferredBufferWrite.slh
2015-09-28 13:24:47 -07:00
samcake
728a4cb112
Adding the comment to the glActiveBindTexture call
2015-09-28 12:45:39 -07:00
samcake
95ea874d43
Minor fixes to the way the specular color is interpreted
2015-09-28 12:43:15 -07:00
Brad Davis
203c601e95
Fix for bad textures when using _glActiveBindTexture
2015-09-28 12:26:11 -07:00
Anthony J. Thibault
a495a45ed0
unset "lean" when headParams.enableLean is false
...
Also added AnimVariantMap::dump() which will print out all the
currently set anim vars and their values.
2015-09-28 11:10:22 -07:00
Brad Hefta-Gaub
3e758f3c6b
fix Triangle::getNormal, add normal display to rayPickExample
2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub
ce3da099f6
normalize the surface normal from the triangle, coding standard fix, update example
2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Ken Cooke
aa01dca0a8
Fix compiler warnings
2015-09-27 19:14:31 -07:00
Anthony J. Thibault
c970ff0c0c
Reset joint priorities back to 0 for new animation system.
...
Added Rig::clearJointStatePriorities() to do this.
2015-09-27 18:25:28 -07:00
Anthony J. Thibault
4b31d87bf5
renamed magic constant to FRAMES_PER_SECOND.
2015-09-27 17:52:53 -07:00
Anthony J. Thibault
5a24a020ca
Fix for HMD rotation sticking between 2d & HMD mode
...
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
2015-09-27 17:44:54 -07:00
Anthony J. Thibault
a2562c92f4
Small changes to Anim System for Debugging
...
* Added constant for Rig animation fade time
* Added index output for AnimSkeleton::dump()
2015-09-27 16:24:55 -07:00
Ken Cooke
7faada24a8
Moved table to the top, so it can be declared static
2015-09-27 15:45:00 -07:00
Ken Cooke
c000c635b1
CR feedback
2015-09-27 15:31:11 -07:00
