Commit graph

58722 commits

Author SHA1 Message Date
David Kelly
1903f65e45 oops 2017-09-08 16:58:12 -07:00
David Kelly
0a3958f743 cr feedback 2017-09-08 16:06:30 -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
David Kelly
3e0b222ec4 fix wallet for new openssl 2017-09-08 11:44:19 -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
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
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
Brad Davis
cc3beb3d91 Fix potential crash on asynchronous QML loads 2017-09-07 09:53:21 -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
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
Cain Kilgore
d429bd0b01 Changed the Interface text to say 'Task bar' instead of 'system tray' 2017-09-06 13:42:13 +01:00
Cain Kilgore
2a6b523542 Again 2017-09-06 13:09:43 +01:00
Cain Kilgore
14e5cf31f2 Apparently I didn't need 'em 2017-09-06 12:42:17 +01:00
Cain Kilgore
4d0df705a9 Forgot some {}'s 2017-09-06 11:46:57 +01:00
Dante Ruiz
e216fe51ea Merge pull request #11221 from vladest/flickable_web_pages
Flickable web pages
2017-09-05 18:49:57 -07:00
Cain Kilgore
e9f666d970 Made the system tray message specific to Sandbox only 2017-09-06 02:06:10 +01: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
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
Melissa Brown
fe1b614f39 Merge pull request #11213 from MidnightRift/21341
WL 21341 DodgeBall
2017-09-05 15:33:31 -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
David Kelly
ee70df502e Merge pull request #11307 from davidkelly/dk/commerceRegression
Regression in injection script
2017-09-05 13:02:33 -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
4bdfe092cf Regression in injection script 2017-09-05 12:28:31 -07:00
David Kelly
b3132e9871 Merge pull request #11304 from davidkelly/dk/commerceResetBug
Reset passphrase fix
2017-09-05 11:27:02 -07:00
beholder
c0e7e5a8b2 7385 - Collect Stats on "Exit VR" button 2017-09-05 21:26:35 +03:00
Cain Kilgore
0e57df5483 Deleted unnecessary file 2017-09-05 18:54:54 +01:00
David Kelly
3bc45aefb1 Reset passphrase fix 2017-09-05 10:04:16 -07:00
Andrew Meadows
4b8840f307 Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1
fix a bug that caused dynamic children to wink in and out and then vanish
2017-09-05 10:02:47 -07:00
Cain Kilgore
99a99ce71b WL 21513 - Update text in the "How to Quit The Sandbox" Prompt 2017-09-04 21:14:26 +01:00