Commit graph

28806 commits

Author SHA1 Message Date
Seth Alves
5f2e8f5b71 Merge pull request #5419 from birarda/master
only output the no listener for type message once
2015-07-24 10:41:11 -07:00
Brad Hefta-Gaub
939638a3a8 Merge pull request #5414 from birarda/slow-events
allow the QEvent queue in Application to get behind
2015-07-24 10:10:42 -07:00
Brad Davis
6eec04c798 Merge pull request #5407 from samcake/yellow
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
2015-07-24 13:09:07 -04:00
Stephen Birarda
71557a1846 only output no listener for type message one time 2015-07-24 09:36:27 -07:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
Brad Davis
6899279d7d Merge pull request #5399 from ZappoMan/fixJSRayPick
Fix JS calls to computePickRay() when mini-mirror is showing
2015-07-24 11:46:07 -04:00
Andrew Meadows
c6b2644539 Merge pull request #5418 from sethalves/hull-tool-fatten-ignore-walls
hull creation tool ignores walls in fatten-mesh mode
2015-07-24 08:37:47 -07:00
Seth Alves
bd1a661d01 Merge pull request #5416 from ctrlaltdavid/webwindow-title
Add ability to update title of WebWindow after it's created
2015-07-24 08:27:54 -07:00
Philip Rosedale
f04291ef65 Merge pull request #5408 from thoys/20626
CR for Job #20626 - edit.js - entities list html - multi select using shift key / working delete key
2015-07-24 07:47:30 -07:00
Seth Alves
6841a47c4b Merge pull request #5412 from AndrewMeadows/bohrium
decouple FPS from rotation rate during mouse drag
2015-07-24 07:44:22 -07:00
Seth Alves
6ba135de09 when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down 2015-07-24 07:16:40 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
David Rowe
c1e1caa709 Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -07:00
Brad Hefta-Gaub
2e83378c23 Merge pull request #5411 from birarda/master
don't allow sending of billboards > MTU size
2015-07-23 18:40:30 -07:00
samcake
8421aafe33 try to fix the scaling issues on mac 2015-07-23 18:17:10 -07:00
Stephen Birarda
cdcab299b6 bring back delayed queue of Application events 2015-07-23 18:00:35 -07:00
Philip Rosedale
a1544956e3 Merge pull request #5348 from ctrlaltdavid/20602
DO NOT MERGE - QA for #20602 - Fix and improve eye saccades
2015-07-23 17:42:24 -07:00
Andrew Meadows
2fc158246d decouple FPS from rotation rate during mouse drag 2015-07-23 17:30:50 -07:00
Stephen Birarda
974108734a add a comment for size guard 2015-07-23 17:17:59 -07:00
Stephen Birarda
f919d2985b don't attempt to send the avatar billboard if too large 2015-07-23 17:17:15 -07:00
Sam Gateau
ded95a3dde removing dead code 2015-07-23 16:58:21 -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
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
David Rowe
ad7167c67a Merge branch 'master' into 20602 2015-07-23 11:22:05 -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
3350d638dd always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror 2015-07-23 09:29:27 -07:00
ZappoMan
06b6c49b9a remove rescaling of textures 2015-07-23 08:56:59 -07:00