Zach Pomerantz
|
3c53078178
|
Merge pull request #7194 from ZappoMan/toggleOverlay
add toggleOverlays menu item and action
|
2016-02-26 10:17:24 -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 |
|
Brad Hefta-Gaub
|
bf0fb7258a
|
CR feedback
|
2016-02-25 22:01:10 -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
|
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
|
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
|
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 |
|
Anthony J. Thibault
|
11cd8e03b9
|
Merge branch 'master' into tony/simrate-fix
|
2016-02-25 17:50:23 -08:00 |
|
Anthony J. Thibault
|
1fdae13de1
|
Application: don't simulate until we are ready to render.
|
2016-02-25 17:48:55 -08:00 |
|
Stephen Birarda
|
34408c8144
|
Revert "verified domain ownership for full automatic networking"
|
2016-02-25 17:02:08 -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 |
|
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 |
|
Brad Hefta-Gaub
|
519a90f2bd
|
fix the overlays visible on startup case
|
2016-02-25 16:02:05 -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 |
|
Brad Hefta-Gaub
|
366aa39be8
|
handle startup overlay visibility correctly
|
2016-02-25 14:46:08 -08:00 |
|
Brad Hefta-Gaub
|
8422d4f36a
|
Merge pull request #7198 from howard-stearns/snapTurnDefault
snap turn default
|
2016-02-25 14:25:00 -08:00 |
|
Seth Alves
|
489fad4141
|
Merge pull request #7188 from ZappoMan/menuGroups
remove some unimplemented menu items
|
2016-02-25 14:00:38 -08:00 |
|
howard-stearns
|
d8fe55ddc5
|
Proper default for snapTurn preference (and new name so as to update old
users).
|
2016-02-25 13:06:34 -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
|
526f9dc248
|
check/uncheck the overlays menu when you toggle the overlays via some other mechanism
|
2016-02-25 08:41:38 -08:00 |
|
Brad Hefta-Gaub
|
5828c32041
|
add toggleOverlays menu item and action
|
2016-02-25 08:31:11 -08:00 |
|
Brad Hefta-Gaub
|
8b6a445b9e
|
fix desktop detection when not pointing at overlay area
|
2016-02-24 16:42:08 -08:00 |
|
Seth Alves
|
cfdaf643a1
|
Merge pull request #7181 from sethalves/fix-grab-action
fix avatarActionHold
|
2016-02-24 16:28:17 -08:00 |
|
Brad Hefta-Gaub
|
ecb03562d3
|
fix build buster
|
2016-02-24 16:24:48 -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 |
|
Brad Hefta-Gaub
|
f9b55c4b87
|
Merge pull request #7185 from ctrlaltdavid/20809
Fixes for new modal message dialog
|
2016-02-24 16:20:40 -08:00 |
|
Brad Hefta-Gaub
|
ca5de8d6a9
|
remove some unimplemented menu items
|
2016-02-24 16:17:11 -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 J. Thibault
|
62ed5333e0
|
AvatarActionHold: compute velocities for other avatars
|
2016-02-24 15:14:56 -08:00 |
|
Anthony J. Thibault
|
b3b4c6473d
|
Merge branch 'master' into fix-grab-action
|
2016-02-24 14:34:23 -08:00 |
|
David Rowe
|
b9a1c2051b
|
Fix modal dialog not being opaque to mouse clicks
|
2016-02-25 10:52:16 +13:00 |
|
Brad Hefta-Gaub
|
568fd3e77f
|
Merge pull request #7164 from ctrlaltdavid/20809
Restyle message box modal dialogs
|
2016-02-24 13:47:00 -08:00 |
|
Brad Hefta-Gaub
|
1699e4a396
|
Merge pull request #7131 from ctrlaltdavid/20805
Restyle the Running Scripts dialog
|
2016-02-24 13:45:40 -08:00 |
|
Zach Pomerantz
|
3c4ab077be
|
Init validOrientation for myAvatar calc
|
2016-02-24 13:16:45 -08:00 |
|
Zach Pomerantz
|
e78905a6d1
|
Rm previousDeltaTimeStep unused field from AvatarActionHold
|
2016-02-24 13:15:49 -08:00 |
|
David Rowe
|
51b41da488
|
Horizontally center short messages in the dialog
|
2016-02-25 09:15:07 +13:00 |
|
Seth Alves
|
e1b10e79df
|
don't crash when watching someone else near-grab something
|
2016-02-24 12:09:51 -08:00 |
|
Brad Hefta-Gaub
|
2a18127a01
|
Merge pull request #7171 from jherico/avatar_qml_location
Allow avatar positioning from QML
|
2016-02-24 11:37:12 -08:00 |
|
Brad Hefta-Gaub
|
3df5d0abad
|
Merge pull request #7161 from zzmp/fix/overlay-model-scale
Use proper getter for model overlay scaling
|
2016-02-24 09:31:47 -08:00 |
|
Chris Collins
|
64a07440cc
|
Merge pull request #7180 from jherico/qml
Several QML fixes
|
2016-02-24 08:20:03 -08:00 |
|
Chris Collins
|
7f679af186
|
Merge pull request #7176 from zzmp/menu/graphics
Update graphics menus
|
2016-02-24 08:18:58 -08:00 |
|