samcake
01e4bfc53e
Trying to avoid calling getTransform on nestables from render thread
2017-09-11 17:36:10 -07:00
samcake
934364ec59
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-11 09:55:47 -07:00
Andrew Meadows
a9feca18ca
Merge pull request #11317 from vladest/fix_flickable_on_wheel
...
Add flickable on mouse wheel to web pages
2017-09-11 09:32:31 -07:00
Andrew Meadows
ce3ed68861
Merge pull request #11333 from ctrlaltdavid/faster-fade-in
...
Reduce entity fade-in time
2017-09-11 09:29:45 -07:00
Chris Collins
47a9337aa7
Merge pull request #11323 from jherico/mac_fixes
...
Mac fixes
2017-09-11 09:10:50 -07:00
Andrew Meadows
1f766f743d
Merge pull request #11293 from jherico/fix_hmd_menu
...
Fix access to menu on background thread
2017-09-11 08:26:04 -07:00
Andrew Meadows
f7ca6a45b6
Merge pull request #11299 from jherico/cleanup_cmake
...
Cleanup CMake
2017-09-11 08:21:30 -07:00
David Rowe
6ba6c6ee35
Reduce entity fade-in time
2017-09-09 18:00:21 +12: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
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
Seth Alves
967d3f69d3
suppress repeated 'item could not be rendered' messages
2017-09-08 14:13:58 -07:00
samcake
94a2cb90da
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-08 13:34:46 -07:00
Sam Gateau
ed8aa8b74d
Merge pull request #11160 from Zvork/outline
...
Outline effect
2017-09-08 12:32:01 -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
Bradley Austin Davis
48b6586d01
Modifying SDL initialization due to crash on OSX
2017-09-08 11:36:32 -07:00
samcake
6fab8df8d2
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-08 09:13:29 -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
samcake
73ec095235
fooling around with communicating the update transform to render thread through a trasnaction, not the solution yet
2017-09-07 17:58:16 -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
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
Bradley Austin Davis
37b184d982
Fix crashes in entity rendering on OSX
2017-09-07 14:32:50 -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
samcake
e48c456d24
Trying to sync the render transform for overlay web at the right time...
2017-09-06 17:57:18 -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
vladest
31a23acb1a
Add flickable on mouse wheel to web pages
2017-09-06 23:04:58 +02: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
