samcake
d128af48db
Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL
2016-06-28 13:47:55 -07:00
samcake
197d49fc03
introducing the depth aware blur
2016-06-27 17:04:37 -07:00
samcake
938bc77b1f
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-27 10:13:00 -07:00
Andrew Meadows
53af5db77b
Merge pull request #8141 from sethalves/unwedge-hydras-on-linux
...
workaround to allow models and files to be loaded on linux
2016-06-27 09:49:08 -07:00
Seth Alves
bbe9b931be
on Linux, don't mess with the menus from the hydra plugin because it makes Qt stop
2016-06-26 14:59:42 -07:00
Brad Hefta-Gaub
c92293e559
Merge pull request #8138 from marko8904/master
...
sign executables with SHA256
2016-06-25 11:06:35 -07:00
Marko Kudjerski
17ce80ed69
sign executables with SHA256
2016-06-24 19:28:31 -07:00
Howard Stearns
de7738e644
Merge pull request #8134 from highfidelity/vive-ui
...
Vive UI bug fixes
2016-06-24 18:39:06 -07:00
samcake
9bc8441c73
Friday night build, working on getting the LUT generated on the GPU
2016-06-24 17:50:43 -07:00
samcake
a619a142ed
Friday night build, working on getting the LUT generated on the GPU
2016-06-24 17:48:40 -07:00
Sam Gondelman
3c809ef40c
Merge pull request #8123 from AlexanderOtavka/first-person-hmd
...
Automatically enter first person when in HMD mode
2016-06-24 15:58:38 -07:00
Ken Cooke
36ebe4a4f6
Merge pull request #8125 from ZappoMan/simplifyResamplerUse
...
cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler
2016-06-24 15:43:04 -07:00
Anthony Thibault
aa8d1d097e
Merge pull request #8133 from howard-stearns/do-not-recenter-hud-from-button
...
do not reset hud from button
2016-06-24 15:35:14 -07:00
howard-stearns
9ae3c38616
doh!
2016-06-24 15:26:24 -07:00
howard-stearns
2ae0a7defc
If there are TWO conditions holding things back, weight for them both to
...
clear.
2016-06-24 14:46:46 -07:00
Brad Hefta-Gaub
2e8f6c2cc6
Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject
...
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
2016-06-24 14:08:29 -07:00
Howard Stearns
f7e9d3968a
Merge pull request #8127 from hyperlogic/bug-fix/grab-visualization-improvements
...
grab visualization improvements
2016-06-24 14:01:44 -07:00
howard-stearns
7da854d98c
do not reset hud from button
2016-06-24 13:35:47 -07:00
Anthony J. Thibault
41fcfb45ca
Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements
2016-06-24 13:28:00 -07:00
Zander Otavka
dd023e16fd
Tabs -> spaces
2016-06-24 13:16:24 -07:00
Howard Stearns
c4398c3950
Merge pull request #8129 from ZappoMan/reduceLogSpam
...
reduce log spam in Vive plugins
2016-06-24 13:00:13 -07:00
howard-stearns
6a1dd235c9
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-24 12:49:54 -07:00
Howard Stearns
86efb3d8bd
Merge pull request #8131 from hyperlogic/bug-fix/grab-script-search-ray-distance
...
Fix for grab script search ray length
2016-06-24 12:47:31 -07:00
samcake
61f5088ef3
Merge pull request #8130 from jherico/qml_window_visibility
...
Fix initial visibility of QML windows from scripts
2016-06-24 12:42:17 -07:00
Brad Hefta-Gaub
1c19d61035
Merge pull request #8122 from SamGondelman/macHydrasFix
...
Removed Mac Hydra support
2016-06-24 12:21:13 -07:00
Brad Hefta-Gaub
cea4b27b4d
Merge pull request #8128 from zzmp/feat/heartbeat-build-version
...
add build version to heartbeat
2016-06-24 12:20:16 -07:00
Brad Hefta-Gaub
4510bb1674
Merge pull request #8098 from zzmp/feat/temp-domain-heartbeats
...
add heartbeats to metaverse for temporary domains
2016-06-24 12:08:37 -07:00
Anthony J. Thibault
8bf72f28da
Fix for grab script search ray length
2016-06-24 12:06:02 -07:00
Zander Otavka
0c56af7ae8
Add default script to enter first person for HMD
2016-06-24 11:57:50 -07:00
Zander Otavka
d45694836f
Add signal for display mode change in HMD
2016-06-24 11:57:12 -07:00
Brad Davis
a095da31fd
Fix initial visibility of QML windows from scripts
2016-06-24 11:48:55 -07:00
Brad Hefta-Gaub
39ff03cfb5
reduce log spam in Vive plugins
2016-06-24 10:53:46 -07:00
Zander Otavka
41d38ab630
Revert "Automatically enter first person when in HMD mode"
...
This reverts commit 3c9f3f3927
2016-06-24 10:16:40 -07:00
Zander Otavka
88ad570024
Revert "Uses spaces, not tabs"
...
This reverts commit 7e5b9db13a
2016-06-24 10:16:26 -07:00
samcake
ec68eba3cb
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-24 09:37:52 -07:00
samcake
e95a31f760
CLeaning up and debugging the splotch
2016-06-24 09:18:04 -07:00
Brad Davis
e8a5c00f3e
Merge pull request #8126 from howard-stearns/fix-reticle-bugs
...
fix reticle bugs
2016-06-23 20:00:34 -07:00
Zach Pomerantz
1fcd7aa0c4
add build version to heartbeat
2016-06-23 19:55:16 -07:00
Zach Pomerantz
b1b378a91f
add back access token to domain-server
2016-06-23 19:38:41 -07:00
Zach Pomerantz
13310923c4
reset to temp domain after logout
2016-06-23 19:38:23 -07:00
Zach Pomerantz
1de1c632af
use private_description instead of description for domain settings
2016-06-23 17:16:42 -07:00
samcake
884b9211c6
Curvature is looking correct now without artefact, moving on to the lighting
2016-06-23 17:13:48 -07:00
Anthony J. Thibault
7bd553c09c
near grab logic to uses sphere vs entity box
...
instead of sphere vs sphere. Adjusted debug drawing accordingly.
2016-06-23 17:03:15 -07:00
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51:15 -07:00
Anthony J. Thibault
eabb8d08c0
Merge branch 'vive-ui' into feature/equip-hotspots
2016-06-23 15:42:55 -07:00
Anthony J. Thibault
fc42a3aef5
Grab script hotspot work
...
* Updated grab/equip logic to use sphere vs sphere tests, instead of sphere vs entity bounding box.
* Added debug flag for visualizing grab spheres.
* hotspot overlays are now updated as the objects they are attached to move.
* You can now use the search beam to near grab large objects, as well as the sphere sphere test.
* Optimized EntityPropertyCache to make a single call to Entities.getEntityProperties instead of three.
* Moved grab script options from the "Developer > Hands" menu to the "Developer > Grab Script" menu.
2016-06-23 15:36:47 -07:00
Seth Alves
2fd38c1585
when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree
2016-06-23 13:10:15 -07:00
Brad Hefta-Gaub
da74114b32
Merge pull request #8070 from AndrewMeadows/triangle-soup-4
...
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
Brad Hefta-Gaub
6111e4952a
fix comments
2016-06-23 10:59:26 -07:00
Andrew Meadows
1d8d1240ca
remove override to avoid new Jenkins OSX warnings
2016-06-23 10:38:46 -07:00
