59 commits

Author	SHA1	Message	Date
Dante Ruiz	1ce1902fa8	remove magic numbers	2018-10-22 12:49:24 -07:00
Wayne Chen	d008bfa523	partial requested code changes	2018-10-22 11:29:36 -07:00
Wayne Chen	d12ee393d7	Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes	2018-10-22 10:27:13 -07:00
Wayne Chen	4a8348e0d1	Merge branch 'interstitial-loading-imporvements' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes	2018-10-22 10:14:40 -07:00
Wayne Chen	27813d4948	Merge branch 'fix/loadingscreen-optimization' of https://github.com/FlameSoulis/hifi into mergedInterstitialBugFixes	2018-10-22 10:05:55 -07:00
Flame Soulis	5db7c7821e	Proper formatting (aka no spaces after anonymous funcs)	2018-10-19 08:51:13 -04:00
Flame Soulis	ba459eda9e	Removed duplicate backgroundAlpha	2018-10-19 08:41:04 -04:00
Flame Soulis	fcde53fc65	Include black-sphere.fbx and update linked url	2018-10-19 08:22:43 -04:00
Flame Soulis	014c1590dd	Made MP3 constistant 128kbps and fixed path resolving	2018-10-19 08:16:14 -04:00
Flame Soulis	e499309c8e	Upload interstitial page sound and update link	2018-10-19 06:49:48 -04:00
Wayne Chen	6cf9608c97	adding fade in and fade outt in interstitial for progress	2018-10-18 13:12:04 -07:00
Wayne Chen	fd3c0d2f76	pushing with new fix	2018-10-17 15:03:09 -07:00
Dante Ruiz	d7dc69129a	improve loading bar progress	2018-10-12 11:43:03 -07:00
Dante Ruiz	451142f9a3	fixing some more interstittial issues	2018-10-11 11:33:19 -07:00
Dante Ruiz	36c2cceb57	fix for failing to enter domain	2018-10-05 15:39:51 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
Wayne Chen	d6af09ca62	ignoring entities in interstitial/saving address on 404 error	2018-10-03 17:40:42 -07:00
Wayne Chen	efeb598495	fixing bug with hover overlay	2018-10-03 10:12:07 -07:00
Wayne Chen	36dbcd41ba	Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged	2018-10-01 16:11:40 -07:00
Wayne Chen	69b547a9fe	text overlays for consistency	2018-10-01 16:11:27 -07:00
Dante Ruiz	66bb5f68d2	updating interstitialmode	2018-10-01 15:26:56 -07:00
Wayne Chen	813defebfc	Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged	2018-09-26 16:45:22 -07:00
Wayne Chen	fda3ec87ce	removing lingering print statement	2018-09-26 15:57:57 -07:00
Wayne Chen	afae4f3b96	adding toolbar reappearing	2018-09-26 15:33:57 -07:00
Wayne Chen	db77cbcbc1	new location drop - unparent overlays	2018-09-26 15:12:48 -07:00
Wayne Chen	db41a1c16b	error state signal for 404/interstitial	2018-09-26 13:48:15 -07:00
Wayne Chen	4a87773986	fixing interstitial page, clearing up debug statements	2018-09-26 07:41:18 -07:00
Wayne Chen	26b6967ba6	adding overlays to redirect domain	2018-09-25 18:16:18 -07:00
Dante Ruiz	57ae8ff8a1	update interstitial page stability count and loading bar	2018-09-24 16:09:53 -07:00
Dante Ruiz	5a8ab61426	Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial	2018-09-24 09:21:36 -07:00
Dante Ruiz	d3368146ce	saving work	2018-09-21 11:42:26 -07:00
Wayne Chen	8bd698b143	leaving button in natural dims	2018-09-20 11:13:27 -07:00
Wayne Chen	53582bddcd	pushing more changes	2018-09-13 17:26:08 -07:00
Wayne Chen	bf7dd94db7	button was clipped; adding higher res img	2018-09-13 17:25:33 -07:00
Wayne Chen	2b8aebdb6b	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to aef3ed3e01.	2018-09-13 17:21:29 -07:00
Wayne Chen	77d5ebf34f	changing button URL - typo	2018-09-13 15:47:25 -07:00
Wayne Chen	db1acb87b8	button was clipped; adding higher res img	2018-09-13 15:38:24 -07:00
Dante Ruiz	b665dbe13e	finished requested changes	2018-09-11 14:18:12 -07:00
Dante Ruiz	45a99a9244	fixing some bugs	2018-09-06 17:55:10 -07:00
Dante Ruiz	2f9119529a	editing the interstitial page	2018-09-06 17:06:17 -07:00
Dante Ruiz	98dafa3b67	fix overlayParentID	2018-09-06 14:31:49 -07:00
Dante Ruiz	ec2d89fd25	fixing toolbar disappering	2018-09-06 11:16:58 -07:00
Dante Ruiz	93b0f15116	addressing some feedback	2018-08-30 13:22:17 -07:00
danteruiz	e4293d9ad5	fixing some entity visual problems	2018-08-26 21:50:01 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
Dante Ruiz	bb83a2f620	interstitial script ending cleanup fixes	2018-08-22 16:48:10 -07:00
Dante Ruiz	78458d62de	revert some changes and fix toolbar issue	2018-08-22 15:20:56 -07:00
Dante Ruiz	535fdf32cf	saving changes	2018-08-22 13:13:00 -07:00
Dante Ruiz	26a30edec9	trying to fix loading bar	2018-08-21 18:27:21 -07:00