4164 commits

Author	SHA1	Message	Date
Shannon Romano	11e5f0a101	Merge pull request #15323 from ctrlaltdavid/M22052 ... Case 22052: Camera JSDoc	2019-04-12 12:26:39 -07:00
David Rowe	617617736e	Merge branch 'master' into M22052	2019-04-11 10:24:27 +12:00
Sam Gateau	51d1c4b1f3	Merge pull request #15357 from SamGondelman/cauterize ... Case 21417: Fix cauterization of entities that are children of MyAvatar's head	2019-04-10 12:29:40 -07:00
Sam Gateau	89ff63e8bb	Merge pull request #15267 from jherico/fix/tracing ... Case 21930: Don't change OpenGL context state every frame	2019-04-10 09:42:09 -07:00
SamGondelman	27338c3639	fix cauterization of entities that are children of MyAvatar's head	2019-04-08 19:48:11 -07:00
Sam Gondelman	660818aded	Revert "Case 20060: Grab correct stencil masks from display plugins"	2019-04-05 11:59:46 -07:00
Wayne Chen	b10faa8109	Merge pull request #14738 from r3tk0n/project-freeloco ... Case 21777: Locomotion Project	2019-04-04 16:18:32 -07:00
Sam Gondelman	85bf1da0a1	Merge pull request #15266 from SamGondelman/stencil ... Case 20060: Grab correct stencil masks from display plugins	2019-04-04 13:36:25 -07:00
David Rowe	1bc38cab28	Camera JSDoc polish	2019-04-04 18:03:14 +13:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -07:00
r3tk0n	ac2971894b	Fix sprint mode scalar.	2019-04-03 11:42:40 -07:00
Sam Gondelman	414a39bd8a	Merge branch 'master' into particleShapes	2019-04-01 22:20:13 -07:00
r3tk0n	4fb7bbabe1	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
SamGondelman	33b3e2afac	try to fix build errors?	2019-03-29 10:57:01 -07:00
Brad Davis	36cecef166	Support explicit timestamps in tracing, conditional event output based on duration	2019-03-26 13:50:46 -07:00
SamGondelman	4ed7c09016	grab correct stencil masks from display plugins	2019-03-26 13:42:18 -07:00
David Rowe	cf4370ed3a	Merge branch 'master' into M21222	2019-03-26 09:44:48 +13:00
David Rowe	839a03ebe6	Miscellaneous JSDoc fixes noticed in passing	2019-03-26 09:41:07 +13:00
r3tk0n	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -07:00
r3tk0n	7a8dfe0aaf	Fix run speeds.	2019-03-21 15:06:21 -07:00
SamGondelman	3ff0770441	model emitters!	2019-03-20 21:25:14 -07:00
David Rowe	7445d73857	Merge branch 'master' into M21222 ... # Conflicts: # libraries/avatars/src/AvatarData.h	2019-03-13 16:14:14 +13:00
danteruiz	6303f61cc3	fix lasers scale issue	2019-03-12 14:26:59 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
r3tk0n	cbd841a14d	Update gearing system.	2019-03-11 16:22:48 -07:00
David Rowe	24286273b4	Miscellaneous JSDoc fixes	2019-03-09 19:22:07 +13:00
Shannon Romano	a8f6e74ca4	Merge pull request #15135 from SamGondelman/text81 ... Case 21628: Fix text rendering on AMD/Mac	2019-03-08 14:59:37 -08:00
Roxanne Skelly	c33d2aafda	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
David Rowe	4779a6b156	Merge branch 'master' into M21222	2019-03-09 07:57:53 +13:00
David Rowe	0b7cddb886	Fill in and tidy MyAvatar JSDoc	2019-03-08 13:49:10 +13:00
SamGondelman	af03fb5f85	try to fix text rendering on amd with transparency	2019-03-07 16:23:12 -08:00
Shannon Romano	8be93fd16c	Merge pull request #14891 from kencooke/glm-pack-normals-speedup ... Case 21114: SIMD optimized blendshape packing	2019-03-07 15:28:40 -08:00
Roxanne Skelly	b38fc65372	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-07 10:06:05 -08:00
SamGondelman	380df059ff	fix shapes app	2019-03-06 18:18:39 -08:00
Dante Ruiz	d33400f6ad	fix GCC compiler warning	2019-02-28 15:25:15 -08:00
David Rowe	aa53ab7492	Distinguish between Mat4 type and Mat4 API in JSDoc	2019-02-27 09:54:11 +13:00
David Rowe	e79594ef53	Fill in and tidy Avatar JSDoc	2019-02-27 09:53:11 +13:00
r3tk0n	5d3a778b0b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation	2019-02-25 13:10:47 -08:00
Roxanne Skelly	2dffd14fa7	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-25 10:20:52 -08:00
Shannon Romano	dc6bdfae8a	Merge pull request #14995 from SamGondelman/parentCrash ... Case 21391: Fix parent loop crash	2019-02-25 10:01:37 -08:00
Shannon Romano	5f99158c25	Merge pull request #14977 from SamGondelman/rot ... Case 21354: Add "modelScale" property to fix pal	2019-02-22 16:36:17 -08:00
Sam Gondelman	30b6b7f21b	let's try that again	2019-02-22 16:30:36 -08:00
Roxanne Skelly	0636579822	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-22 15:43:42 -08:00
SamGondelman	081e62a647	fix parent loop crash	2019-02-22 14:26:15 -08:00
amantley	c9db426ce4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-21 14:36:13 -08:00
SamGondelman	544f54e69a	fix model scale	2019-02-21 14:10:36 -08:00
amantley	50bc8d3646	added protected function to cubic hermite spline	2019-02-21 13:32:28 -08:00
amantley	de10aebbb5	removed white space	2019-02-21 11:44:18 -08:00
amantley	64ec28ef44	added back missing unity meta files	2019-02-21 11:37:14 -08:00
Roxanne Skelly	8c058f147e	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-20 14:24:47 -08:00