19 commits

Author	SHA1	Message	Date
Preston Bezos	e32d6e96ce	code was backwards	2019-06-12 16:12:24 -07:00
Preston Bezos	2eeec3518d	one last fix	2019-06-12 16:03:03 -07:00
Preston Bezos	3cd3f1a508	one last fix	2019-06-12 15:56:27 -07:00
Preston Bezos	8dcf6e6a03	removed a dead line of code, made a couple formating changes	2019-06-12 15:47:19 -07:00
Preston Bezos	29d795af5b	hopefully good now	2019-06-12 15:36:20 -07:00
Preston Bezos	8fa80f8935	fixed some formatting problems	2019-06-12 14:57:37 -07:00
Preston Bezos	038747e645	Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering	2019-06-12 14:55:37 -07:00
Preston Bezos	34e9acc0b5	better fix for the toolbar remnant	2019-06-12 14:31:43 -07:00
Zach Fox	5077ae1bd7	Merge pull request #15745 from PrestonB1123/hudRemnant ... BUGZ-355: Persistent UI Element	2019-06-12 10:40:37 -07:00
Preston Bezos	6c0bbfae76	hopefully good now	2019-06-12 10:02:33 -07:00
Preston Bezos	266c08227f	turned an else into an else if	2019-06-12 09:29:43 -07:00
Preston Bezos	a79a75702a	reverted a couple of testing changes and added a variable	2019-06-12 09:17:18 -07:00
Preston Bezos	b32a715496	fixed persistant ui element when switching from HMD to Desktop. not a complete fix but sufficient for M1	2019-06-11 16:29:32 -07:00
amer cerkic	edc1018b2a	simplified the check	2019-06-10 11:12:29 -07:00
amer cerkic	4cad49f561	adding undefined check on the toolbar object	2019-06-10 10:42:31 -07:00
Zach Fox	9150cd288f	Add some logging instead of a scary popup	2019-06-04 13:36:00 -07:00
Zach Fox	19b2d35b87	Resolve DEV-99: Remove all menus from top bar	2019-06-04 13:25:03 -07:00
Zach Fox	25725bb91e	Change 'your avatars' to 'your profile'	2019-05-31 11:46:13 -07:00
Zach Fox	f69e4cd47d	Move default scripts again and make them actually work	2019-05-24 10:05:54 -07:00

Renamed from scripts/simplifiedUI/simplifiedUI.js (Browse further)