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
Howard Stearns
878f7129f4
Merge pull request #5 from sethalves/rig
...
Rig
2015-07-23 17:32:41 -05: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
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
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
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
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
Brad Hefta-Gaub
4236c866e7
Merge pull request #5394 from birarda/bisect-touch
...
stop gap for touch event lag at low framerates
2015-07-23 06:15:47 -07:00
Howard Stearns
3be452f217
Merge branch 'sethalves-rig' into rig
2015-07-22 21:09:21 -07:00
Howard Stearns
a1a10ad08e
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig
2015-07-22 21:08:57 -07:00
Howard Stearns
5a0c1a9402
Checkpoint testing stuff.
2015-07-22 21:03:48 -07:00
Seth Alves
ee334ff826
JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.
2015-07-22 18:43:10 -07:00
Stephen Birarda
7cee5f3ce5
don't reset the idleTimer if the interval hasn't changed
2015-07-22 18:05:04 -07:00
Stephen Birarda
db5e8c72ee
force event processing up to a certain max time
2015-07-22 17:59:07 -07:00
David Rowe
11078d0d02
Get Developer > Avatar > Show Collision Bounding Shapes working again
...
Note: Currently doesn't display well because alpha isn't working.
2015-07-22 17:50:56 -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
Stephen Birarda
785ae190ca
add back send posted touch events
2015-07-22 17:49:27 -07:00
Stephen Birarda
f3fd5c9847
Merge pull request #5392 from ZappoMan/master
...
Revert "Instrument the inter-idle time and tweaking the timeout setting"
2015-07-22 17:12:27 -07:00
ZappoMan
71eeecc7f6
Revert "Instrument the inter-idle time and tweaking the timeout setting"
...
This reverts commit 0c88972f09
2015-07-22 16:53:56 -07:00
Philip Rosedale
a02822c376
Merge pull request #5389 from huffman/fix-billboard-face-camera
...
Fix face-camera functionality for BillboardOverlay
2015-07-22 16:28:11 -07:00
Stephen Birarda
791953740b
Merge pull request #5391 from AndrewMeadows/bohrium
...
fix crash for convex hull of co-planar points
2015-07-22 16:08:01 -07:00
Andrew Meadows
bf3ff8daea
fix crash for convex hull of co-planar points
2015-07-22 15:06:10 -07:00
Ryan Huffman
9e2eb7fdbd
Fix face-camera functionality for BillboardOverlay
2015-07-22 14:49:20 -07:00
Howard Stearns
8173dc2c9a
Remove text extensions reference that isn't needed and which has changed underneath us.
2015-07-22 14:21:42 -07:00
Howard Stearns
809fa1c45f
Merge pull request #2 from sethalves/rig
...
Rig
2015-07-22 16:03:50 -05:00
Stephen Birarda
67294d3a23
rename nodesToKill to nodesToShutdown
2015-07-22 13:55:22 -07:00
