Seth Alves
a1ffc7abd0
distance from controller to object is sometimes decided by pickray
2017-09-08 17:04:09 -07:00
Seth Alves
56d5f587b6
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 17:03:29 -07:00
Seth Alves
f5d77104c3
Merge pull request #11332 from sethalves/squelch-cannot-render
...
suppress repeated 'item could not be rendered' messages
2017-09-08 16:23:22 -07:00
Seth Alves
eddf1efb6f
Merge branch 'squelch-cannot-render' of github.com:sethalves/hifi into controller-dispatcher-1
2017-09-08 15:32:54 -07:00
Anthony Thibault
3de518a843
Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose
...
Fix MyAvatar getting stuck in T-pose on loading
2017-09-08 15:18:57 -07:00
druiz17
42ef397b5e
fixed include path
2017-09-08 15:13:19 -07:00
Seth Alves
967d3f69d3
suppress repeated 'item could not be rendered' messages
2017-09-08 14:13:58 -07:00
druiz17
5d1a5eea4c
added test file
2017-09-08 13:45:45 -07:00
druiz17
b3e2c7ac56
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 13:30:48 -07:00
druiz17
e33012e522
laser on tablet update
2017-09-08 13:30:30 -07:00
Sam Gateau
ed8aa8b74d
Merge pull request #11160 from Zvork/outline
...
Outline effect
2017-09-08 12:32:01 -07:00
druiz17
dbb91e5953
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd
some small bug fixes
2017-09-08 11:50:19 -07:00
Anthony J. Thibault
559ac6786d
Fix MyAvatar getting stuck in T-pose on loading
...
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene(). They both would end up setting the
Model::_addedToScene flag. This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
2017-09-08 11:44:06 -07:00
David Kelly
db0ecb61fd
Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework
...
Use new hfc account endpoint
2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4
cr feedback
2017-09-08 05:28:41 -07:00
Olivier Prat
d6d36cbd43
Outline working on voxels
2017-09-08 11:14:06 +02:00
David Kelly
bb07a586ca
warning, plus salting passphrase now
2017-09-07 19:24:31 -07:00
David Kelly
efdc340c5c
Use new hfc account endpoint
2017-09-07 18:15:04 -07:00
Melissa Brown
cb2911f3e0
Merge pull request #11305 from cain-kilgore/delete-test-plan
...
Deleted unnecessary Test Plan 2.docx
2017-09-07 16:59:53 -07:00
druiz17
ef050a09f9
made requested changes and also allow entities/overlays to be grabbed by the grip button
2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub
ca00349abc
Merge pull request #11248 from birarda/feat/install-remember-custom
...
remember if express or custom was selected for install
2017-09-07 12:43:01 -07:00
Brad Hefta-Gaub
6a1fe81832
Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002
...
split packet construction from packet sending in OctreeSendThread
2017-09-07 12:36:29 -07:00
Brad Hefta-Gaub
b316f366fc
Merge pull request #11198 from druiz17/oculus-tablet-position
...
fixed tablet spawn position for oculus menu button
2017-09-07 12:30:33 -07:00
Thijs Wenker
e2229b3c38
Merge pull request #11302 from cain-kilgore/21523
...
WL 21523 - Update text in the "How to Quit The Sandbox" Prompt
2017-09-07 21:04:34 +02:00
Chris Collins
12d720805c
Merge pull request #11319 from jherico/async_qml_load_crash
...
Fix potential crash on asynchronous QML loads
2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Brad Hefta-Gaub
3b16ebcc90
Merge pull request #11287 from jherico/vcpkg_ssl
...
Migrate to vcpkg version of OpenSSL
2017-09-07 11:53:09 -07:00
Brad Hefta-Gaub
7cce45017b
Merge pull request #11244 from birarda/bug/ice-dns-fail
...
add a timeout for ICE server DNS lookup
2017-09-07 11:09:05 -07:00
Cain Kilgore
84f37b9663
Changed string name
2017-09-07 18:53:05 +01:00
Brad Hefta-Gaub
fce8715457
Merge pull request #11306 from ElderOrb/case7385
...
7385 - Collect Stats on "Exit VR" button
2017-09-07 10:18:58 -07:00
Olivier Prat
7fb7ebca57
Fixed warning on Mac
2017-09-07 19:03:22 +02:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
Olivier Prat
6b5ca0c6ce
Optimized by removing unnecessary Z buffer copy
2017-09-07 18:33:00 +02:00
Olivier Prat
2003495166
Adjustments to half texel fix
2017-09-07 12:30:20 +02:00
Olivier Prat
b43514fb8b
Modified outline shader to do fill branch on CPU. Fixed assymetric outline
...
due to depth sample not offset by a half texel in shader.
2017-09-07 12:15:38 +02:00
Olivier Prat
b9eb317d9b
Fixed non working outline in stereo with new changes
2017-09-07 10:33:55 +02:00
Olivier Prat
796c59b9c2
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-09-07 10:13:53 +02:00
druiz17
636e906191
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 17:15:18 -07:00
druiz17
cc7a222374
fixing Hifi-Hand-Drop for equipEntity
2017-09-06 17:15:05 -07:00
druiz17
0d66bfca05
added far trigger
2017-09-06 14:58:04 -07:00
Howard Stearns
a0ae9ee747
Merge pull request #11311 from davidkelly/dk/walletCleanup
...
wallet cleanup
2017-09-06 14:29:24 -07:00
anshuman64
94e1545e58
Merge pull request #11298 from ElderOrb/case7382
...
7382 Create Menu does not Work on Tablet
2017-09-06 14:09:41 -07:00
Olivier Prat
17e992bd14
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-09-06 19:08:37 +02:00
Olivier Prat
a83094d7c7
Still need to test this on mac
2017-09-06 19:08:31 +02:00
Olivier Prat
fe357671e1
Removed qmlc files
2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7
Debugging scripts working again with correct occlusion management
2017-09-06 19:05:15 +02:00
druiz17
6ffcf73d0e
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 09:47:54 -07:00
Olivier Prat
10643feb78
Working with specific zpass rendering for outline. Debug script needs relinking to correct config
2017-09-06 18:40:38 +02:00
Chris Collins
8563a05431
Merge pull request #11255 from misslivirose/feat/tablet-tutorial
...
Removing tutorial paths for first run experience
2017-09-06 09:23:45 -07:00
