Dante Ruiz
cf3d8e4463
remove cached file
2018-02-13 11:07:15 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2
...
Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 15:51:46 -08:00
David Back
7bcfd0cf8d
Merge pull request #12114 from dback2/polymaterials
...
Additional mtl spec support & fixes for Poly & more
2018-02-09 13:18:14 -08:00
RebeccaStankus
14839bc5f4
Some improvements to the log window
...
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
2018-02-08 11:26:02 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
David Back
880ef17c75
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-07 18:11:15 -08:00
Zach Fox
7f0915f6ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-07 15:14:33 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
Seth Alves
84ed23f547
Merge pull request #12292 from ElderOrb/FB11855
...
FB11855 - Change bubble icon on tablet
2018-02-07 14:03:16 -08:00
Zach Fox
2270dcd79d
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
...
Commerce: Inspection Certificate Redesign
2018-02-07 13:52:20 -08:00
Zach Fox
3c34d13ec6
Revert "Commerce: Inspection Certificate Redesign"
2018-02-07 13:22:09 -08:00
Zach Fox
a40244b5d2
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
...
Commerce: Inspection Certificate Redesign
2018-02-07 10:19:30 -08:00
David Back
26a56f0173
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-06 16:12:30 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle
...
Commerce: Send Money Nearby particle effect!
2018-02-02 14:17:48 -08:00
Zach Fox
f26477b3e1
Slight wording change to Optional Message placeholder
2018-02-02 11:00:32 -08:00
Zach Fox
19235b8d94
Fix a bug where hover events incorrectly propagate under popups
2018-02-02 10:50:35 -08:00
Zach Fox
dd2b7eb107
Send Money Effect & Lightbox
2018-02-01 15:17:50 -08:00
Zach Fox
fa69ea0352
Small comment addition
2018-02-01 13:57:05 -08:00
Zach Fox
ce79504f03
Fix checkbox
2018-02-01 11:51:08 -08:00
Zach Fox
268c12e47a
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-02-01 11:38:47 -08:00
Zach Fox
bd26c9dfc0
More improvements
2018-02-01 09:36:41 -08:00
Zach Fox
b1be12a5d4
Remove errant GPUCache files
2018-01-31 17:38:26 -08:00
Zach Fox
14051bce0c
This logic is insane
2018-01-31 17:20:20 -08:00
Zach Fox
fb5308e517
This logic is insane
2018-01-31 17:06:29 -08:00
Zach Fox
ab3a91a1da
Oooooh it's so pretty
2018-01-31 16:53:23 -08:00
Alexander Ivash
a0c41f26d1
FB11855 - Change bubble icon on tablet
2018-02-01 01:25:29 +03:00
Zach Fox
7879fb293f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign
2018-01-31 13:19:39 -08:00
Zach Fox
90c2371f0c
It's working!
2018-01-31 12:09:23 -08:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard
...
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
2018-01-31 11:19:49 -08:00
Zach Fox
8a729e3cf0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-01-31 10:54:32 -08:00
Seth Alves
600cc1b48e
Merge pull request #12250 from druiz17/fix-multihighlight
...
Don't manually highlight tablet buttons from swipeview.
2018-01-31 09:33:33 -08:00
Zach Fox
05fe33e417
Initial work
2018-01-30 18:01:46 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
Zach Fox
d13d0e6ba2
Minor fixes
2018-01-30 14:30:50 -08:00
Zach Fox
b60a45d358
Inspection Certificate Redesign
2018-01-29 15:14:29 -08:00
Dante Ruiz
be42f0cfb1
finally fix the multihighlighting
2018-01-26 13:24:44 -08:00
Dante Ruiz
f3e20e72cb
really fix multi-highlighing
2018-01-25 15:09:03 -08:00
Zach Fox
f117dd33a8
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixSortingAgain
2018-01-25 15:04:28 -08:00
Dante Ruiz
07842f8e54
Merge branch 'master' of github.com:highfidelity/hifi into fix-multihighlight
2018-01-25 13:30:45 -08:00
Brad Davis
d4aef1ea88
Fix URLs in QSS files to use QRC base path
2018-01-25 13:03:42 -08:00
Zach Fox
afc71a5ac5
Fix Purchases sorting (again); Fix (i) icon loading
2018-01-25 12:17:34 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription
...
some settings cleanup
2018-01-25 11:30:14 -08:00
ZappoMan
cb01bd14b9
Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription
2018-01-25 10:39:43 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix
...
RC63 Fix Edit/Asset Browser in HMD mode
2018-01-25 09:38:23 -08:00
Zach Fox
94e1c425ab
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
2018-01-24 17:03:16 -08:00
Dante Ruiz
c73c0487a0
min diff
2018-01-24 16:41:19 -08:00
Dante Ruiz
6149630ccd
don't manually highlight tablet buttons from swipeview, since the tablet button highligh themselves
2018-01-24 16:36:08 -08:00
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear
...
Fix security image index clear after back nav
2018-01-24 13:43:49 -08:00
Zach Fox
6566c5c5e6
Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter
...
Fix the text filter in My Purchases
2018-01-24 08:42:55 -08:00
luiscuenca
29dd24b05f
Fix GoTo app in HMD mode
2018-01-23 15:50:32 -07:00
