Atlante45
d9152136ea
Remove unused header
2015-01-30 11:41:48 -08:00
Atlante45
05d2887c94
Move Torso twist to HeadData with Lean
2015-01-09 11:15:01 -08:00
ZappoMan
bd1612f6a4
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-05 16:51:31 -08:00
ZappoMan
8b22b166ac
convert lookat vectors and laser pointers to use renderLine()
2015-01-05 16:06:35 -08:00
ZappoMan
9630279459
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
...
Conflicts:
examples/editVoxels.js
examples/fallingSand.js
examples/growTrees.js
interface/src/Application.cpp
interface/src/Application.h
libraries/avatars/CMakeLists.txt
libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
ZappoMan
49d8f2b2f5
more work on voxelEctomy
2014-12-30 18:52:33 -08:00
Philip Rosedale
f4f43d6b38
added twisting of torso to follow head, fixed bug with body rotation not factored out of head rotation, removed credits from title bar
2014-12-30 15:11:32 -08:00
Philip Rosedale
1d68413b66
Audio-only mouth uses multiple blend shapes
2014-10-23 11:43:13 -07:00
Andrzej Kapolka
9855fbcfb4
Don't bother using a callback to render the eye vectors; just rely on the
...
post-lighting call to Avatar::render, like everything else. This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
2014-09-29 11:45:12 -07:00
Philip Rosedale
fcc5eb9d0a
Tuning of audio-driven mouths and brows to look better and not stay open
2014-09-24 16:37:55 -07:00
Philip Rosedale
75e536235c
Avatars look at your camera, not your avatar. Improvements to lookAt code
2014-09-24 14:38:44 -07:00
Philip Rosedale
21a15cff2a
Avatar can look at corrected position when looking at me
2014-09-23 12:50:47 -07:00
Andrzej Kapolka
08fda3bbef
Merge branch 'master' of https://github.com/highfidelity/hifi into deference
2014-09-19 10:30:40 -07:00
Philip Rosedale
dbcb778ea9
Drive mouth with loudness relative to long term average
2014-09-18 08:33:41 -07:00
Andrzej Kapolka
bfaac9eae1
Deferred lighting tweaks.
2014-09-15 18:38:10 -07:00
Atlante45
3826ed0d69
Added setFinalPitch/Yaw/Roll to HeadData
2014-08-26 15:36:08 -07:00
Atlante45
2981132395
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-14 11:39:44 -07:00
Atlante45
73a3a13c59
More recording work
2014-08-12 18:15:48 -07:00
Philip Rosedale
9933c011d7
Remove filtered eye position from head
2014-08-12 14:31:40 -07:00
Philip Rosedale
5aecbe690d
made calculateAverageEyePosition private, changed to getEyePosition() where used outside head
2014-07-23 22:56:59 -07:00
Philip Rosedale
00fdc37822
add velocity filtering to eyePosition to reduce camera jitter from faceshift
2014-07-23 22:45:50 -07:00
Andrew Meadows
d3f51fe38e
FinalOrientation -> FinalOrientationInWorldFrame
2014-06-04 10:41:17 -07:00
Andrew Meadows
f7b8c4f0a0
remove unused Head::_gravity data memeber
2014-05-27 14:50:17 -07:00
ZappoMan
bdf39186de
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-15 21:04:15 -07:00
ZappoMan
7a993939bf
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
Andrew Meadows
0ad841edfb
don't render avatar boundary shapes in first person
2014-04-11 17:44:51 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
Andrzej Kapolka
a0c7e4d3cc
Working on model rendering modes.
2014-04-04 11:45:03 -07:00
ZappoMan
ec9884833b
first cut at reflections
2014-04-02 17:45:34 -07:00
Andrew Meadows
796d20168e
splitting lean input from lean perturbations
2014-03-27 15:30:30 -07:00
Andrew Meadows
a978f533e1
update a comment
2014-03-27 11:24:03 -07:00
Andrew Meadows
7949be0319
PitchTweak and friends become DeltaPitch
2014-03-27 11:14:26 -07:00
Andrew Meadows
c354e980a8
getTweakedOrientation() to getFinalOrientation()
2014-03-27 11:03:42 -07:00
Andrew Meadows
63c4af8950
remove cruft: Head::applyCollision()
2014-03-26 14:10:43 -07:00
Andrew Meadows
fff7a36b54
merge upstream/master into physics project
...
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/avatar/Hand.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/renderer/Model.h
2014-03-25 15:55:26 -07:00
Andrzej Kapolka
62884f1f4f
Don't use textures/fancy shaders when rendering shadow map. Closes #2270 .
2014-03-24 13:15:03 -07:00
Andrew Meadows
02c58447df
merge upstream/master into "shapes" project
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
libraries/avatars/src/HandData.h
libraries/shared/src/SharedUtil.h
2014-03-18 12:41:20 -07:00
Andrzej Kapolka
4366b45445
Changed orientation tweak names, restore tweaked orientation rather than
...
primary one. Closes #2310 .
2014-03-14 11:13:15 -07:00
Andrew Meadows
37b088ebfa
Hands can collide with avatar head again
2014-03-06 12:38:07 -08:00
Andrzej Kapolka
0361f46832
Don't simulate avatars' models when they're being rendered as billboards.
...
Closes #2165 .
2014-03-03 12:09:38 -08:00
Andrzej Kapolka
d157428704
When we send data to the avatar mixer, send the tweaked head rotation. Closes
2014-02-28 16:58:22 -08:00
Andrzej Kapolka
cd2bd32210
Delay loading models until we know that we need them (i.e., that we're not
...
beyond billboard distance). Closes #2121 .
2014-02-27 12:30:46 -08:00
Andrzej Kapolka
6f8f15018c
Allow setting the combined head orientation, which changes the body yaw and
...
applies the rest to the head. Closes #2050 .
2014-02-21 17:52:20 -08:00
Andrew Meadows
335141049c
Cleaning up collision check API's and re-enabling collisions with particles.
2014-02-14 16:33:19 -08:00
Andrew Meadows
d9b50359a6
Hand-face collisions now work (sorta).
2014-02-13 12:21:28 -08:00
Andrew Meadows
6b2c7c556d
Fixing mouselook.
...
Faceshift head rotations are stored separately and then integrated into
the final (rendered) head rotation at the right times but do not affect
the camera.
2014-02-07 17:46:14 -08:00
Andrew Meadows
1ad2171952
Fix #1862 camera should not follow head orientation when using faceshift
2014-02-04 15:23:10 -08:00
ZappoMan
b36cc0bcf9
removed old cruft around mousePitch in Head and unified pitch
2014-01-29 02:09:49 -08:00
Andrzej Kapolka
2e3c597d40
Scooping out more head bits.
2014-01-16 15:01:24 -08:00