29197 commits

Author	SHA1	Message	Date
SamGondelman	ade58a52cc	reserve priority sort util vectors	2018-09-04 11:21:43 -07:00
SamGondelman	d01b438cb3	CR	2018-08-31 11:25:17 -07:00
SamGondelman	5f08ed5027	misc perf improvements	2018-08-30 16:55:15 -07:00
Sam Gateau	12ec56875e	Merge pull request #13867 from SamGondelman/recurse ... findRayIntersection/findParabolaIntersection performance improvements	2018-08-30 09:49:16 -07:00
John Conklin II	7298cb4654	Merge pull request #13888 from dback2/editControllerMapping ... Edit mode controller mapping using new platform state variables	2018-08-29 16:06:47 -07:00
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
David Back	96d2ba660c	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-29 12:05:51 -07:00
David Back	dcf2074d7e	remove [ camera key, allow F to enter camera without selection	2018-08-29 11:56:37 -07:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -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
David Back	990638fd95	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-27 18:04:23 -07:00
luiscuenca	c19bd8968a	Fix mixer crash	2018-08-27 16:48:47 -07:00
David Back	f81fe6b29f	add more inputs to controller mapping	2018-08-27 16:35:36 -07:00
SamGondelman	aae06e8f49	faster aabox ray intersection and pre-computed inverse direction	2018-08-27 15:40:33 -07:00
David Back	75d7bf0424	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-27 14:53:28 -07:00
David Back	b6edb2c9d6	platform states, edit controller mapping, separate mac/win delete	2018-08-27 14:53:13 -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
SamGondelman	3d048c77ba	Merge remote-tracking branch 'upstream/master' into recurse	2018-08-24 11:39:05 -07:00
SamGondelman	1c0c17cecb	faster triangle intersection	2018-08-24 11:20:10 -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
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -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
SamGondelman	c474f38860	force coarse picking, sort avatars	2018-08-22 18:07:16 -07:00
Simon Walton	c0966d738e	Use EntityVersion for the EntityQueryInitialResultsComplete packet	2018-08-22 16:40:49 -07:00