29 commits

Author	SHA1	Message	Date
Dante Ruiz	dca34c7cbe	remove warning for GCC	2018-09-13 08:32:47 -07:00
Dante Ruiz	d76a2c1add	disable interstitial by default and fix crash	2018-09-12 15:31:03 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
Dante Ruiz	c97d646083	making requested changes and fixing compile issue for jenkins	2018-09-11 15:57:44 -07:00
Dante Ruiz	cc2c208b12	fix small issue	2018-09-11 12:12:31 -07:00
Dante Ruiz	735ff04fad	fixing merge conflicts	2018-09-11 12:10:19 -07:00
Dante Ruiz	5c9a88868d	first round of requested changes	2018-09-11 12:01:55 -07:00
Wayne Chen	84cf40f8aa	changing calculation of load percentage	2018-09-11 10:07:57 -07:00
Simon Walton	fff6a10bcd	Remove some debug logging from safe landing additions	2018-09-04 10:58:40 -07:00
Dante Ruiz	03ede9371e	cleaning code	2018-08-30 14:26:39 -07:00
danteruiz	e4293d9ad5	fixing some entity visual problems	2018-08-26 21:50:01 -07:00
Dante Ruiz	92acaade2b	trying to fix problems	2018-08-24 17:13:57 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
Dante Ruiz	11ab6dd0b5	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-23 13:20:09 -07:00
Dante Ruiz	78458d62de	revert some changes and fix toolbar issue	2018-08-22 15:20:56 -07:00
Simon Walton	dd098f05c2	Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number	2018-08-22 14:54:07 -07:00
Dante Ruiz	535fdf32cf	saving changes	2018-08-22 13:13:00 -07:00
Dante Ruiz	54236e5c59	fixing loading bar	2018-08-22 10:58:55 -07:00
Dante Ruiz	26a30edec9	trying to fix loading bar	2018-08-21 18:27:21 -07:00
Simon Walton	8d6aaf3fb5	Tidy some method names per reviewer comment	2018-08-20 17:50:29 -07:00
Simon Walton	a891b74fac	Reset SafeLanding in all cases ... Also remove unused data member, elevate load priority only for entities with collisions, handle case of no nearby entities.	2018-08-20 12:31:21 -07:00
Simon Walton	829b83c61d	Use elevated model priority during initial load	2018-08-10 18:16:08 -07:00
Simon Walton	05fa7fdf0e	Clean-up	2018-08-10 15:43:51 -07:00
Simon Walton	3c665b7de8	Don't delete sequence numbers outside of range as range may change	2018-08-10 14:40:08 -07:00
Simon Walton	a8b9568c92	Add some locking	2018-08-10 10:11:46 -07:00
Simon Walton	875407b3fe	New approach to physics readiness - now (mostly) working	2018-08-09 16:24:04 -07:00
Simon Walton	4395e1fa26	Safe Landing checkpoint	2018-08-09 11:11:58 -07:00
Simon Walton	88bd4e3d9a	WIP - safe landing infrastructure	2018-08-08 12:32:45 -07:00
Simon Walton	790fb43b42	Start of safe landing client work	2018-08-07 11:34:05 -07:00