Brad Davis
f66492b444
Merge pull request #5422 from ctrlaltdavid/20591
...
CR for 20591 - Fix setting WebWindow's width and height
2015-07-25 11:49:53 -04:00
Brad Davis
843a333727
Merge pull request #5424 from samcake/yellow
...
Cleaning up the FBO cache and the output stage in general
2015-07-25 11:49:22 -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
Bradley Austin Davis
7be33dcb58
Limit the amount of time consumed by rendering QML
2015-07-25 11:40:58 -04:00
Kevin M. Thomas
52fd45da2c
Merge branch 'master' of https://github.com/highfidelity/hifi into 20622
2015-07-25 08:02:54 -04:00
Kevin M. Thomas
beccd4fc93
Merge branch 'master' of https://github.com/highfidelity/hifi into 20628
2015-07-25 07:59:06 -04:00
Kevin M. Thomas
ca8d0d5420
Added files to zone folder and made change to jstreamplayerdomain-zone.js to allow for zone entity data field to load a stream url rather than have it hard coded in the js file. This allows for many zones to be created and simply having to put a new stream url in each data field in each zone to work.
2015-07-25 07:56:57 -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
Niraj Venkat
6bc3d65bf4
Fixing build errors
2015-07-24 16:16:18 -07:00
Philip Rosedale
e24395a226
Merge pull request #5383 from ctrlaltdavid/20630
...
Improve looking-at-me indication
2015-07-24 16:15:13 -07:00
Niraj Venkat
5dd16d9f80
Blend function applied to reduce one FBO
2015-07-24 16:07:30 -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
Sam Gateau
776d4747b2
Cleaning up the FBO cache and the output stage in general
2015-07-24 14:47:44 -07: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
Kevin M. Thomas
7966f8c708
Merge branch 'master' of https://github.com/highfidelity/hifi into 20628
2015-07-24 15:45:02 -04:00
Kevin M. Thomas
d4d5c9f935
Created a folder in examples called "zones" then moved files to location.
2015-07-24 15:43:50 -04:00
Kevin M. Thomas
ddada17b08
move jsstreamplayer.html into example/html
...
move jssstreamplayer.js script into example/example/audio
2015-07-24 15:27:16 -04:00
Kevin M. Thomas
67c9a33cc0
Update Menu.cpp
2015-07-24 15:16:02 -04:00
Kevin M. Thomas
5f7fe30b9b
Merge branch 'master' of https://github.com/highfidelity/hifi into 20618
...
# Conflicts:
# interface/src/Menu.cpp
2015-07-24 15:10:34 -04:00
Kevin M. Thomas
a6af80fa5c
Merge branch 'master' of https://github.com/highfidelity/hifi into 20622
2015-07-24 15:03:15 -04:00
Niraj Venkat
fc612ab8cd
Merge conflict fix
2015-07-24 11:29:52 -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
Niraj Venkat
e036602726
Fixing merge conflicts
2015-07-24 11:08:40 -07:00
Bradley Austin Davis
975c95eded
Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins
2015-07-24 13:59:11 -04:00
David Rowe
3893add148
Fix setting WebWindow's width and height
...
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
2015-07-24 10:43:24 -07: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
Kevin M. Thomas
28e6a4ac63
Updating master as old job related to AudioClient.h was incorretly included with current job.
2015-07-24 09:36:35 -04: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
