samcake
cfcde5032c
Post merge with Zach work for environment map
2016-02-26 16:32:29 -08:00
samcake
99ba011996
Post merge with Zach work for environment map
2016-02-26 16:04:50 -08:00
Zach Pomerantz
1fbcaea4b4
Fix evalSkyboxGlobalColor
2016-02-26 14:20:21 -08:00
Zach Pomerantz
fdffd8b6e0
Track skybox mipmap levels in DeferredTransform
2016-02-26 13:51:55 -08:00
samcake
5401149713
Cleaning the tlist of textures in the NetworkTexture and in FBXMaterial
2016-02-26 12:10:13 -08:00
Chris Collins
7457b73e74
Merge pull request #7211 from zzmp/fix/default-ambience
...
Differentiate global sun and skyStage sun
2016-02-26 11:33:28 -08:00
Zach Pomerantz
712cf911b1
Differentiate global sun and skyStage sun
2016-02-26 11:06:02 -08:00
Brad Hefta-Gaub
44f45a3f29
Merge branch 'master' of https://github.com/highfidelity/hifi into showOverlayOnMenuPopup
2016-02-26 10:27:37 -08:00
Andrew Meadows
c4798870d5
Merge pull request #7200 from hyperlogic/tony/box-render-crash-fix
...
Crash fix for RenderableBoxEntityItem::render
2016-02-26 10:25:50 -08:00
Zach Pomerantz
3c53078178
Merge pull request #7194 from ZappoMan/toggleOverlay
...
add toggleOverlays menu item and action
2016-02-26 10:17:24 -08:00
Brad Hefta-Gaub
6b427e59ae
show the overlays when the context menu is shown
2016-02-26 10:12:23 -08:00
samcake
d64b9bb6d9
Drafting the support for gloss map
2016-02-26 09:18:40 -08:00
samcake
3ee6f9d6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 23:48:53 -08:00
Andrew Meadows
ef433c0e01
legacy support for EntityViewer.setKeyholeRadius()
2016-02-25 22:24:37 -08:00
Andrew Meadows
c3dfc13f88
namechange ViewFrustum::location to ::intersection
2016-02-25 18:09:35 -08:00
Andrew Meadows
acef6642c9
fix logic typo
2016-02-25 18:09:35 -08:00
Andrew Meadows
f964df6c97
final names for ViewFrustum intersection tests
2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508
namechange TouchesKeyhole to IntersectsKeyhole
2016-02-25 18:09:35 -08:00
Andrew Meadows
918880b058
use correct ViewFrustum overlap tests
2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e
cleanup names that use "keyhole"
2016-02-25 18:09:35 -08:00
Andrew Meadows
9558258f64
use cubeInKeyhole() where appropriate
2016-02-25 18:09:35 -08:00
Andrew Meadows
9409339230
add ViewFrustum::cubeInKeyhole()
2016-02-25 18:09:35 -08:00
Andrew Meadows
706cf66240
restor name: viewTest() --> frustumTest()
2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853
use shapeInFrustum() names again
...
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
2016-02-25 18:09:35 -08:00
Stephen Birarda
34408c8144
Revert "verified domain ownership for full automatic networking"
2016-02-25 17:02:08 -08:00
Brad Hefta-Gaub
b0c286bc3b
Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay
...
Conflicts:
interface/src/Application.cpp
2016-02-25 16:21:38 -08:00
Brad Hefta-Gaub
202a456e1a
Merge pull request #7126 from AndrewMeadows/cleanup
...
cleanup ViewFrustum method names
2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
82cbf19bca
Merge pull request #7078 from zzmp/fix/light-intensity
...
Reimplement light attenuation for spot and point lights
2016-02-25 16:08:28 -08:00
samcake
e55ace9b19
Merge pull request #7193 from jherico/framebuffer_fix
...
Fix framebuffer behavior when changing attachments
2016-02-25 15:58:17 -08:00
Clément Brisset
2e7c7eace5
Merge pull request #7179 from birarda/domain-security
...
verified domain ownership for full automatic networking
2016-02-25 15:24:09 -08:00
samcake
610189ded3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 14:14:04 -08:00
samcake
96fb9c4466
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
2016-02-25 14:13:35 -08:00
Anthony J. Thibault
626b170207
Crash fix for RenderableBoxEntityItem::render
2016-02-25 14:10:23 -08:00
Seth Alves
09e4c54831
Merge pull request #7192 from zzmp/fix/zone-edit-update
...
Update Scene on ZoneEntity update
2016-02-25 14:05:29 -08:00
Zach Pomerantz
c20bd6cbbc
Update Scene on ZoneEntity update
...
ZoneEntity is unique in that it is not updated
every frame that it is rendered, but only
when the avatar moves.
This introduces custom code so that the
RenderableZoneEntity initiates an update
in the EntityTreeRenderer on update,
to improve usability of zone editing.
2016-02-25 10:06:19 -08:00
Zach Pomerantz
9000c3479b
Avoid double-update of zone
2016-02-25 10:06:19 -08:00
Anthony J. Thibault
b5b3a40233
LogHandler: add option to display milliseconds in timestamp
2016-02-25 10:03:12 -08:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Andrew Meadows
9c927ea36b
ViewFrustum method renames and whitespace cleanup
...
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
Brad Hefta-Gaub
5828c32041
add toggleOverlays menu item and action
2016-02-25 08:31:11 -08:00
Brad Davis
ef33d297e2
Fix framebuffer behavior when changing attachments
2016-02-24 19:57:00 -08:00
samcake
287bfeddda
Fixing the way the Obscurance is used with the ssao map
2016-02-24 18:31:08 -08:00
samcake
ae6e625894
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-24 17:30:40 -08:00
samcake
a0d7ce145e
Adding support for emissive and occlusion maps, on to pr land
2016-02-24 17:30:29 -08:00
Zach Pomerantz
c2ed5e5474
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-24 16:24:09 -08:00
Zach Pomerantz
20bfdba14b
Avoid light prop copies when setting globalLight
2016-02-24 16:20:59 -08:00
Zach Pomerantz
1817b8ef2f
Use only skyboxTexture in DeferredLightingEffect
2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Anthony Thibault
9d9e63a947
Merge pull request #7182 from zzmp/fix/aa-shader
...
Fix fxaa shader to use texture
2016-02-24 13:51:12 -08:00
