Daniela
c88c70aa6f
Add SensorToWorldScale factor to the bounding box dimensions.
2017-09-12 18:11:45 +01:00
Anthony J. Thibault
bb5e808051
Fix for some of tablet size issues, on switching domains.
2017-09-11 18:59:52 -07:00
Anthony J. Thibault
b81f85e1ae
Merge branch 'master' into feature/ant-man
2017-09-11 15:14:03 -07:00
anshuman64
996277b34c
Merge pull request #11335 from vladest/menu_fix
...
Make sure root item is created before lambda gets called for desktop …
2017-09-11 12:47:40 -07:00
vladest
34c1cb6579
Typos and naming fixes
2017-09-11 19:42:05 +02:00
Howard Stearns
54deef8f32
Merge pull request #11329 from davidkelly/dk/walletSSLFix
...
fix wallet for new openssl
2017-09-11 10:07:12 -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
vladest
dfaa8761e5
Make sure root item is created before lambda gets called for desktop loader
2017-09-10 20:08:40 +02:00
David Rowe
6ba6c6ee35
Reduce entity fade-in time
2017-09-09 18:00:21 +12:00
David Kelly
1903f65e45
oops
2017-09-08 16:58:12 -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
David Kelly
0a3958f743
cr feedback
2017-09-08 16:06:30 -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
Anthony J. Thibault
72e0c844e4
Merge branch 'master' into feature/ant-man
2017-09-08 14:08:26 -07:00
David Kelly
99cdbbe306
and lets fix the purchases flow too
2017-09-08 14:00:09 -07:00
David Kelly
c142215935
oops -- this is a windows-only thing (like so many other problems)
2017-09-08 12:52:12 -07:00
Sam Gateau
ed8aa8b74d
Merge pull request #11160 from Zvork/outline
...
Outline effect
2017-09-08 12:32:01 -07:00
David Kelly
3e0b222ec4
fix wallet for new openssl
2017-09-08 11:44: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
Bradley Austin Davis
48b6586d01
Modifying SDL initialization due to crash on OSX
2017-09-08 11:36:32 -07:00
Daniela
e453bf8d55
Refactoring.
2017-09-08 17:58:16 +01:00
Daniela
08688dc9ed
Refactoring.
2017-09-08 17:56:11 +01: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
Daniela
758f049f30
Correct offset for teleport pad.
2017-09-08 14:02:26 +01:00
David Kelly
45c8dd9dd4
cr feedback
2017-09-08 05:28:41 -07:00
Daniela
10e29d1cf0
Decrease offset for teleport pad. Add Bubble orientation and scale correction.
2017-09-08 12:45:29 +01:00
Daniela
fde5e14c04
Merge branch 'feature/ant-man' of https://github.com/hyperlogic/hifi into feature/ant-man
2017-09-08 11:54:43 +01:00
Daniela
9eb429b25a
Fix offset for teleport pad.
2017-09-08 11:23:19 +01: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
Anthony J. Thibault
7ca498dc7f
Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar.
2017-09-07 16:28:08 -07:00
Anthony J. Thibault
f4f9c29bff
Fix for avatar scale preferences
2017-09-07 15:30:16 -07:00
Anthony J. Thibault
d0f9a20a01
Fix for tablet grabbing at small scales
2017-09-07 15:10:15 -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
Daniela
d11a749365
Refactor 1 line. Pad alignment is correct.
2017-09-07 19:28:36 +01:00
