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
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
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
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
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
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
Stephen Birarda
d22219a1f2
make myServer pointer an OctreeServer* again, it's not checked
2015-07-22 13:54:39 -07:00
Stephen Birarda
55b4784a02
avoid entity-server node/octree deadlock on shutdown
2015-07-22 13:52:49 -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
Brad Hefta-Gaub
f86c064059
Merge pull request #5387 from samcake/punk
...
Moving GL initialization to GLBackend and cleaning the gpu::Context in Application
2015-07-22 11:50:32 -07:00
Howard Stearns
a161f527c4
Comments documenting direction and questions.
2015-07-22 11:41:24 -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
Brad Davis
3407fd48a8
Merge pull request #5363 from PhilipRosedale/master
...
Birds will die if abandoned, ability to fly with birds
2015-07-22 14:13:27 -04:00
Brad Hefta-Gaub
3f8348c3d7
Merge pull request #5384 from jherico/homer
...
Make stars a little smaller
2015-07-22 11:04:15 -07:00
Sam Gateau
837ff45763
Removing code aroung the selfie fremebuffer
2015-07-22 10:57:08 -07:00
Sam Gateau
8dbd991652
USing a modern singleton guard
2015-07-22 10:54:40 -07:00
Bradley Austin Davis
68cf3776f0
Make stars a little smaller
2015-07-22 13:44:37 -04:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Brad Hefta-Gaub
bf0bf09c98
Merge pull request #5379 from jherico/marge
...
Break framebuffer operations out of TextureCache, minor naked GL removal
2015-07-22 10:24:14 -07:00
Philip Rosedale
b7a4acaf87
changed to use new Vec3.toPolar() function
2015-07-22 10:06:08 -07:00
Bradley Austin Davis
2f13488f11
Fixing FBO bug on resizing windows
2015-07-22 11:28:36 -04:00
Bradley Austin Davis
de30288b5d
Merge remote-tracking branch 'upstream/master' into marge
2015-07-22 11:03:36 -04:00
Brad Hefta-Gaub
4e04f0d887
Merge pull request #5381 from jherico/bart
...
Fix deadlock when using textoverlay from main thread
2015-07-22 07:59:35 -07:00
