525 commits

Author	SHA1	Message	Date
vladest	148faa3a93	Merge branch 'master' into move_to_qqc2	2018-03-04 14:16:21 +01:00
vladest	02612e0465	cleanup and fits text to buttons	2018-03-01 11:18:18 +01:00
vladest	f51025061c	Make Edit view more consistant with original one #2	2018-03-01 11:03:56 +01:00
vladest	7cbdbe9ab0	Make Edit view more consistant with original one	2018-03-01 11:02:05 +01:00
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
vladest	531c4dc41d	Merge branch 'master' into move_to_qqc2	2018-02-28 11:40:46 +01: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
vladest	90b891dbc3	Fix push issue due to merge errors	2018-02-27 16:42:30 +01:00
vladest	6a5fe0d513	Merge branch 'master' into move_to_qqc2	2018-02-27 15:23:52 +01:00
vladest	b1070f85f0	Merge branch 'master' into move_to_qqc2	2018-02-24 02:59:40 +01: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
vladest	7d7c3bb1f5	Change new material dialog to QQC2	2018-02-22 10:30:42 +01: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
vladest	c320761900	Merge branch 'master' into move_to_qqc2	2018-02-20 06:01:59 +01: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
vladest	e8959b4cc0	Merge branch 'master' into move_to_qqc2	2018-02-13 22:01:16 +01: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
vladest	1c63bcf02e	Merge branch 'master' into move_to_qqc2	2018-01-31 22:13:52 +01: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
vladest	b3b7a7636f	Merge branch 'master' into move_to_qqc2	2018-01-16 21:08:49 +01: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
vladest	45144bece6	Fix Properties does not fit in Create tab	2018-01-11 22:05:11 +01:00
vladest	d8d12e362f	Merge branch 'master' into move_to_qqc2	2018-01-11 21:55:08 +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