543 commits

Author	SHA1	Message	Date
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
Dante Ruiz	5af1ea54d3	Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data	2018-04-16 10:10:55 -07:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
Liv Erickson	387ff680d5	support deleted scenario	2018-03-28 18:12:30 -07:00
Liv Erickson	b78f00342e	Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url	2018-03-28 17:53:42 -07:00
vladest	70ce1b2bf7	Fix invalid scrolling detection	2018-03-28 21:48:44 +02:00
vladest	001b6d23ff	Merge branch 'master' into move_to_qqc2	2018-03-28 20:16:26 +02:00
Liv Erickson	1244559618	remove spaces for clean-ness	2018-03-22 15:37:12 -07:00
Liv Erickson	0647155c30	re-add experimental image removal	2018-03-22 15:33:23 -07:00
Liv Erickson	f62e1ed54e	disable add button on model until text is entered	2018-03-22 15:29:41 -07:00
Dante Ruiz	652faaa116	fixing AddressManager keyboard when switching domains	2018-03-16 16:32:37 -07:00
vladest	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
vladest	148faa3a93	Merge branch 'master' into move_to_qqc2	2018-03-04 14:16:21 +01:00
Dante Ruiz	95e14446dd	update qml file to show the current OpenVr headset	2018-03-01 09:03:52 -08: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