Zach Pomerantz
|
11867aa71d
|
Compile shaders to their own folders
|
2016-03-10 20:10:54 -08:00 |
|
Seth Alves
|
0268ca0888
|
Merge pull request #7219 from PhilipRosedale/editFix2
More accurate X/Z movement with edit.js
|
2016-02-29 13:23:02 -08:00 |
|
Philip Rosedale
|
3eabf0d451
|
Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand
when trigger is squeezed, check for things stuck to hand and unhook them
|
2016-02-29 12:59:02 -08:00 |
|
Andrew Meadows
|
5f6f576166
|
Merge pull request #7214 from sethalves/handle-parenting-loops
handle parenting loops
|
2016-02-29 12:57:25 -08:00 |
|
Anthony Thibault
|
9a0b91e094
|
Merge pull request #7220 from hyperlogic/tony/vive-controller-work
OpenVR: improved controller support
|
2016-02-29 12:42:40 -08:00 |
|
Philip Rosedale
|
b2fa28148a
|
Merge pull request #7202 from sethalves/fix-grab-more
don't fling held items if someone else is watching
|
2016-02-29 12:36:02 -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 |
|
Seth Alves
|
bb9d1556c6
|
when breaking a parenting loop, make an effort to keep the object near where it was when the loop was created
|
2016-02-29 11:07:02 -08:00 |
|
Seth Alves
|
3abc7d854a
|
Merge branch 'master' of github.com:highfidelity/hifi into handle-parenting-loops
|
2016-02-29 10:31:18 -08:00 |
|
PhilipRosedale
|
42f6ede43c
|
azimuth = elevation, duh
|
2016-02-29 10:22:24 -08:00 |
|
PhilipRosedale
|
d1bc31afb6
|
azimuth function is really just a ratio
|
2016-02-29 10:16:34 -08:00 |
|
PhilipRosedale
|
08eacc436f
|
Fixed rayPlane test again
|
2016-02-29 10:13:01 -08:00 |
|
Clément Brisset
|
2ffaa1f2e7
|
Merge pull request #7196 from AndrewMeadows/simulation-ownership
no expiry for simulation ownership
|
2016-02-29 08:26:53 -08:00 |
|
PhilipRosedale
|
cee79c8274
|
Fixed bug in rayPlane test
|
2016-02-28 15:44:23 -08:00 |
|
Andrew Meadows
|
a933935e2d
|
lock mutex in clearEntitiesInernal()
|
2016-02-28 15:13: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 |
|
PhilipRosedale
|
e9aed83920
|
suppress debug messages
|
2016-02-28 12:41:40 -08:00 |
|
Seth Alves
|
5bf8670bc2
|
fix SpatiallyNestable::getChildren
|
2016-02-28 12:16:41 -08:00 |
|
PhilipRosedale
|
1d681a2461
|
Add angular size and azimuth limits to object XZ translation
|
2016-02-28 12:00:13 -08:00 |
|
Brad Hefta-Gaub
|
188cf3694b
|
fix rotation of depth reticle
|
2016-02-27 17:31:35 -08:00 |
|
Brad Hefta-Gaub
|
e403c990d9
|
make fade non-linear
|
2016-02-27 17:13:09 -08:00 |
|
Anthony Thibault
|
89885805d2
|
OpenVR: Added hysteresis to the touch pad dead spot
This should make using the Vive touch pad for movement more reliable.
|
2016-02-26 18:34:33 -08:00 |
|
PhilipRosedale
|
47504a068e
|
remove unused code
|
2016-02-26 16:58:38 -08:00 |
|
PhilipRosedale
|
7fd88793dc
|
drag relative to plane where pointer collided selection box
|
2016-02-26 16:58:17 -08:00 |
|
Brad Hefta-Gaub
|
70614aba90
|
Merge pull request #7184 from imgntn/cellscience
Cellscience Updates
|
2016-02-26 16:53:00 -08:00 |
|
Brad Hefta-Gaub
|
581bd69d14
|
Merge pull request #7216 from hyperlogic/tony/attachment-render-fix
Avatar: fix for rendering avatar attachments
|
2016-02-26 15:43:13 -08:00 |
|
Anthony J. Thibault
|
01ef5aabcb
|
OpenVR: More reliable detection of left and right hands
|
2016-02-26 14:38:35 -08:00 |
|
Anthony J. Thibault
|
9a01c93322
|
Avatar: fix for rendering avatar attachments
|
2016-02-26 14:28:27 -08:00 |
|
Seth Alves
|
c0c5084149
|
handle parenting loops
|
2016-02-26 14:05:02 -08:00 |
|
Brad Hefta-Gaub
|
6d9c585604
|
add fade between depths in depth reticle
|
2016-02-26 12:01:59 -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 |
|
James B. Pollack
|
6c6ea3f0a7
|
code cleanup
|
2016-02-26 10:42:45 -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 |
|
Seth Alves
|
5594f1e4e5
|
if equipped entity vanishes, reset grab state
|
2016-02-26 10:27:34 -08:00 |
|
James B. Pollack
|
b0cb4b7199
|
disable boundaries
|
2016-02-26 10:26:02 -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 |
|
Seth Alves
|
6c9cf386a6
|
when trigger is squeezed, check for things stuck to hand and unhook them
|
2016-02-26 10:14:09 -08:00 |
|
Brad Hefta-Gaub
|
6b427e59ae
|
show the overlays when the context menu is shown
|
2016-02-26 10:12:23 -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
|
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 |
|