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 |
|
samcake
|
483f9a4ee3
|
Merge pull request #5 from zzmp/fix/skybox-light-orange
Fix skybox global color shader
|
2016-02-26 14:55:20 -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 |
|
Chris Collins
|
a275d95c59
|
Merge pull request #7208 from ZappoMan/showOverlayOnMenuPopup
Show overlay on menu popup
|
2016-02-26 11:00:04 -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 |
|
Philip Rosedale
|
783892ac2e
|
Merge pull request #7206 from hyperlogic/tony/simrate-fix
Application: don't simulate until we are ready to render
|
2016-02-26 07:27:35 -08:00 |
|
samcake
|
3ee6f9d6f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-25 23:48:53 -08:00 |
|
Brad Hefta-Gaub
|
a2140f7048
|
Merge pull request #7207 from AndrewMeadows/fix-setKeyholeRadius
legacy support for EntityViewer.setKeyholeRadius()
|
2016-02-25 22:48:33 -08:00 |
|
Andrew Meadows
|
ef433c0e01
|
legacy support for EntityViewer.setKeyholeRadius()
|
2016-02-25 22:24:37 -08:00 |
|
Brad Hefta-Gaub
|
bf0fb7258a
|
CR feedback
|
2016-02-25 22:01:10 -08:00 |
|
Andrew Meadows
|
2f490a0684
|
Merge pull request #7205 from AndrewMeadows/cleanup2
cleanup ViewFrustum method names (correct branch)
|
2016-02-25 21:28:22 -08:00 |
|
Anthony J. Thibault
|
e5c81f66a5
|
Application: removed threadID and milliseconds from logging.
|
2016-02-25 18:20:43 -08:00 |
|
Anthony J. Thibault
|
08c16beff2
|
Application: re-worded presentCount comments
|
2016-02-25 18:17:42 -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
|
669cc75596
|
adding ViewFrustumTests
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
92581587b1
|
cleaned up AACubeTests, added AABoxTests
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
5c11963de2
|
add unit tests for AACube
|
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 |
|
Andrew Meadows
|
8200babf78
|
fix warning about unused variable
|
2016-02-25 18:09:35 -08:00 |
|
Anthony J. Thibault
|
11cd8e03b9
|
Merge branch 'master' into tony/simrate-fix
|
2016-02-25 17:50:23 -08:00 |
|
Brad Hefta-Gaub
|
25634ea0ca
|
Merge pull request #7204 from PhilipRosedale/betterLeap
Leap Motion can near grab entities
|
2016-02-25 17:48:56 -08:00 |
|
Anthony J. Thibault
|
1fdae13de1
|
Application: don't simulate until we are ready to render.
|
2016-02-25 17:48:55 -08:00 |
|
PhilipRosedale
|
4845de68dd
|
fixed typo
|
2016-02-25 17:29:53 -08:00 |
|
Clément Brisset
|
a8a7d0f61c
|
Merge pull request #7203 from highfidelity/revert-7179-domain-security
Revert "verified domain ownership for full automatic networking"
|
2016-02-25 17:17:21 -08:00 |
|
PhilipRosedale
|
0cc1c930c5
|
mapped finger curl to trigger value
|
2016-02-25 17:04:46 -08:00 |
|
Stephen Birarda
|
34408c8144
|
Revert "verified domain ownership for full automatic networking"
|
2016-02-25 17:02:08 -08:00 |
|
Brad Hefta-Gaub
|
661e714c0b
|
Merge pull request #7170 from imgntn/tiltmaze
Tilt Maze
|
2016-02-25 16:49:17 -08:00 |
|
Zach Pomerantz
|
113596636d
|
Merge pull request #7189 from ZappoMan/depthReticleWork
fix desktop detection when not pointing at overlay area
|
2016-02-25 16:24:06 -08:00 |
|
Brad Hefta-Gaub
|
e58081ca9c
|
remove extra debug code
|
2016-02-25 16:23:12 -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 |
|
Philip Rosedale
|
86d6d255fa
|
Merge pull request #7199 from sethalves/fix-grab-heartbeat
only update heartbeat in userData of grabbed entity every 5 seconds
|
2016-02-25 16:17:11 -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
|
e7e6455d5d
|
Merge pull request #7197 from birarda/installer-order
tweak installer flow to ask everything up front
|
2016-02-25 16:10:15 -08:00 |
|