Bradley Austin Davis
4ad72be0c7
Merge remote-tracking branch 'sam2/sam/input-plugins' into plugins
2015-07-23 15:40:22 -04:00
Bradley Austin Davis
96a52c4f02
Working on mac oculus functionality
2015-07-23 15:38:23 -04:00
Sam Gondelman
0bb3d5b5a0
disabled fullscreen, disabled sixense on mac temporarily
2015-07-23 11:51:36 -07:00
Sam Gondelman
4c6783a791
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-07-23 11:46:07 -07:00
Bradley Austin Davis
40485948f9
Fixing merge boo-boos
2015-07-23 13:49:17 -04:00
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04: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
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
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
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
SamGondelman
e27ba86f75
fixing merge issues with plugins
2015-07-22 14:57:59 -07:00
Ryan Huffman
9e2eb7fdbd
Fix face-camera functionality for BillboardOverlay
2015-07-22 14:49:20 -07:00
SamGondelman
505ef4c5cc
set up sixense/vive menu items with correct event forwarding
2015-07-22 11:36:31 -07:00
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -07:00
Anthony J. Thibault
700909d537
Fix for mirror rendering
...
RenderArgs _renderMode was not getting set properly in
renderRearViewMirror(). Previously this was set in PaintGL but was lost
during display plugins refactor.
2015-07-22 11:11:12 -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
Bradley Austin Davis
408bb082d7
Merge fixes, OSX compile fixes
2015-07-22 13:24:47 -04:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Bradley Austin Davis
2f13488f11
Fixing FBO bug on resizing windows
2015-07-22 11:28: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
Brad Hefta-Gaub
2bd2004bda
Merge pull request #5380 from jherico/maggie
...
Restoring starfield size and color variation
2015-07-22 07:58:15 -07:00
Bradley Austin Davis
65732d874c
Merge branch 'maggie' into marge
2015-07-22 09:07:50 -04:00
Bradley Austin Davis
c0048afbec
Merge branch 'bart' into marge
2015-07-22 09:07:45 -04:00
Bradley Austin Davis
190984657e
Merge branch 'homer' into marge
2015-07-22 09:07:33 -04:00
Bradley Austin Davis
a93e17d622
Fix domain connection status border
2015-07-22 08:27:51 -04:00
Bradley Austin Davis
9596452c32
Trying to fix oculus rendering
2015-07-22 08:07:44 -04:00
Bradley Austin Davis
ae539afafb
Fix deadlock when using textoverlay from main thread
2015-07-22 07:23:12 -04:00
Bradley Austin Davis
bd5da87551
Merge remote-tracking branch 'upstream/master' into marge
2015-07-21 19:23:38 -04:00
Bradley Austin Davis
d6994c6dfd
Restoring star size and color variation
2015-07-21 19:22:10 -04:00
SamGondelman
e3bc4b3b89
working on plugin menu manipulation
2015-07-21 13:45:33 -07:00
Brad Hefta-Gaub
6dbe6bc375
Merge pull request #5332 from ctrlaltdavid/20612
...
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
2015-07-21 13:32:56 -07:00
Sam Gateau
7b35048e52
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3
Removing the gl driver version report intiialization code out of applciation
2015-07-21 11:17:41 -07:00
Philip Rosedale
cf88bce082
Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering
...
Fix Avatar > Blue Sphere While Speaking not rendering
2015-07-21 09:11:36 -07:00
Bradley Austin Davis
fda1cb6f7b
Merge remote-tracking branch 'upstream/master' into marge
2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
Brad Davis
5b63863dca
Merge pull request #5378 from ZappoMan/warningFixes
...
coding standard fix
2015-07-21 08:52:17 -07:00
David Rowe
716211c6b7
Merge branch 'master' into fix-speech-bubble-not-rendering
2015-07-21 08:45:13 -07:00
ZappoMan
558f10640b
coding standard fix
2015-07-21 08:30:33 -07:00
Brad Davis
6d4c7cd4f2
Merge pull request #5374 from ZappoMan/warningFixes
...
Warning fixes and removing dead code
2015-07-21 07:23:40 -07:00
Brad Davis
9fd80d7954
Working on batch
2015-07-20 19:21:29 -07:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
Brad Davis
51973674f5
Merge remote-tracking branch 'upstream/master' into marge
2015-07-20 17:26:36 -07:00
