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
Sam Gateau
d56b5f39fb
strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels
2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f
Introducing the download Framebuffer call on the context to capture a snapshot
2015-07-23 16:15:10 -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
e59304ae74
Merge pull request #5406 from huffman/variadic-print
...
Update script print() to be variadic
2015-07-23 18:03:37 -05:00
ZappoMan
8007fba909
add type to shader include
2015-07-23 15:37:56 -07: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
Seth Alves
849715953d
Merge pull request #5405 from AndrewMeadows/bohrium
...
fix for underdamped avatar rotation momentum
2015-07-23 15:26:49 -07:00
Sam Gateau
dc10f30d3d
Merged
2015-07-23 15:10:42 -07:00
ZappoMan
e6262de864
CR feedback
2015-07-23 14:56:52 -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
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
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
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
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
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
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
