70919 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam Gateau	b725ed440b	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-23 11:40:10 -07:00
Sam Gateau	473f8d0ca5	Working on the LOD system	2018-08-23 11:39:47 -07:00
John Conklin II	1320a34a18	Merge pull request #13841 from luiscuenca/noAttachmentsToJSON ... Don't include old attachment data on new avatar recordings	2018-08-23 10:51:33 -07:00
John Conklin II	5dd64645eb	Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes ... Fix safe-landing protocol for sparse domains	2018-08-23 10:17:08 -07:00
John Conklin II	b8e93ec688	Merge pull request #13863 from wayne-chen/enableAdvancedMovement-case-17774 ... MS17774: Enable advanced movement on first run	2018-08-22 19:00:30 -07:00
Simon Walton	c0966d738e	Use EntityVersion for the EntityQueryInitialResultsComplete packet	2018-08-22 16:40:49 -07:00
Simon Walton	c4b916af62	Just bump packet version for EntityQueryInitialResultsComplete	2018-08-22 16:22:30 -07:00
Wayne Chen	4daa30c1d0	changing text for check preference	2018-08-22 15:58:37 -07:00
Wayne Chen	9518b8cdaf	rearrangement	2018-08-22 15:46:02 -07:00
Wayne Chen	c32cc1ead2	adding implementation	2018-08-22 15:42:15 -07:00
John Conklin II	24d097502e	Merge pull request #13858 from birarda/bug/ess-crash ... fix a crash in ESS from missing dependency	2018-08-22 15:27:50 -07:00
Simon Walton	dd098f05c2	Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number	2018-08-22 14:54:07 -07:00
luiscuenca	b3d127c953	Fix flickering	2018-08-22 14:31:34 -07:00
Stephen Birarda	01e8fd66a3	fix script engine(s) cleanup from ESS	2018-08-22 13:52:37 -07:00
John Conklin II	50684f00c8	Merge pull request #13856 from sethalves/dont-squash-delete-events ... don't squash delete events during shutdown so that QtWebEngine process gets destoryed	2018-08-22 12:44:35 -07:00
Stephen Birarda	3b5ba71163	fix a crash in ESS from missing dependency	2018-08-22 12:23:24 -07:00
Seth Alves	579b2435c2	don't squash delete events during shutdown so that QWebEngine process gets destroyed	2018-08-22 11:04:26 -07:00
John Conklin II	04d72ea39d	Merge pull request #13850 from samcake/punk ... Adjust Workload Region to be bigger	2018-08-22 10:21:14 -07:00
John Conklin II	32562511e8	Merge pull request #13782 from ElderOrb/FB17184 ... Add Support for Managing Avatar Entities to the Avatar App	2018-08-22 10:20:04 -07:00
luiscuenca	5a5aa2f5b9	Remove proxy line	2018-08-22 09:13:27 -07:00
John Conklin II	1036f3c8b6	Merge pull request #13803 from birarda/feat/avatar-traits ... introduce avatar traits system, migrate skeleton URL and avatar entities	2018-08-22 09:13:21 -07:00
John Conklin II	c220af0fcc	Merge pull request #13855 from jherico/fix/17666 ... Fix parabola rendering on AMD GPUs	2018-08-22 09:12:18 -07:00
luiscuenca	5f4903f884	Record entities	2018-08-22 08:53:51 -07:00
Sam Gateau	0f6f465e7f	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-08-21 19:23:33 -07:00
Brad Davis	e9683011f8	Fix parabola rendering on AMD GPUs	2018-08-21 16:58:38 -07:00
Bradley Austin Davis	d3fd2132ce	Merge pull request #13851 from samcake/black ... Fix the local lights not working on AMD	2018-08-21 15:36:12 -07:00
sam gateau	30c0c44822	Completely remove the texcoord frame transform as we don;t use it at all	2018-08-21 14:52:42 -07:00
sam gateau	6b994ba39a	Completely remove the texcoord frame transform as we don;t use it at all	2018-08-21 14:51:54 -07:00
Alexander Ivash	cfb820762d	bulk adjusting to coding guidelines	2018-08-22 00:42:01 +03:00
Stephen Birarda	7d8db482a3	put back ExtendedIODevice ctor for ubuntu warning	2018-08-21 13:21:21 -07:00
sam gateau	8c5aab7fa0	tabs!	2018-08-21 12:30:31 -07:00
sam gateau	b7d8b92fb5	Add comment in shader and fix bad cull mode	2018-08-21 12:25:27 -07:00
Stephen Birarda	1723f3d3d8	don't use entity tree to clear all avatar entities	2018-08-21 12:21:29 -07:00
Stephen Birarda	a177e49877	Revert "send attachment clears through setAvatarEntityData" ... This reverts commit 25876bca63.	2018-08-21 12:18:11 -07:00
sam gateau	5ae604f341	REmove the texture Transform for deferred_light slv which then makes it work correctly on AMD	2018-08-21 12:14:32 -07:00
Stephen Birarda	8226ffb916	fix ref to instances vector for instance erase	2018-08-21 11:57:21 -07:00
Stephen Birarda	8c58ae4e60	fix insert of second trait instance	2018-08-21 11:56:28 -07:00
Stephen Birarda	25ed166f07	fix logic for initial send of deleted trait instance	2018-08-21 11:49:48 -07:00
John Conklin II	1b4314ae45	Merge pull request #13846 from ctrlaltdavid/M17652-b ... Reduce strength of teleport parabola	2018-08-21 11:32:40 -07:00
John Conklin II	ad835597e6	Merge pull request #13779 from amantley/perspectiveBug ... Perspective bug	2018-08-21 11:31:14 -07:00
Stephen Birarda	3e2d4dc696	fixes and improvments addressing CR comments	2018-08-21 10:53:52 -07:00
Stephen Birarda	4875738a05	always add to detached, flag update on full replace	2018-08-21 10:32:05 -07:00
Stephen Birarda	99f532a20e	always check added avatar entities once in updateAvatarEntities	2018-08-21 10:32:05 -07:00
Stephen Birarda	25876bca63	send attachment clears through setAvatarEntityData	2018-08-21 10:32:05 -07:00
Stephen Birarda	eda84d2816	flag deleted avatar entities when replacing full map	2018-08-21 10:32:05 -07:00
Stephen Birarda	7e127749f7	move AssignmentDynamicFactory to entity-server only	2018-08-21 10:32:05 -07:00
Stephen Birarda	cd05d9335a	remove debug of entity json document	2018-08-21 10:32:05 -07:00
Stephen Birarda	f0ba61ff05	add missing local ID, reset client processed trait versions	2018-08-21 10:32:05 -07:00
Stephen Birarda	6c204b682d	include trait bytes written in over budget calculation	2018-08-21 10:32:05 -07:00
Stephen Birarda	e33f349d53	fix flagging for avatar entity update/delete	2018-08-21 10:32:05 -07:00