29179 commits

Author	SHA1	Message	Date
John Conklin II	47ce8be526	Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 ... MS16847: Tablet button doesn't load in HMD mode	2018-08-29 13:20:04 -07:00
John Conklin II	26f76081e6	Merge pull request #13843 from luiscuenca/fixGLTFLoadTexFromDir ... Read glTF resources from other than the main directory	2018-08-29 12:31:41 -07:00
Anthony Thibault	f281afa71f	Merge pull request #13874 from amantley/phaseWalkFix ... Phase walk fix bug 17770	2018-08-28 11:29:29 -07:00
Sam Gateau	d9d23e7fcf	Merge pull request #13877 from luiscuenca/multiplyOtherAvatars ... Create N replicas of each other-avatar on the client side	2018-08-28 09:02:13 -07:00
luiscuenca	c19bd8968a	Fix mixer crash	2018-08-27 16:48:47 -07:00
Brad Davis	945982b1bd	Working on pauses in tomb domain	2018-08-27 13:28:49 -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
John Conklin II	467fe56103	Merge pull request #13845 from SamGondelman/perf ... Move blendshape packing to worker thread	2018-08-27 09:40:03 -07:00
luiscuenca	8ede6f1cd0	Fix removing my avatar and code standards	2018-08-27 06:55:52 -07:00
SamGondelman	ff6020e0ef	fix compile errors, maybe	2018-08-24 15:41:25 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
SamGondelman	70f4d0c634	Merge remote-tracking branch 'upstream/master' into perf	2018-08-24 14:04:37 -07:00
Stephen Birarda	cb4ce4fedb	make sure settings are re-requested on new connection	2018-08-24 13:05:04 -07:00
luiscuenca	ddbadf5a69	change to Test API	2018-08-24 11:59:46 -07:00
luiscuenca	5654acf5bf	Fix warnings	2018-08-24 09:24:58 -07:00
luiscuenca	1fd0d7da94	Create API call	2018-08-23 18:03:27 -07:00
amantley	671bf32d58	removed whitespace	2018-08-23 17:36:35 -07:00
amantley	884be2f99d	removed comment and whitespace	2018-08-23 17:30:03 -07:00
amantley	0cc302f68c	set phase to 0.0	2018-08-23 17:28:38 -07:00
Stephen Birarda	1263db5688	force NL reset if the domain changes session ID or local ID	2018-08-23 16:48:46 -07:00
amantley	220dbf586f	set the phase to 0.0 when it is negative	2018-08-23 16:46:58 -07:00
Andrew Meadows	10d0833c19	use DynamicsWorld::numCollisionObjects instead of our own count	2018-08-23 15:57:54 -07:00
luiscuenca	3d959ca7ee	Refactoring and cleaning	2018-08-23 15:52:42 -07:00
Andrew Meadows	777b90bdc0	add 'physics body count' to debug stats	2018-08-23 12:59:28 -07:00
Andrew Meadows	87223946ad	add/remove avatars according to workload region	2018-08-23 12:59:28 -07:00
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	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
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
luiscuenca	e3ad5adcae	first approach vertical alignment	2018-08-23 06:49:35 -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
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	04d72ea39d	Merge pull request #13850 from samcake/punk ... Adjust Workload Region to be bigger	2018-08-22 10:21:14 -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
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	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
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