4070 commits

Author	SHA1	Message	Date
Wayne Chen	ac5814a1f8	Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect	2018-09-24 13:57:23 -07:00
Wayne Chen	7e796f7e7f	committing requested changes	2018-09-19 14:26:30 -07:00
Wayne Chen	01594d7a52	fixing settings check in domain handler	2018-09-19 10:17:14 -07:00
Wayne Chen	795580f4e1	adding 404 redirect toggle with interstitial	2018-09-19 09:55:15 -07:00
Wayne Chen	be5f498c2f	reversion	2018-09-18 15:47:54 -07:00
Wayne Chen	48e4b38312	reversion	2018-09-18 15:28:15 -07:00
Wayne Chen	8274f4cb4c	reverting domain handler change	2018-09-18 15:26:12 -07:00
Wayne Chen	f82063ed46	Merge branch 'master' of https://github.com/highfidelity/hifi	2018-09-18 09:17:28 -07:00
Wayne Chen	0afea6fbd1	removing double login fail signal	2018-09-14 11:08:53 -07:00
Wayne Chen	fd1e64e4e6	Revert "Fix login fail twice call"	2018-09-13 17:01:59 -07:00
John Conklin II	aef3ed3e01	Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall ... Fix login fail twice call	2018-09-13 16:59:00 -07:00
Wayne Chen	0fc1cc9af8	Revert "adding fix for getting DomainHandler into error state" ... This reverts commit 49f26d968a.	2018-09-13 15:39:18 -07:00
John Conklin II	0bf064c451	Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor ... Fixing Error State for Timeout/localhost Redirection	2018-09-13 15:19:55 -07:00
Wayne Chen	647c4e1694	adding true fix for localhost timeouts	2018-09-13 13:51:42 -07:00
John Conklin II	b675e6cc6b	Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling ... Performance improvements for Avatar Mixer	2018-09-13 13:43:18 -07:00
Wayne Chen	873859455a	Revert "adding fix for getting DomainHandler into error state" ... This reverts commit 3fe3f674d0.	2018-09-13 11:53:56 -07:00
Wayne Chen	380f24b37f	adding fix, changing window title	2018-09-13 11:53:21 -07:00
Wayne Chen	96ab7d417e	removing connection for on login failed	2018-09-13 10:35:43 -07:00
Wayne Chen	ad233677b8	adding changes for overriding host change for error state	2018-09-12 18:31:01 -07:00
Wayne Chen	3fe3f674d0	adding fix for getting DomainHandler into error state	2018-09-12 15:45:06 -07:00
Wayne Chen	49f26d968a	adding fix for getting DomainHandler into error state	2018-09-12 15:42:55 -07:00
John Conklin II	f67deb9f65	Merge pull request #13938 from wayne-chen/interstitalMerged ... Interstitial Page with 404 Redirect	2018-09-12 08:39:52 -07:00
Wayne Chen	20cab87a17	Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged	2018-09-11 18:53:06 -07:00
Wayne Chen	a7321f950a	pushing requested changes - adding timeout refusal	2018-09-11 18:32:17 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
Wayne Chen	8bca1bc5fe	reverting, oversight	2018-09-11 17:09:21 -07:00
Wayne Chen	a85a7a6119	adding back goToLastAddress back	2018-09-11 17:07:49 -07:00
Wayne Chen	490cdc901e	Merge pull request #3 from danteruiz/interstitalMerged ... making requested changes and fixing compile issue for jenkins	2018-09-11 16:30:13 -07:00
Wayne Chen	0f25756908	expose domain connection error to Window	2018-09-11 16:29:39 -07:00
Dante Ruiz	c97d646083	making requested changes and fixing compile issue for jenkins	2018-09-11 15:57:44 -07:00
Wayne Chen	c194c236f1	adding inlines	2018-09-10 17:10:13 -07:00
Wayne Chen	e5a87aa58c	removing unused variables	2018-09-10 16:56:13 -07:00
Wayne Chen	ff86e480ba	adding debug statement to check for window close	2018-09-10 11:36:45 -07:00
Simon Walton	d12376187c	Merge branch 'master' into avatar-mixer-scaling	2018-09-10 10:15:49 -07:00
Wayne Chen	77bb6fa4d5	adding position to try again zone; updating whitespace	2018-09-05 11:53:49 -07:00
Wayne Chen	0be7a5ffaa	fixing typo in domain handler	2018-09-04 19:58:56 -07:00
Wayne Chen	9e0fa08cf1	adding property to location, updating domain	2018-09-04 17:46:23 -07:00
Simon Walton	7af69b5450	Check that a requested listened port is used in NodeList	2018-09-04 13:53:25 -07:00
Simon Walton	c2ea05b026	Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling	2018-09-04 09:31:05 -07:00
Wayne Chen	c95cb97b9b	adding working version with networking signals	2018-08-31 19:29:48 -07:00
Wayne Chen	e3f5f4c55a	Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect	2018-08-30 19:55:51 -07:00
Wayne Chen	82c7495615	Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect	2018-08-30 19:41:06 -07:00
Wayne Chen	5f43f5b276	adding different method for handling redirect	2018-08-30 17:40:13 -07:00
Simon Walton	b45b0f54e4	Move unfilteredHandlers processing back into main loop	2018-08-30 11:59:53 -07:00
Zach Fox	b8cd5dd8b9	Fixup PR13870: Make the feature work in Master	2018-08-29 16:58:19 -07:00
Simon Walton	9711076dae	Use a queued signal for pending datagrams	2018-08-29 10:49:29 -07:00
Wayne Chen	6689c15564	Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect	2018-08-28 19:22:34 -07:00
Wayne Chen	223f86108f	adding debugging stuff	2018-08-28 17:34:48 -07:00
Wayne Chen	8a9ad421e7	adding serverless file + redirection if conn fail	2018-08-28 15:50:14 -07:00
Stephen Birarda	7ddd70a84a	Merge pull request #13871 from birarda/bug/double-domain-connect ... force NodeList reset if DS changes session or local ID	2018-08-27 11:59:24 -07:00