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
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
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
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
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
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
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
8723ff2df2
Merge pull request #11294 from zfox23/commerce_walletPassphraseModal
...
Commerce: Wallet Passphrase Input Modal
2017-09-01 17:46:09 -07:00
Seth Alves
91ee22e5a7
Merge pull request #11297 from sethalves/fix-protocol-for-pr-11290
...
PR-11290 didn't actually bump protocol version
2017-09-01 17:27:28 -07:00
Seth Alves
0855dfc1c6
PR-11290 didn't actually bump protocol version
2017-09-01 17:26:32 -07:00
Seth Alves
8ccacf34f4
Merge pull request #11290 from Menithal/21484
...
WL21484 - Add an additional parameter for entity animations to "allow translation"
2017-09-01 15:34:07 -07: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
MandatoryMania
8c6bbb4968
Merge pull request #11295 from MandatoryMania/walletImgSwitch
...
Wallet img switch
2017-09-01 10:27:04 -07:00
David Kelly
655dc61ff2
doh
2017-09-01 10:16:45 -07:00
Menithal
5506520226
Fixed missing semi colon
2017-09-01 08:20:54 +03:00
Liv
8d21b286b4
string fix
2017-08-31 19:34:01 -07:00
Hisham Qayum
ff6217069b
reverting some unneeded code changes
2017-08-31 17:30:24 -08:00
David Kelly
451936214d
initial stab at changing passphrase
2017-08-31 17:05:55 -07:00
Zach Fox
8fcdfa171d
Add debug button to clear passphrase
2017-08-31 16:51:39 -07:00
David Kelly
1eb503f526
we are qt5.6 on mac
2017-08-31 16:49:12 -07:00
Zach Fox
1bfc767daf
Quick fixes
2017-08-31 16:42:14 -07:00
Zach Fox
fa25c434ca
Messages to marketplaces.js
2017-08-31 15:50:42 -07:00
Zach Fox
0a9e3e8967
Remove unnecessary code
2017-08-31 15:46:37 -07:00
