Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Howard Stearns
4e7d191fb1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:53:38 -07:00
Howard Stearns
838711e526
Remove avatar->shift hips for idle animations.
...
See https://app.asana.com/0/32622044445063/43127903156601
2015-07-29 15:27:50 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
Howard Stearns
68aec1fd36
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-29 09:12:44 -07:00
Howard Stearns
327ecfe62c
Be less noisy.
2015-07-29 09:11:58 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Anthony J. Thibault
b06485c266
Remove cauterize code from Rig and move it back into Model.
...
* cauterize code is used as at render time and is not dependent on
the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4
add some javascript callable stuff back to MyAvatar
2015-07-27 16:42:54 -07:00
Andrew Meadows
e527f49d65
removing interface dependency on ShapeCollider
2015-07-27 15:30:10 -07:00
Howard Stearns
ef52c0703f
Merge pull request #8 from AndrewMeadows/cadmium
...
remove unused legacy Shapes from Model and friends
2015-07-27 13:20:41 -07:00
Howard Stearns
8196770ed3
Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on.
2015-07-27 12:58:43 -07:00
Andrew Meadows
81831975b5
remove legacy CapsuleShape from SkeletonModel
2015-07-27 12:27:17 -07:00
Andrew Meadows
73ac941230
remove unused legacy Shapes from Model and friends
2015-07-27 11:15:33 -07:00
Howard Stearns
1ec0518d05
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:20:30 -07:00
Seth Alves
81375e47e0
remove methods from MyAvatar: setJointRotations setJointData clearJointData clearJointsData
2015-07-27 09:07:26 -07:00
Seth Alves
ac53b6b22c
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-26 20:00:56 -07:00
Seth Alves
24fff719c5
quiet compiler
2015-07-25 21:11:23 -07:00
Howard Stearns
8b5f24e4df
Keep list of animations in Rig, not MyAvatar.
2015-07-24 22:02:39 -07:00
Howard Stearns
1663d095a1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-24 14:08:51 -07:00
Sam Gateau
a424ff98ca
Fixing issues with the review process
2015-07-23 16:55:18 -07:00
Sam Gateau
a002560003
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-23 16:32:00 -07:00
Howard Stearns
16525dc737
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-23 15:41:00 -07:00
Seth Alves
33c97a1833
get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes
2015-07-23 15:14:10 -07:00
Sam Gateau
dc10f30d3d
Merged
2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3
Render the rear view mirror in a separate target and then display it during overlay pass
2015-07-23 14:56:14 -07:00
Andrew Meadows
b26f4b0c8d
fix for underdamped avatar rotation momentum
2015-07-23 14:49:15 -07:00
Seth Alves
4566d16402
move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected
2015-07-23 13:03:38 -07:00
Seth Alves
57eb798d63
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-23 09:46:41 -07:00
David Rowe
3362358dcd
Remove unused postLighting variable from Avatar and MyAvatar
...
Fixes Leap and Hydra laser pointers not displaying.
Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb
Remove dead code from Head
2015-07-22 17:50:54 -07:00
Seth Alves
47965bc39c
merge from upstream
2015-07-22 13:48:19 -07:00
Seth Alves
7c8d52cbd1
back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer
2015-07-22 13:41:31 -07:00
Howard Stearns
a6395a2351
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-22 12:29:27 -07:00
Howard Stearns
dbb4a8b767
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-22 11:40:25 -07:00
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -07:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Brad Hefta-Gaub
6dbe6bc375
Merge pull request #5332 from ctrlaltdavid/20612
...
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
2015-07-21 13:32:56 -07:00
Seth Alves
fecdc08720
merge from upstream
2015-07-21 09:53:51 -07:00
Seth Alves
cdc26526b4
merge from upstream
2015-07-21 09:51:16 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Seth Alves
2814ad78fe
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-20 11:16:11 -07:00
Howard Stearns
9623ccf792
Change instantiation of Rig.
2015-07-20 11:07:25 -07:00
Seth Alves
9af104f745
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-20 09:47:23 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
