Zach Fox
|
747a6b07ce
|
Fix font loading for MacOS via different font loading method
|
2018-03-08 14:31:48 -08:00 |
|
SamGondelman
|
0fca56eef0
|
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21 , reversing
changes made to c0f20900a0 .
|
2018-02-27 11:33:05 -08:00 |
|
NissimHadar
|
c6580f642a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-22 13:45:00 -08:00 |
|
Liv
|
478ec48b63
|
Merge pull request #12463 from misslivirose/fix/edit-bugs
Fix two bugs with Create Menu
|
2018-02-22 09:43:50 -08:00 |
|
Liv Erickson
|
aba1cae36d
|
get rid of magic number
|
2018-02-21 16:19:50 -08:00 |
|
Liv Erickson
|
68f0c0391a
|
Initial fix - need a little style fixing
|
2018-02-21 15:44:23 -08:00 |
|
Nissim Hadar
|
b519ebd6f1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-21 12:36:56 -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 |
|
Nissim Hadar
|
6f84e4c977
|
Moved shadows and ambient occlusion to menu checkboxes.
|
2018-02-20 23:45:07 -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 |
|
Dante Ruiz
|
a194c8bc03
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps
|
2018-02-15 15:46:16 -08:00 |
|
SamGondelman
|
324eefc914
|
remove fresnel, add unlit, fix overlays, cleanup
|
2018-02-14 17:02:07 -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 |
|
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 |
|
SamGondelman
|
4d4294dd6a
|
Merge remote-tracking branch 'upstream/master' into decals
|
2018-02-02 16:50:01 -08:00 |
|
SamGondelman
|
d7f4b033e8
|
wip finish adding material entity
|
2018-02-02 16:49:33 -08:00 |
|
Elisa Lupin-Jimenez
|
d7a847930d
|
added image icon
|
2018-02-02 10:27:44 -08:00 |
|
Elisa Lupin-Jimenez
|
d390e20139
|
removed extraneous commenting and image class
|
2018-02-02 10:27:42 -08:00 |
|
Elisa Lupin-Jimenez
|
fdca8ab93e
|
added image button to edit.js, working on connecting to cpp
|
2018-02-02 10:08:39 -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 |
|
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 |
|
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 |
|
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 |
|
luiscuenca
|
29dd24b05f
|
Fix GoTo app in HMD mode
|
2018-01-23 15:50:32 -07:00 |
|
luiscuenca
|
fddbf13796
|
Fix Asset Browser access from Create
|
2018-01-23 11:12:22 -07:00 |
|
Melissa Brown
|
991dad18ba
|
Merge pull request #12160 from ElderOrb/FB11241
FB11241 Changing options in menu causes the title “Menu” to change to…
|
2018-01-15 10:46:37 -08:00 |
|
Zach Fox
|
6920e57613
|
Fix 'Browse Avatars' button from Avatar Settings
|
2018-01-12 13:31:58 -08:00 |
|
Alexander Ivash
|
11e918681a
|
FB11241 Changing options in menu causes the title “Menu” to change to “root”
note: fix is based on removing duplicated top-level menu entry from stack view
|
2018-01-12 02:08:10 +03:00 |
|
vladest
|
cff80e86b6
|
Temporarily disable magnification until further notice
|
2018-01-11 22:18:22 +01:00 |
|
Anthony Thibault
|
8d5e7dbeff
|
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
Fix for black screen when clicking Settings from Snap app
|
2018-01-11 09:58:10 -08:00 |
|
Seth Alves
|
363b9bfe11
|
Merge pull request #12127 from SamGondelman/freeze
Comment out TabletAddressDialog logging of long messages
|
2018-01-10 18:07:18 -08:00 |
|
Anthony J. Thibault
|
1deb75daf7
|
Fix for black screen when clicking Settings from Snap app
(cherry picked from commit d5e3b97c93 )
|
2018-01-10 16:31:51 -08:00 |
|
SamGondelman
|
a42b0cf485
|
comment out logging
|
2018-01-09 14:58:23 -08:00 |
|
Melissa Brown
|
19802b33eb
|
Merge pull request #12109 from vladest/tablet_page_indicator
Page indicator visible only when pages more than one
|
2018-01-09 14:05:32 -08:00 |
|
Seth Alves
|
87dfe0efc3
|
Merge pull request #12097 from vladest/tablet_pagination_magnify
Tablet pagination magnify
|
2018-01-09 08:08:02 -08:00 |
|
vladest
|
891663bae9
|
Page indicator visible only when pages more than one
|
2018-01-08 23:07:09 +01:00 |
|
vladest
|
02972c92f0
|
Merge branch 'master' into tablet_pagination_magnify
|
2018-01-05 19:12:13 +01:00 |
|
Seth Alves
|
2071d42d25
|
Merge pull request #12088 from ElderOrb/FB11008
11008 GoTo app does not focus on address bar when opened
|
2018-01-05 10:07:36 -08:00 |
|
Andrew Meadows
|
c33c637f07
|
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
|
2018-01-05 09:07:54 -08:00 |
|
vladest
|
67ca76baa1
|
Magninfication
|
2018-01-04 23:11:42 +01:00 |
|
Alexander Ivash
|
7ab7a46530
|
11008 GoTo app does not focus on address bar when opened
|
2018-01-04 23:38:10 +03:00 |
|
vladest
|
afc3082593
|
Cleanup. Errors checks
|
2017-12-28 13:16:51 +01:00 |
|
vladest
|
35fee739c5
|
Use buttons index
|
2017-12-27 23:50:15 +01:00 |
|
vladest
|
ffcccacfa5
|
Selection consistency #2
|
2017-12-25 23:46:06 +01:00 |
|
vladest
|
cb7472c270
|
Selection consistency #1
|
2017-12-25 20:14:31 +01:00 |
|