71001 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Meadows	99aafb1f95	move code from Avatar to OtherAvatar	2018-08-23 12:59:28 -07:00
Andrew Meadows	1c87d7b109	reorder initialization to remove compile warning	2018-08-23 12:59:28 -07:00
Andrew Meadows	615b8addd0	fix order of includes	2018-08-23 12:59:28 -07:00
Andrew Meadows	598a227f1a	use OtherAvatar instead of Avatar in AvatarMotionState	2018-08-23 12:59:28 -07:00
Andrew Meadows	3c01433e12	stub for avatars changing workload regions	2018-08-23 12:59:28 -07:00
Andrew Meadows	55b1a6762c	explicit delete default ctor, make _nestableType private	2018-08-23 12:59:28 -07:00
Andrew Meadows	21adbf49c0	remove cruft	2018-08-23 12:59:28 -07:00
Andrew Meadows	15665b25e8	give OtherAvatars a proxy in workload	2018-08-23 12:59:28 -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
Howard Stearns	b7d074aaa4	remove comment	2018-08-23 10:41:19 -07:00
Howard Stearns	b7fa47da35	cr feedback	2018-08-23 10:37:55 -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
luiscuenca	e3ad5adcae	first approach vertical alignment	2018-08-23 06:49:35 -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
Howard Stearns	88a3505b6a	cleanup	2018-08-22 14:30:27 -07:00
Howard Stearns	13629f6870	bypass setup and password, and convert old wallets to account based ... before lockering	2018-08-22 14:30:27 -07:00
Howard Stearns	ef1aacd226	handle password changes	2018-08-22 14:30:27 -07:00
Howard Stearns	ef9cc782b9	no need to keep old format in client	2018-08-22 14:30:16 -07:00
Howard Stearns	73cca42940	initial prototype	2018-08-22 14:29: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
Wayne Chen	4e9a544618	redoing newline	2018-08-21 16:01:24 -07:00
Wayne Chen	bb176eb228	trailing debug statements	2018-08-21 16:00:01 -07:00
Wayne Chen	81d0e212dd	removing print statements	2018-08-21 15:57:17 -07:00
Wayne Chen	54aeac5d1f	adding fix	2018-08-21 15:55:00 -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
Cristian Luis Duarte	4227df30e6	Android - People and Domain list - synchronize cache and request code	2018-08-21 18:40:10 -03:00
Cristian Luis Duarte	ed965babdf	Android - People List - cache in memory only on this instance (deleted if app restarts) allows for fast list display. Showing again also asks for update so in some ms the list gets updated in case of changes	2018-08-21 17:47:40 -03:00
Stephen Birarda	7d8db482a3	put back ExtendedIODevice ctor for ubuntu warning	2018-08-21 13:21:21 -07:00