samcake
c7f43386e5
Compressing the g-buffer better
2016-02-22 09:23:16 -08:00
samcake
9b2a90b430
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-19 19:50:02 -08:00
samcake
39a7852979
MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders
2016-02-19 18:43:07 -08:00
Chris Collins
1fe9bb2c6c
Merge pull request #7142 from howard-stearns/null-audio-injector
...
null audio injector
2016-02-19 11:32:01 -08:00
Howard Stearns
fcdc6dd6fa
When we don't make an audo injector (because we're at a limit), make sure the value returned to scripts is null.
2016-02-19 10:54:53 -08:00
Andrew Meadows
c53e583bf4
Merge pull request #7129 from hyperlogic/tony/no-hands-in-body
...
Prevent avatar's wrists from entering torso
2016-02-19 10:53:12 -08:00
samcake
e103fd364e
USing metallic and not gloss map
2016-02-19 09:24:22 -08:00
samcake
903824809c
trying to have better support for the materials
2016-02-18 18:33:32 -08:00
Anthony J. Thibault
613b60658e
Rig: prevent normalization of a zero vector
2016-02-18 10:24:36 -08:00
samcake
5c877560fe
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-18 09:25:26 -08:00
Brad Hefta-Gaub
a3766a93ea
Merge pull request #7128 from sethalves/fix-energy
...
minor adjustments to avatar-energy code
2016-02-17 20:04:35 -08:00
samcake
b88501784c
Making progress toward the PBR material
2016-02-17 18:47:52 -08:00
Anthony J. Thibault
73ac47724a
Rig: Prevent the hand IK targets from entering the body.
...
Use a 2d circle/circle intersection test to keep the hands outside of the body.
2016-02-17 16:23:18 -08:00
samcake
d7edc8c2ba
Adding more fields ready for the PBR stingray materials
2016-02-17 16:06:30 -08:00
Anthony Thibault
e863da5a68
Merge pull request #7118 from jherico/hmd_mono
...
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Brad Davis
8289c39a2a
Removing flicker from OpenVR mirror
2016-02-17 14:48:24 -08:00
Seth Alves
af1640ac4e
adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it
2016-02-17 14:36:18 -08:00
Anthony J. Thibault
3426173d1d
AnimInverseKinematics: open up shoulder swing constraint.
2016-02-17 11:44:11 -08:00
samcake
2ed7f997e3
A few changes in the material call back
2016-02-17 10:44:15 -08:00
Brad Hefta-Gaub
d5c349abec
Merge pull request #7114 from samcake/hdr
...
Adding Ambient lighting to transparent surfaces
2016-02-17 09:08:38 -08:00
Andrew Meadows
07df96b6b3
Merge pull request #7125 from hyperlogic/tony/ik-bugfix
...
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
2016-02-17 08:56:16 -08:00
Anthony J. Thibault
2d1304e070
AnimInverseKinematics: use glm::clamp for clarity.
2016-02-16 18:00:45 -08:00
Anthony J. Thibault
b5a72225db
AnimInverseKinematics: renamed variable for extra style points
2016-02-16 17:42:51 -08:00
Anthony J. Thibault
df21fffa4a
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
...
* When computing tipPosition, for the next iteration of the CCD,
use the leverArm before it's projected onto the lowerSpine twist axis.
* fix for acos() that was going outside of valid domain. (-1.0, 1.0)
2016-02-16 17:31:39 -08:00
samcake
b03f639e2c
Renaming and rearranging the material fields to support PBR fbx materials
2016-02-16 17:20:23 -08:00
Brad Davis
d61f4fbb25
PR feedback
2016-02-16 16:44:16 -08:00
Andrew Meadows
80aee563fc
Merge pull request #7119 from sethalves/fix-linux-local-scriptnames
...
filenames on Linux are case-sensitive
2016-02-16 13:27:14 -08:00
Andrew Meadows
fd8073f6b5
init drawstatus to false
2016-02-16 12:11:19 -08:00
samcake
71863a1550
Fixing the material names
2016-02-16 09:33:24 -08:00
Andrew Meadows
492c026f78
Merge pull request #7102 from zzmp/fix/model-tex-revert
...
Revert model texs when unset
2016-02-16 09:25:40 -08:00
Chris Collins
ad6b563130
Merge pull request #7116 from samcake/red
...
Fixing the rendering of the avatar skeleton
2016-02-16 09:22:20 -08:00
Andrew Meadows
3160776d65
Merge pull request #7089 from zzmp/fix/overlay-property-scene-updates
...
Update the scene on overlay3d updates
2016-02-16 09:21:57 -08:00
Seth Alves
164d5d9c7e
try, try again
2016-02-16 01:13:37 -08:00
Seth Alves
f2c9bbc32d
filenames on Linux are case-sensitive
2016-02-16 00:39:54 -08:00
samcake
0ad7bacf02
Changing diffuse to albedo and breaking everything...
2016-02-15 21:50:10 -08:00
Brad Davis
56fc9ea301
Remove distortion on HMD previews, both mono and stereo
2016-02-15 21:46:29 -08:00
samcake
29bacd23df
Fixing the rendering of the avatar skeleton
2016-02-15 18:56:46 -08:00
samcake
4c82e0b2b1
Removing dead comment
2016-02-15 17:44:40 -08:00
samcake
a740f4a6de
Removing unecessary code
2016-02-15 17:41:20 -08:00
samcake
b9d14b74ee
Adding the GLobalKeyLighting to transparents, the ambient lighting
2016-02-15 17:27:28 -08:00
Anthony Thibault
6eda7aac6a
Merge pull request #7106 from AndrewMeadows/tighter-capsule
...
tighter bounding capsule for avatars
2016-02-15 17:16:43 -08:00
samcake
0639b2ace0
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-02-15 13:27:55 -08:00
samcake
e149daa49b
Cleaning the Light.slh
2016-02-15 13:27:28 -08:00
Zach Pomerantz
5d1aedf707
Update scene items on overlay3d edits
2016-02-15 13:05:19 -08:00
Zach Pomerantz
01309ffd5f
Add resort for scene item keys
2016-02-15 13:02:29 -08:00
samcake
0a6ceb67ad
Fixing a typo
2016-02-15 12:01:28 -08:00
Zach Pomerantz
0e9d696859
Cache renderable model orig texs as QVariantMap
2016-02-15 11:09:10 -08:00
samcake
0c0089f736
REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines
2016-02-15 11:08:12 -08:00
Andrew Meadows
d6a716a1aa
only head and torso for bounding capsule radius
2016-02-15 10:29:29 -08:00
samcake
545f276fdf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-15 09:29:00 -08:00
