Anthony J. Thibault
72e0c844e4
Merge branch 'master' into feature/ant-man
2017-09-08 14:08:26 -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
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
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
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
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
Daniela
d11a749365
Refactor 1 line. Pad alignment is correct.
2017-09-07 19:28:36 +01:00
Daniela
94e26a554d
Add 180 degrees rotation so that pad faces the avatar
2017-09-07 18:48:20 +01:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
Daniela
4c302b899d
Fix teleport pad alignment
2017-09-07 17:52:09 +01:00
Daniela
3ff707f27e
Add Avatar resize compatible teleport pad alignment
2017-09-07 13:31:41 +01: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
Daniela
37f959d749
Add Avatar resize compatible teleport pad alignment
2017-09-06 19:45:58 +01:00
Anthony J. Thibault
2f850826f2
Allow override of near/far clip planes in Oculus and OpenVR plugins
2017-09-06 11:02:44 -07: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
Dante Ruiz
e216fe51ea
Merge pull request #11221 from vladest/flickable_web_pages
...
Flickable web pages
2017-09-05 18:49:57 -07:00
Liv
930243539c
add back first run to false and fix formatting
2017-09-05 17:50:25 -07:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
David Kelly
89cda8d306
oops -- === not ==
2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f
fix passphrase reset
2017-09-05 17:03:11 -07:00
David Kelly
350cee5f35
Wallet cleanup
2017-09-05 16:33:16 -07:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -07:00
Thijs Wenker
08baa96dc9
Merge pull request #11296 from misslivirose/fix-content-message
...
More detailed domain replacement message
2017-09-06 00:44:48 +02:00
Anthony J. Thibault
23ff1b9ead
Fixes for scaling controller display
...
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
vladest
85a3771a98
Remove commented out code
2017-09-05 22:19:38 +02:00
vladest
dd6d530853
Merge branch 'master' into flickable_web_pages
2017-09-05 22:14:52 +02:00
Dante Ruiz
ad5b8c438e
Merge pull request #11107 from mnafees/21412
...
CR for Job #21412 - Add "Report a Problem" feature
2017-09-05 13:05:05 -07:00
Dante Ruiz
9f2bdce190
Merge pull request #11005 from Armads/WL21424
...
WL21424 hide head attachments when head joint is hidden
2017-09-05 13:04:14 -07:00
Dante Ruiz
e69227aef8
Merge pull request #11209 from vladest/tablet_login_button
...
Added login button to Tablet
2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1
Reset passphrase fix
2017-09-05 10:04:16 -07:00
Anthony J. Thibault
f0912987a3
Fix ray picks against HUD sphere at different sensor scale factors
2017-09-05 10:03:19 -07:00
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
beholder
b5faa8ac56
7382 Create Menu does not Work on Tablet
2017-09-02 18:20:00 +03:00
David Kelly
47cd47f819
log when no passphrase was set before trying to decrypt
2017-09-01 14:50:45 -07:00
David Kelly
feaa8d3120
Someday, a real rain will come and wash Wallet.cpp
...
Till then, this little change will have to do.
2017-09-01 14:06:43 -07:00
David Kelly
90316e275a
Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal
2017-09-01 13:33:23 -07:00
Liv
7eab80e494
change message when permissions to replace domain content are not present
2017-09-01 13:17:37 -07:00
David Kelly
9fe6ce0337
working change passphrase. some cleanup to come
2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
2017-09-01 11:53:47 -07:00
Zach Fox
51699c9a6a
Minor changes to fonts and colors
2017-09-01 11:44:46 -07:00
David Kelly
d8bb3c7915
Merge pull request #11289 from davidkelly/dk/penniesAndStuff
...
Display hfc in "pennies"
2017-09-01 11:39:30 -07:00
