Commit graph

29028 commits

Author SHA1 Message Date
Bradley Austin Davis
ba9bd6b9b5 Make OpenVR windows only for now 2015-07-27 09:45:15 -04:00
Bradley Austin Davis
6d8adbf2b5 Make OpenVR windows only for now 2015-07-27 09:13:04 -04:00
Bradley Austin Davis
671bda8883 Working on linux build 2015-07-25 20:58:13 -04:00
Bradley Austin Davis
7edf138843 Attempting to fix offscreen UI event handling 2015-07-25 19:26:38 -04:00
Brad Davis
ce9a6298f0 Merge pull request #5429 from SamGondelman/macPluginsFix
Mac Sixense/Oculus init_hid fix
2015-07-25 11:45:48 -04:00
Sam Gondelman
0aee95fe38 oculus sdk initialization done in activate/deactivate, not init/deinit 2015-07-24 17:44:20 -07:00
Sam Gondelman
f801471dd7 remove unnecessary line 2015-07-24 17:33:06 -07:00
Sam Gondelman
1af51572af fixed init crash if you follow very specific startup steps 2015-07-24 17:10:39 -07:00
Sam Gondelman
0e4d065cbc Merge remote-tracking branch 'upstream/plugins' into macPluginsFix 2015-07-24 16:52:16 -07:00
Brad Davis
dc4ef8e648 Merge pull request #5426 from hyperlogic/ajt/vive-camera-fix
paintGL camera change for Vive
2015-07-24 18:43:34 -04:00
Sam Gondelman
07aed20280 paintGL camera change for Vive
During rendering the application camera needs to be somewhere near where it's final position.
This is because it is used in several places, specifically it is used to determine if the camera is close
to the avatar's head, in order to hide it.
2015-07-24 15:37:39 -07:00
Brad Davis
a00c9dd602 Merge pull request #5425 from hyperlogic/ajt/sixense-fix
Fix for memory corruption in Sixense ctor
2015-07-24 18:12:21 -04:00
Bradley Austin Davis
08a1c6c5ab Removing dead code 2015-07-24 17:33:41 -04:00
Bradley Austin Davis
0efa2c0eee Merge remote-tracking branch 'upstream/master' into plugins 2015-07-24 17:33:24 -04:00
Anthony J. Thibault
6fb6550641 Fix for memory corruption in Sixense ctor
This was due to interface having a different size for SixenseManager then
input-plugins expected.  This would cause the new operator allocation to be too small.
2015-07-24 14:03:53 -07:00
Brad Davis
9727302d02 Merge pull request #5423 from hyperlogic/ajt/overlay-fade
Update ApplicationCompositor to use QPropertyAnimation for alpha fades
2015-07-24 14:28:32 -04:00
Anthony J. Thibault
c602346cad Update ApplicationCompositor to use QPropertyAnimation for alpha fades 2015-07-24 11:14:09 -07:00
Bradley Austin Davis
975c95eded Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins 2015-07-24 13:59:11 -04:00
samcake
f3dc159e33 Merge pull request #5401 from ZappoMan/renderLaserPointers
remove renderLaserPointers()
2015-07-24 10:41:32 -07:00
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
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04: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
Anthony J. Thibault
87a0e48d30 Updates to overlay fade
* vive rendering works again
* overlay fades away in standing mode, if you look or move away from the overlay sphere.
* middle mouse button can be used to fade in or out the overlay
* mouse pointer renders properly on overlay
2015-07-23 20:36:58 -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
Anthony J. Thibault
1d93abf90c Overlay can be shown and hidden and has better behavior in Standing HMD Mode.
Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances
so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.
2015-07-23 17:17:03 -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
Sam Gondelman
7c9189cfbe trying to fix init issue 2015-07-23 16:13:27 -07:00