Howard Stearns
4e298d815d
Add the joint mapping necessary for playing animations in the rig.
2015-07-24 14:07:32 -07:00
Howard Stearns
f9f8b0ffc1
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-24 10:40:19 -07:00
Howard Stearns
b748dafc80
Merge pull request #6 from AndrewMeadows/bromine
...
remove avatar bone shapes cruft
2015-07-24 12:40:05 -05:00
Andrew Meadows
1bf49d72f1
Merge branch 'rig' of github.com:howard-stearns/hifi into bromine
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-07-24 10:06:02 -07:00
Howard Stearns
05fae0e977
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-23 16:12:42 -07:00
Brad Davis
2ac6304752
Merge pull request #5404 from ZappoMan/renderBug
...
Fix rendering of primitive objects on Windows
2015-07-23 19:10:54 -04:00
Howard Stearns
25e9893d0e
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-23 16:06:04 -07:00
Howard Stearns
e59304ae74
Merge pull request #5406 from huffman/variadic-print
...
Update script print() to be variadic
2015-07-23 18:03:37 -05:00
Howard Stearns
16525dc737
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-23 15:41:00 -07:00
Howard Stearns
cc26f5165b
Supply neck index per new protocol.
2015-07-23 15:40:33 -07:00
ZappoMan
8007fba909
add type to shader include
2015-07-23 15:37:56 -07:00
Howard Stearns
878f7129f4
Merge pull request #5 from sethalves/rig
...
Rig
2015-07-23 17:32:41 -05:00
Ryan Huffman
396bb613f8
Avoid creating a new variable in js print
2015-07-23 15:32:40 -07:00
Ryan Huffman
5f33ac5459
Update script print() to be variadic
2015-07-23 15:30:54 -07:00
Andrew Meadows
f40feba36d
Merge remote-tracking branch 'andrew/boron' into bromine
...
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/avatar/Hand.h
interface/src/avatar/SkeletonModel.cpp
2015-07-23 15:29:53 -07:00
Seth Alves
849715953d
Merge pull request #5405 from AndrewMeadows/bohrium
...
fix for underdamped avatar rotation momentum
2015-07-23 15:26:49 -07:00
Seth Alves
fb9d38bedb
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-23 15:17:15 -07:00
Howard Stearns
69e776e240
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-23 15:16:44 -07:00
Seth Alves
d5400e2b9d
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-23 15:14:23 -07:00
Seth Alves
1e19e46aa6
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-23 15:14:19 -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
Howard Stearns
eea3ce4369
Make an actual rig in the test case.
2015-07-23 15:11:21 -07:00
Howard Stearns
81e0a1e629
Better name for signal.
2015-07-23 15:09:06 -07:00
Howard Stearns
9593668110
Bring animation file headers up to date.
2015-07-23 15:08:22 -07:00
ZappoMan
e6262de864
CR feedback
2015-07-23 14:56:52 -07:00
Andrew Meadows
b26f4b0c8d
fix for underdamped avatar rotation momentum
2015-07-23 14:49:15 -07:00
Howard Stearns
9f8fad0b8f
Merge pull request #4 from sethalves/rig
...
Rig
2015-07-23 16:32:56 -05:00
ZappoMan
1177ffd439
more hacking
2015-07-23 14:12:52 -07:00
ZappoMan
96e83e3ed4
remove gl_FrontMaterial
2015-07-23 14:11:28 -07:00
ZappoMan
9496b6c024
more hacking
2015-07-23 13:56:59 -07:00
ZappoMan
5774af0856
more hacking
2015-07-23 13:38:08 -07:00
ZappoMan
a0666d5e99
testing windows render bug
2015-07-23 13:17:12 -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
ZappoMan
91d317f964
testing windows render bug
2015-07-23 12:42:55 -07:00
samcake
fecb0e3675
Merge pull request #5398 from ZappoMan/removeTextureRescale
...
remove rescaling of textures
2015-07-23 11:22:38 -07:00
samcake
805e7326e0
Merge pull request #5396 from ZappoMan/deadCodeRemoval
...
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 11:11:35 -07:00
Brad Hefta-Gaub
ea7238f17b
Merge pull request #5400 from jherico/homer
...
Preserve normals buffer during lighting resolution
2015-07-23 09:53:51 -07:00
Seth Alves
5a1c1446cd
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-23 09:46:48 -07:00
Seth Alves
57eb798d63
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-23 09:46:41 -07:00
Bradley Austin Davis
f19800f0de
Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO
2015-07-23 12:37:58 -04:00
ZappoMan
06b6c49b9a
remove rescaling of textures
2015-07-23 08:56:59 -07:00
Brad Hefta-Gaub
0ec5dea532
Merge pull request #5397 from huffman/fix-model-entity-list
...
Fix model entity not showing up in list on creation
2015-07-23 08:54:25 -07:00
Ryan Huffman
c17a603714
Fix model entity not showing up in list on creation
2015-07-23 08:42:29 -07:00
ZappoMan
bd6534a991
remove deprecated renderBatch()
2015-07-23 08:35:03 -07:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
Brad Hefta-Gaub
e729a87328
Merge pull request #5393 from ctrlaltdavid/20632
...
WL#20632 - Remove unused postLighting variable from code
2015-07-23 08:24:09 -07:00
Brad Hefta-Gaub
a27a2f601b
Merge pull request #5395 from huffman/fix-ray-picking
...
Fix ray picking working intermittently
2015-07-23 08:15:15 -07:00
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -07:00
Brad Hefta-Gaub
36f63e488c
Merge pull request #5388 from birarda/assignment-deadlock
...
avoid entity-server node/octree deadlock on shutdown
2015-07-23 06:17:55 -07:00
Ryan Huffman
198b6cfa88
Fix ray picking working intermittently
...
Ray picking relies on the Application's viewFrustum which was being set
to both the main camera and mirror camera for their respective pass
while rendering. This makes sure the viewFrustum only ever holds the
main camera. Application::_displayViewFrustum still gets updated to
the current camera while rendering.
2015-07-23 06:17:08 -07:00
