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
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
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
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -07:00
Brad Davis
3407fd48a8
Merge pull request #5363 from PhilipRosedale/master
...
Birds will die if abandoned, ability to fly with birds
2015-07-22 14:13:27 -04:00
Brad Hefta-Gaub
3f8348c3d7
Merge pull request #5384 from jherico/homer
...
Make stars a little smaller
2015-07-22 11:04:15 -07:00
Sam Gateau
837ff45763
Removing code aroung the selfie fremebuffer
2015-07-22 10:57:08 -07:00
Sam Gateau
8dbd991652
USing a modern singleton guard
2015-07-22 10:54:40 -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
Brad Hefta-Gaub
bf0bf09c98
Merge pull request #5379 from jherico/marge
...
Break framebuffer operations out of TextureCache, minor naked GL removal
2015-07-22 10:24:14 -07:00
Philip Rosedale
b7a4acaf87
changed to use new Vec3.toPolar() function
2015-07-22 10:06:08 -07:00
Bradley Austin Davis
2f13488f11
Fixing FBO bug on resizing windows
2015-07-22 11:28:36 -04:00
Bradley Austin Davis
de30288b5d
Merge remote-tracking branch 'upstream/master' into marge
2015-07-22 11:03: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
Brad Hefta-Gaub
60637befbc
Merge pull request #5382 from jherico/homer
...
Fix domain connection status border
2015-07-22 07:42:03 -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
Bradley Austin Davis
c3f77a1c24
Merge branch 'master' into maggie
2015-07-21 19:21:45 -04: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
Andrew Meadows
d6aa6b930b
Merge pull request #5368 from bwent/keyLightDirectionFix
...
Add Vec3 function to convert a Vec3 to/from Euler angles
2015-07-21 13:31:28 -07:00
bwent
5a8106a049
fixes in edit.js UI
2015-07-21 13:15:24 -07:00
Philip Rosedale
6c51c9e950
added ability to follow/fly with the birds
2015-07-21 12:18:52 -07:00
bwent
2b745395ec
use radius for z-component
2015-07-21 11:38:10 -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
bwent
d688e5f915
fix case where v not normalizable
2015-07-21 11:08:53 -07:00
bwent
30d4b9f635
switch to radians, overload fromPolar, use atan2
2015-07-21 11:08:53 -07:00
bwent
89eed589e2
Add Vec3 function to convert vec3 to/from euler angles
2015-07-21 11:08:53 -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
57f9abe5c8
Merge pull request #5377 from samcake/punk
...
Removing extra gl calls and removing cruff from Application.cpp
2015-07-21 06:28:27 -07:00
Brad Davis
51973674f5
Merge remote-tracking branch 'upstream/master' into marge
2015-07-20 17:26:36 -07:00
