4918 commits

Author	SHA1	Message	Date
MiladNazeri	cf23b7a303	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:17 -07:00
MiladNazeri	20b709b382	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:46:10 -07:00
milad	5083e449b0	cr round 2	2019-07-25 15:42:25 -07:00
milad	2f4566b63c	merged master and fixed height	2019-07-25 15:42:03 -07:00
milad	4c0d8b6fda	improved layout to match the figment more	2019-07-25 15:42:02 -07:00
milad	993e5db2da	changed rectangle to have anchor.fill	2019-07-25 15:42:02 -07:00
milad	2498bf2fd8	Cr changes r1	2019-07-25 15:42:02 -07:00
milad	9f0fc8bd06	removed logs and prototype code	2019-07-25 15:42:02 -07:00
milad	189809dc2c	Fixed undefined error when displaying from the dictionary	2019-07-25 15:42:02 -07:00
milad	2b4dd327ec	removed log statements	2019-07-25 15:42:01 -07:00
milad	cd5df63f51	working version for all qml web files	2019-07-25 15:41:53 -07:00
milad	fb7a66b110	working version with just flickable	2019-07-25 15:38:23 -07:00
milad	43268c0f65	Working QML window	2019-07-25 15:38:23 -07:00
milad	dec176b921	checking to see if I did something blocking the build	2019-07-25 15:38:22 -07:00
Zach Fox	e1c198903d	Merge pull request #15973 from zfox23/fixGatedLog ... BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 11:19:02 -07:00
Zach Fox	03b5f9f7f8	BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 10:18:03 -07:00
Zach Fox	b918979fab	DEV-301: Adjust size of VR-mode header icon	2019-07-24 10:02:26 -07:00
Andrew Meadows	95187f97c8	use bold monospace font for debug stats	2019-07-22 12:38:24 -07:00
Shannon Romano	4f7b865cfe	Merge pull request #15945 from huffman/fix/create-window-not-reopening ... BUGZ-998: Fix create window being destroyed when closed	2019-07-19 11:07:02 -07:00
Ryan Huffman	03b8de1ee7	Fix create window being destroyed when closed	2019-07-18 08:43:39 -07:00
milad	a3b8ded56a	changed sessionDisplayName logic	2019-07-17 14:17:58 -07:00
Zach Fox	1cd136f178	Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:15:08 -07:00
Zach Fox	5828f46c6b	Incorrect ID fixed - thanks Milad	2019-07-12 12:27:55 -07:00
Zach Fox	e0392642f7	Don't enable supersampling from graphics settings	2019-07-12 11:18:34 -07:00
Zach Fox	56a55efbb3	Fix a quick renderer bug	2019-07-11 16:12:40 -07:00
Zach Fox	4c7d0fc6f4	Updated layout	2019-07-11 14:46:05 -07:00
Zach Fox	ce2b7e5baa	Finish all of the logic and most of the layout	2019-07-11 12:05:13 -07:00
Zach Fox	2471a3eb72	Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings	2019-07-11 09:02:42 -07:00
Zach Fox	4caa00d6cc	Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface	2019-07-10 16:42:48 -07:00
Howard Stearns	7eaa29c147	Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui ... new-account wallets in simplified UI	2019-07-10 15:09:59 -07:00
Howard Stearns	4191c37f6e	indentation	2019-07-09 14:48:17 -07:00
Howard Stearns	79a3d45eae	new-account wallets in simplified UI	2019-07-09 14:25:11 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Zach Fox	243733028b	Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch ... BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:59:56 -07:00
Zach Fox	38ad93a7ed	BUGZ-917: Fix log spam in NameCard.qml due to errant line of code	2019-07-05 12:24:05 -07:00
Zach Fox	4223800af7	BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:17:28 -07:00
Zach Fox	1f54f3c159	BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text	2019-07-03 12:49:23 -07:00
Zach Fox	b8485361ce	Merge pull request #15858 from zfox23/PTTDuckingSlider ... DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 12:00:17 -07:00
Zach Fox	73db19464f	DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 11:28:48 -07:00
Preston Bezos	ef674a5934	removed permission for qml to access webcam and mic	2019-06-28 15:23:50 -07:00
Zach Fox	8af469992e	BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-27 15:55:58 -07:00
Zach Fox	6e4b9c1723	Merge pull request #15774 from PrestonB1123/iconChanges ... New Top Bar Icons	2019-06-26 11:01:12 -07:00
Preston Bezos	f0dd28e71a	removed extra line	2019-06-26 09:54:43 -07:00
Preston Bezos	bd3fe8a092	fixed conflict and spacing	2019-06-26 09:12:32 -07:00
Sam Gateau	48f9c33bdd	Merge pull request #15822 from samcake/yellow ... BUGZ-664: Introduce scaling of rendering for forward renderer	2019-06-25 14:27:17 -07:00
Zach Fox	b7a3d82f0f	DEV-170: Increase the speed of the animation when clicking between tabs in Settings	2019-06-25 11:30:25 -07:00
Preston Bezos	1481c7424f	changed ptt muted icon	2019-06-25 11:02:44 -07:00
Preston Bezos	5686f51171	fixed hmd settings buttons spacing	2019-06-25 09:19:30 -07:00
Sam Gateau	b0ebcc745d	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-24 15:36:28 -07:00