21280 commits

Author	SHA1	Message	Date
Andrew Meadows	2c141fd555	more correct comment	2017-03-10 09:18:29 -08:00
Andrew Meadows	ffe69acb5c	fix rare physics crash	2017-03-08 19:26:12 -08:00
Andrew Meadows	31fc50b38c	Merge pull request #9828 from kunalgosar/recorderFix ... Fixed bug where recording sends you to (0, 0, 0)	2017-03-08 09:24:29 -08:00
kunalgosar	d2a2ba1846	Fixed recording bug	2017-03-07 17:19:21 -08:00
Brad Hefta-Gaub	1e51ae62b1	Merge pull request #9804 from jherico/oculus_update ... Update Oculus SDK to 1.11	2017-03-07 15:00:44 -08:00
Seth Alves	71c2b4215d	Merge pull request #9811 from ZappoMan/triangleSet ... Cleanup how Models do ray-picking and determination of point inside of convex hull	2017-03-07 14:12:56 -08:00
Seth Alves	cd91d6ff3c	Merge pull request #9824 from sethalves/fix-tablet-qml-overlay-in-hmd ... fix -- restore missing shading pipeline for simple opaque in deferred	2017-03-07 13:25:44 -08:00
Ryan Huffman	a744e0d11c	Merge pull request #9685 from humbletim/21114-part2 ... CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions	2017-03-07 13:25:25 -08:00
Brad Hefta-Gaub	f7e824e47c	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-07 12:18:36 -08:00
Seth Alves	694fc58374	restore missing shading pipeline for simple opaque in deferred	2017-03-07 12:07:24 -08:00
Brad Hefta-Gaub	d8b7076a9e	Merge pull request #9816 from AndrewMeadows/sphere-means-sphere ... ModelEntityItems that use 'sphere' for shapeType should collide as true spheres	2017-03-07 09:53:52 -08:00
Brad Hefta-Gaub	87934ee82d	fix bugs in some meshes	2017-03-06 21:50:32 -08:00
Atlante45	ff9d6d657c	Remove weighted offset, special case downward pressure	2017-03-06 19:41:08 -08:00
Andrew Meadows	d749c0c8be	use fabsf() rather than fabs()	2017-03-06 15:50:32 -08:00
Andrew Meadows	10b3e7fc67	sphere shapeType for models means 'sphere'	2017-03-06 15:14:51 -08:00
Zach Fox	5223f872c1	Merge pull request #9753 from zfox23/FB_3234_TakeTwo ... Optimize AvatarMixer with respect to Identity and Avatar Data	2017-03-06 13:37:29 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -08:00
Brad Hefta-Gaub	f27475613f	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-06 12:53:59 -08:00
samcake	21f36d7212	removing comments and restoring the correct behavior for Pal.js	2017-03-06 12:41:00 -08:00
ZappoMan	faba160331	more CR feedback	2017-03-06 11:10:04 -08:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
ZappoMan	af97e9bdd9	CR feedback	2017-03-06 10:49:38 -08:00
Zach Fox	718ecea404	Potential non-spammy solution using pseudo-state	2017-03-06 10:03:41 -08:00
Zach Fox	cfb8534d71	Comment	2017-03-06 10:03:41 -08:00
Zach Fox	c9c07c4269	Basically rebase and squash	2017-03-06 10:03:41 -08:00
ZappoMan	2a663cbcb1	cleanup	2017-03-05 19:28:15 -08:00
ZappoMan	87bcced409	cleanup use of triangleSet for picking	2017-03-05 19:23:55 -08:00
sam	cffd838d1d	merging with master	2017-03-05 12:57:13 -08:00
ZappoMan	32add6635d	checkpoint on reducing raypicking recalcs	2017-03-04 23:33:17 -08:00
Ken Cooke	a5571bd49d	redo unsafe optimization	2017-03-04 16:02:39 -08:00
Ken Cooke	44c1f8500d	redo unsafe optimization	2017-03-04 15:55:53 -08:00
Ken Cooke	0bababf1f5	Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128	2017-03-04 14:53:07 -08:00
ZappoMan	9908723bb9	fist cut at basic TriangleSet class	2017-03-03 22:27:38 -08:00
Bradley Austin Davis	ce9d637b3f	Expose ASW activation status, provide normalized present rate information	2017-03-03 10:46:05 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	807e15ade9	Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2 ... avoid animation blending for other avatars	2017-03-02 18:37:18 -08:00
Seth Alves	5f570c1ba8	fix up bounds handling in Line3DOverlay	2017-03-02 16:16:48 -08:00
Anthony J. Thibault	bc256f3e8f	Fix for multi-threaded access to maps in DebugDraw.	2017-03-02 14:42:06 -08:00
Andrew Meadows	a55ab94cd9	other avatars use jointData no Rig animation	2017-03-02 07:52:02 -08:00
Stephen Birarda	b586926d09	Merge pull request #9755 from birarda/master ... increase max renderable web entity FPS to 30 for Youtube.com	2017-03-01 18:09:16 -08:00
Anthony J. Thibault	01abb4bdb6	Exposed DebugDraw interface to Java Script	2017-03-01 13:14:29 -08:00
Howard Stearns	8424f151bf	Merge pull request #9789 from davidkelly/dk/3313 ... Remember gain settings when pal is closed and reopened	2017-03-01 10:21:02 -08:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
samcake	664163eb17	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-28 18:13:01 -08:00
samcake	6ac85aee7e	Adding support for the unliti materials too for overlay's	2017-02-28 18:12:35 -08:00
Seth Alves	0d0c26ef64	Merge pull request #9759 from sethalves/voxel-paint-opti ... no bullet shape for collisionless polyvox	2017-02-28 13:54:44 -08:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
Stephen Birarda	8562a294fa	cleanup some extra spacing	2017-02-28 13:24:41 -08:00
Andrew Meadows	c6730f7c58	Merge pull request #9745 from AndrewMeadows/faster-avatar-updates ... Faster avatar updates	2017-02-28 10:55:21 -08:00
Clément Brisset	7f9437dcc5	Merge pull request #9690 from Atlante45/feat/sit ... Add hips pinning / Sit script	2017-02-28 10:41:22 -08:00