Brad Hefta-Gaub
2c3fdc995f
Away improvements
2016-02-29 20:23:06 -08:00
samcake
e72035ee3d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-29 18:55:30 -08:00
Anthony J. Thibault
460582239a
Avatar eye look at fixes for HMDs
...
There were three things that were causing issues with eye look at vectors while wearing an HMD.
1) The matrix returned by AvatarUpdate->getHeadPose() was in the wrong space, it should be in avatar space.
it was actually returning a matrix in sensor/room space.
2) The lookAtPosition was incorrect while wearing an HMD and with no avatars to look at.
3) The eye rotation limits in Rig::updateEyeJoint were relative to the model's zero orientation, NOT relative to the head.
this was causing the eyes to hit limits when the avatar head turned.
2016-02-29 18:02:50 -08:00
Anthony J. Thibault
99bd0f3d13
MyAvatar: fixes for eye look at
...
Users in desktop mode should now see the eyes change focus between the left eye, right eye and the mouth.
Users in mirror mode, or third person camera, should more accurately determine which avatar to look at.
2016-02-29 16:49:35 -08:00
David Rowe
ddc5e952f1
Merge branch 'master' into 20812
2016-03-01 11:16:14 +13:00
Brad Hefta-Gaub
bd80ecd4dc
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-29 13:17:24 -08:00
Seth Alves
95f9793999
Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-more
2016-02-29 11:35:58 -08:00
samcake
4bec6ddf52
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-29 09:20:37 -08:00
Brad Hefta-Gaub
8de4a59078
add support for auto-hide reticle and seek lookat on auto-show of reticle
2016-02-28 13:06:49 -08:00
Brad Davis
d932cb7578
Merge pull request #7212 from ZappoMan/depthReticleWork
...
add fade between depths in depth reticle
2016-02-28 12:49:47 -08:00
Brad Hefta-Gaub
188cf3694b
fix rotation of depth reticle
2016-02-27 17:31:35 -08:00
David Rowe
98eb94ecef
Fix up capitalization of other settings dialogs
2016-02-27 13:30:49 +13:00
samcake
99ba011996
Post merge with Zach work for environment map
2016-02-26 16:04:50 -08:00
Zach Pomerantz
5995c3717f
Continue updating overlay key on edit
2016-02-26 14:46:42 -08:00
Anthony J. Thibault
9a01c93322
Avatar: fix for rendering avatar attachments
2016-02-26 14:28:27 -08:00
David Rowe
839303168e
Fix missed capital
2016-02-27 11:20:31 +13:00
David Rowe
247ba7d3dd
Merge branch 'master' into 20812
2016-02-27 11:05:47 +13:00
David Rowe
e8f349ec31
Fix up capitalization of labels and use of colons
2016-02-27 11:02:39 +13: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
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
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
Seth Alves
4873a1e26b
Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-more
2016-02-25 15:40:21 -08:00
Seth Alves
74452bc890
put back some code that shouldn't have been removed
2016-02-25 15:34:50 -08:00
Seth Alves
8f304d95b3
rather than computing a velocity for entities held by others as a way to keep it active in local bullet, just call activateBody over and over
2016-02-25 15:26:42 -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
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
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
samcake
ae6e625894
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-24 17:30:40 -08:00
Brad Hefta-Gaub
8b6a445b9e
fix desktop detection when not pointing at overlay area
2016-02-24 16:42:08 -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
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
Brad Hefta-Gaub
568fd3e77f
Merge pull request #7164 from ctrlaltdavid/20809
...
Restyle message box modal dialogs
2016-02-24 13:47:00 -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
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
7f679af186
Merge pull request #7176 from zzmp/menu/graphics
...
Update graphics menus
2016-02-24 08:18:58 -08:00
Clément Brisset
8e8e23452f
Merge pull request #7156 from ZappoMan/depthReticleWork
...
Depth reticle work
2016-02-23 17:54:35 -08:00
Andrew Meadows
8d91912d4b
Merge pull request #7162 from hyperlogic/tony/controller-velocity
...
Improve hand controller move and throw velocity
2016-02-23 17:13:13 -08:00
Zach Pomerantz
ea8edb3744
Remove antialiasing from menus, default to on
2016-02-23 16:24:44 -08:00
Zach Pomerantz
7ae9752272
Remove Render > Ambient Light menu
2016-02-23 16:24:43 -08:00
Chris Collins
94d018be3e
Merge pull request #7172 from zzmp/fix/stats
...
Consolidate stats for opaque/transparent/other
2016-02-23 16:23:11 -08:00
Zach Pomerantz
1f9324c78f
Move Graphics... to Developer menu
2016-02-23 16:14:41 -08:00
David Rowe
7ee1edac3a
Merge branch '20805' into 20809
2016-02-24 13:08:28 +13:00
Stephen Birarda
42582e5d0f
remove old voxel cost model from application
2016-02-23 14:53:35 -08:00
Stephen Birarda
6cab831ea0
re-gen the interface keypair while being denied from domain
2016-02-23 14:52:12 -08:00
Anthony J. Thibault
8f27424de7
MyAvatar: bug fix for avatar leaning
2016-02-23 14:30:51 -08:00
Brad Davis
2258a9cad9
Allow avatar positioning from QML
2016-02-23 12:16:41 -08:00
Zach Pomerantz
7804ee22d4
Consolidate stats for opaque/transparent/other
2016-02-23 12:14:00 -08:00
samcake
d3cdc5117f
clean up one more render::Item::isValid(ID)
2016-02-23 11:01:57 -08:00
samcake
7e39cc7753
clean up a bit the 2 globals RenderItem in APplication.cpp
2016-02-23 10:53:33 -08:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
7c9022fb3e
Fix model overlay scaling
2016-02-23 10:40:47 -08:00
Brad Hefta-Gaub
8117d51324
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-23 10:21:10 -08:00
Brad Hefta-Gaub
2db25690f1
detect when mouse is over QML overlays or 2D JS Overlays
2016-02-23 10:14:44 -08:00
samcake
9d0803e6b8
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-23 09:33:54 -08:00
David Rowe
fdb7a9cf75
Merge branch '20805' into 20809
2016-02-23 20:29:18 +13:00
David Rowe
49c229897f
Give the "change avatar?" confirmation dialog a default action
2016-02-23 17:55:36 +13:00
Anthony J. Thibault
0fd260076b
SixenseManager: fix velocity and angularVelocity computation
...
Copied the delta based computation of velocity and angularVelocity that was in
Application::setPalmData() and moved it into SixenseManager. This will guarantee
that the velocity computation is the same as it was previously. The goal here is
to NOT change the behavior of the hydra.
The moving average style calculation of velocities has been removed.
Removed dead code.
2016-02-22 20:05:41 -08:00
Brad Davis
160a107bbd
Auto-unhide the desktop when showing or raising a window
2016-02-22 19:36:00 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
Zach Pomerantz
77ad4039bc
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2
Render point/spot lights with surface radii
2016-02-22 15:07:08 -08:00
Stephen Birarda
d444d5dd18
don't offer login reset from CrashHandler
2016-02-22 13:56:33 -08:00
Brad Hefta-Gaub
3f7a2eb10a
add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay
2016-02-22 13:54:46 -08:00
Brad Hefta-Gaub
fc002df5e7
implement Reticle.depth using the apparent 3D look at logic instead
2016-02-22 13:24:14 -08:00
Ryan Huffman
e6ccf501fa
Merge pull request #7135 from zzmp/fix/grid
...
Update renderGrid to use a shader, and fix grid edit tools
2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub
715355464f
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-22 12:52:56 -08:00
