samcake
|
e70f261de4
|
Adding the full code path, starting debugging the problems in hmd,
|
2017-09-05 18:09:46 -07:00 |
|
samcake
|
bff5d654a6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black
|
2017-09-05 11:45:41 -07:00 |
|
David Kelly
|
b3132e9871
|
Merge pull request #11304 from davidkelly/dk/commerceResetBug
Reset passphrase fix
|
2017-09-05 11:27:02 -07:00 |
|
Sam Gateau
|
78fee71524
|
seprating the constraint function
|
2017-09-05 10:04:49 -07: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 |
|
Sam Gateau
|
fd2d246f05
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black
|
2017-09-02 09:28:24 -07: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 |
|
samcake
|
2035940cc9
|
Duplicating the qml hif stuff to be able to use the same objects
|
2017-09-01 15:33:17 -07:00 |
|
samcake
|
b243475cc9
|
New stuff for better rendering f ui
|
2017-09-01 15:32:23 -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 |
|
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 |
|
samcake
|
259ec3ec11
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black
|
2017-09-01 09:30:11 -07:00 |
|
samcake
|
3695cd6164
|
Editing .gitignore to remove qmlc files
|
2017-09-01 09:27:49 -07:00 |
|
Sam Gateau
|
59c980894e
|
adding disabling of jittering for comparison
|
2017-08-31 23:51:19 -07:00 |
|
Sam Gateau
|
a3f1c487f1
|
adding disabling of jittering for comparison
|
2017-08-31 23:42:43 -07:00 |
|
Menithal
|
5506520226
|
Fixed missing semi colon
|
2017-09-01 08:20:54 +03:00 |
|
Hisham Qayum
|
ff6217069b
|
reverting some unneeded code changes
|
2017-08-31 17:30:24 -08:00 |
|
samcake
|
ddb598203e
|
COmparing against fxaa
|
2017-08-31 18:27:47 -07: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 |
|
Zach Fox
|
2c2500875f
|
Fixes and improvements
|
2017-08-31 15:39:58 -07:00 |
|
Hisham Qayum
|
6f1bb6abe2
|
wallet icon now has white background, diff design
|
2017-08-31 14:29:03 -08:00 |
|
Hisham Qayum
|
d47b29f0aa
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2017-08-31 14:16:36 -08:00 |
|
Zach Fox
|
eab2947d40
|
Auth flow
|
2017-08-31 15:16:29 -07:00 |
|
Brad Davis
|
65b49a958f
|
Merge branch 'master' into 21484
|
2017-08-31 14:59:30 -07:00 |
|
Menithal
|
0e3fc64f63
|
Fixed Inverse logic and Cleanup
|
2017-09-01 00:35:56 +03:00 |
|
Zach Fox
|
ce32d2d420
|
Checkout and Purchases
|
2017-08-31 14:12:05 -07:00 |
|
Menithal
|
663e8514de
|
Found the culprit. Was overriding the value
|
2017-09-01 00:00:24 +03:00 |
|
David Kelly
|
cdadaa8c9c
|
missed one
|
2017-08-31 13:41:53 -07:00 |
|
David Kelly
|
f8341ce1da
|
warning
|
2017-08-31 13:24:07 -07:00 |
|
David Kelly
|
de2ce1cd5f
|
warning
|
2017-08-31 13:23:38 -07:00 |
|
Zach Fox
|
21a73b2f39
|
Changes in what I think are the right direction
|
2017-08-31 13:16:10 -07:00 |
|
druiz17
|
98b1fe6138
|
Merge pull request #11266 from ElderOrb/case6819
6819 - Create button not disabled
|
2017-08-31 12:36:08 -07:00 |
|
David Kelly
|
396f108182
|
forgot this the first time
|
2017-08-31 12:18:46 -07:00 |
|
Zach Fox
|
914a6bae00
|
Commerce: Wallet Passphrase Modal
|
2017-08-31 12:18:38 -07:00 |
|