Zach Fox
|
90f05f4db7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-22 09:23:49 -08:00 |
|
Zach Fox
|
74655bde49
|
Fix skeletonmodelURLchanged signal
|
2018-02-21 12:12:20 -08:00 |
|
Zach Fox
|
b548567f5a
|
Apps protection
|
2018-02-21 11:17:47 -08:00 |
|
Zach Fox
|
1fbc16aae2
|
Fix noPermissionGlyph margin
|
2018-02-21 10:52:17 -08:00 |
|
SamGondelman
|
4dde178b93
|
fix new material UI
|
2018-02-21 10:33:15 -08:00 |
|
Seth Alves
|
220d9abbfc
|
Merge pull request #12435 from vladest/fix_flickable_tablethome
Make sure Flickable for GridView for TabletHome will not flick
|
2018-02-21 09:21:45 -08:00 |
|
Zach Fox
|
f08c66e3ac
|
Remove debug code
|
2018-02-20 14:16:55 -08:00 |
|
Zach Fox
|
fd6f4b569f
|
Fix active focus issue
|
2018-02-20 13:19:31 -08:00 |
|
Zach Fox
|
eb29bdf5d2
|
Don't allow tabs or newlines
|
2018-02-20 13:06:10 -08:00 |
|
Zach Fox
|
2daa30f125
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-20 12:41:12 -08:00 |
|
Zach Fox
|
9bde9f5a4f
|
Fix height of Optional Message in Send Money
|
2018-02-20 12:36:11 -08:00 |
|
Zach Fox
|
11f897beb0
|
Initial app support
|
2018-02-20 10:39:36 -08:00 |
|
John Conklin II
|
aa67a98d02
|
Merge pull request #12426 from ElderOrb/FB11508
fix for toolbar slowly drifting on switching between HMD/Desktop modes
|
2018-02-20 09:30:01 -08:00 |
|
Sam Gateau
|
fd49c0d100
|
Merge pull request #12401 from SamGondelman/decals
Material Entities
|
2018-02-19 10:58:02 -08:00 |
|
vladest
|
e5f953c103
|
Make sure Flickable for GridView for TabletHome will not flick
|
2018-02-17 16:52:32 +01:00 |
|
Alexander Ivash
|
2eb8ebcdbc
|
FB11508 - toolbar slowly sides downward
|
2018-02-16 20:22:16 +03:00 |
|
Zach Fox
|
c4e9c76258
|
Small UIT tweaks
|
2018-02-15 16:03:49 -08:00 |
|
Dante Ruiz
|
a194c8bc03
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps
|
2018-02-15 15:46:16 -08:00 |
|
Zach Fox
|
811ecf9db8
|
Fix
|
2018-02-15 14:44:33 -08:00 |
|
Zach Fox
|
8072372822
|
Lots of changes
|
2018-02-15 13:27:13 -08:00 |
|
Zach Fox
|
b8fb08dc74
|
Avatar support
|
2018-02-15 11:24:22 -08:00 |
|
Zach Fox
|
3c620282b1
|
Merge pull request #12393 from zfox23/fixAvailabilityMouseArea
PAL: Prevent opening of Availability from WebView
|
2018-02-15 11:10:05 -08:00 |
|
Sam Gondelman
|
15cdfef16a
|
Merge branch 'master' into decals
|
2018-02-14 17:33:01 -08:00 |
|
SamGondelman
|
324eefc914
|
remove fresnel, add unlit, fix overlays, cleanup
|
2018-02-14 17:02:07 -08:00 |
|
Zach Fox
|
5a8b8d4ac8
|
Lots of changes
|
2018-02-14 16:44:02 -08:00 |
|
Seth Alves
|
93d8a6f00d
|
Merge pull request #12402 from druiz17/fix-tablet-create-rotation
Fix tablet rotation when going into and out of create mode
|
2018-02-14 16:10:10 -08:00 |
|
John Conklin II
|
6187731fdc
|
Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865
[Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click
|
2018-02-14 11:14:26 -08:00 |
|
Zach Fox
|
0fca843667
|
Integrate 'alreadyOwned' endpoint
|
2018-02-14 10:24:34 -08:00 |
|
Dante Ruiz
|
2a8101a944
|
Merge branch 'master' of github.com:highfidelity/hifi
|
2018-02-14 09:35:53 -08:00 |
|
Zach Fox
|
2f0c9e1acb
|
Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap
Commerce: Fix wrap mode for very long P2P memos
|
2018-02-14 09:14:21 -08:00 |
|
Zach Fox
|
a477a3da70
|
Done with My Purchases flow for now
|
2018-02-13 15:04:31 -08:00 |
|
Dante Ruiz
|
119a7554ee
|
Prevent add the same tablet url app to the tabletApps list
|
2018-02-13 14:33:15 -08:00 |
|
SamGondelman
|
4500ed17e7
|
merge from master
|
2018-02-13 13:58:39 -08:00 |
|
Zach Fox
|
ae8a8a48eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-13 13:55:32 -08:00 |
|
Zach Fox
|
3e41229e8c
|
Commerce: Fix wrap mode for very long P2P memos
|
2018-02-13 13:30:17 -08:00 |
|
Zach Fox
|
8cd00c49d6
|
PAL: Prevent opening of Availability from WebView
|
2018-02-13 13:21:40 -08:00 |
|
Elisa Lupin-Jimenez
|
a61021f46c
|
Merge pull request #12272 from elisa-lj11/2d-images
2d images (JPG and PNG) are now supported as (quasi) entities
|
2018-02-13 11:44:02 -08:00 |
|
Zach Fox
|
0809210dc3
|
No permission card
|
2018-02-13 11:16:48 -08:00 |
|
Dante Ruiz
|
cf3d8e4463
|
remove cached file
|
2018-02-13 11:07:15 -08:00 |
|
Zach Fox
|
95e9eb8e4a
|
Lots of progress
|
2018-02-12 17:06:57 -08:00 |
|
Zach Fox
|
ffea8104fc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-09 15:59:38 -08:00 |
|
Zach Fox
|
abdd50fb45
|
it's a start
|
2018-02-09 15:56:28 -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 |
|
SamGondelman
|
84cd0e1529
|
wip live material swapping on model entities, model overlays, avatars,
and albedo swap on shape entities
|
2018-02-09 12:00:08 -08:00 |
|
Zach Fox
|
a92e614aff
|
Bugfix.
|
2018-02-08 10:35:34 -08:00 |
|
Zach Fox
|
e01e88d4ae
|
This works, but is it correct?
|
2018-02-07 15:13:22 -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 |
|