20 commits

Author	SHA1	Message	Date
Shannon Romano	b62a6d852d	Merge pull request #15724 from danteruiz/loginscreen-error-page ... dev-79: Lilypad Launcher: (Mac) Implement the error state page.	2019-06-12 12:47:38 -07:00
dante ruiz	fc1f7615f4	fix errors	2019-06-11 16:30:21 -07:00
dante ruiz	77a49cb04b	Merge branch 'master' of github.com:highfidelity/hifi into loginscreen-error-page	2019-06-11 16:05:43 -07:00
dante ruiz	3af4eaa6c6	re enable log	2019-06-11 15:25:27 -07:00
dante ruiz	9cb0f4a14f	Merge branch 'master' of github.com:highfidelity/hifi into more-launcher-bugs	2019-06-11 15:19:15 -07:00
dante ruiz	53c875b8af	fixing launcher bugs	2019-06-11 15:19:05 -07:00
dante ruiz	01fab12942	fixing interface and laucnher script argument	2019-06-11 09:18:20 -07:00
Bradley Austin Davis	844397d86c	Merge pull request #15689 from jherico/light-launcher-win ... DEV-77: Light launcher Windows build	2019-06-10 18:43:44 -07:00
Brad Davis	ecfc3613b0	Enable windows launcher build	2019-06-10 16:44:19 -07:00
dante ruiz	adeedc88d3	add launcher error page	2019-06-10 14:38:01 -07:00
dante ruiz	5499da0b7b	removing debug statments	2019-06-07 10:59:56 -07:00
dante ruiz	00baaffb97	allow launcher to work from mounted dmg	2019-06-07 10:56:44 -07:00
dante ruiz	5fe4f35139	propertly encode	2019-06-06 14:35:45 -07:00
dante ruiz	f7333e90d8	fixing bugs	2019-06-06 11:58:39 -07:00
Bradley Austin Davis	a96d57e8d2	Update launchers/darwin/CMakeLists.txt	2019-06-06 09:23:14 -07:00
Bradley Austin Davis	8e1f4b5227	Testing build	2019-06-05 16:18:03 -07:00
Bradley Austin Davis	0876a781f0	Fix secret defines	2019-06-05 15:22:44 -07:00
dante ruiz	f852364b3d	enable logs	2019-06-05 14:26:35 -07:00
dante ruiz	581c5fe554	removing warnings	2019-06-05 14:23:47 -07:00
Brad Davis	3cb5b7716e	Light Launchers	2019-06-05 11:18:16 -07:00