36454 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	9b49d9d66b	default parentJointIndex to -1	2015-12-18 15:10:51 -08:00
Seth Alves	13ad6bf2f7	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-18 14:52:02 -08:00
Seth Alves	5bede8123d	script for debugging queryAACube	2015-12-18 14:47:05 -08:00
Seth Alves	69bba4a182	queryAABox wasn't centered on object	2015-12-18 14:46:24 -08:00
Brad Hefta-Gaub	bfa0652100	Merge pull request #6700 from AndrewMeadows/angular-velocity-is-a-vector ... protect against NaN in measure of hydra angularVelocity	2015-12-18 14:29:23 -08:00
Andrew Meadows	aa3d1c6e4c	Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix ... ModelEntityItem: Fix for incorrect animations with preTranslations	2015-12-18 14:16:35 -08:00
Seth Alves	b9a7ed8560	Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting	2015-12-18 14:02:51 -08:00
Andrew Meadows	eb3210071e	Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition ... Improved idle to walk forward transition	2015-12-18 13:59:03 -08:00
Andrew Meadows	4e76e9e50b	prevent nan values in measure of angularVelocity	2015-12-18 13:51:14 -08:00
samcake	0492bb1c6d	Final cleans and tests using R11G11B10 for lighting buffer	2015-12-18 13:50:28 -08:00
Seth Alves	1a534ff645	Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting	2015-12-18 13:43:33 -08:00
Eric Levin	2e4df5f859	Merge pull request #6692 from ctrlaltdavid/20758 ... Update particlesTest.js per current particles implementation	2015-12-18 13:35:19 -08:00
samcake	f6c80e01e9	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-18 13:23:09 -08:00
samcake	5a4d028573	Merge pull request #6699 from samcake/graphicsMaster ... Graphics : merge upstream master into upstream graphics	2015-12-18 13:23:05 -08:00
samcake	0482a2a7f7	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-18 13:20:46 -08:00
samcake	d22811a771	Merge pull request #6698 from zzmp/fix/check-locations-pipeline ... Stop modelMesh render if pipeline is not found	2015-12-18 13:20:12 -08:00
samcake	dff4327f7d	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 13:18:30 -08:00
Zach Pomerantz	2c2b794683	Stop modelMesh render if pipeline is not found	2015-12-18 13:16:05 -08:00
samcake	3014b3bd5b	Adding Gamma correction to all the Color coming for the attribute stream if used as color	2015-12-18 12:50:21 -08:00
Brad Hefta-Gaub	bfecf68a2e	Merge pull request #6696 from AndrewMeadows/angular-velocity-is-a-vector ... angular velocity is a vector	2015-12-18 12:29:56 -08:00
Seth Alves	81d3571171	fix getMaximumAACube and getMinimumAACube success return values	2015-12-18 12:04:47 -08:00
Andrew Meadows	d6541e9ee7	angular velocity is a vector, not a quaternion	2015-12-18 11:06:58 -08:00
samcake	157597e783	Merge pull request #6690 from samcake/hdr ... Graphics: Fix the shading equation to respect the fresnel term for the diffuse	2015-12-18 10:30:36 -08:00
Seth Alves	a5d37bed60	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-18 09:12:57 -08:00
Brad Davis	3446229bd8	Merge pull request #6693 from ZappoMan/fixWarnings ... fix warnings	2015-12-18 00:38:12 -08:00
Brad Hefta-Gaub	a7824a06d0	fix Assignment copy constructor warning	2015-12-17 18:51:27 -08:00
Brad Hefta-Gaub	0b781a3589	fix warnings	2015-12-17 18:39:05 -08:00
David Rowe	9a7c0cb182	Typo noticed in passing	2015-12-18 15:12:03 +13:00
David Rowe	c3e3af7c8c	Document effect of Bezier interpolation on particle radius simulation	2015-12-18 15:11:43 +13:00
David Rowe	e2ecc388ca	Indicate particle properties that (temporarily) aren't working	2015-12-18 15:10:47 +13:00
David Rowe	5aef309b8a	Get particles in particlesTest.js emitting again	2015-12-18 15:09:36 +13:00
samcake	c891bcb8cd	FIxing the diffuse contribution bug maybe	2015-12-17 17:44:40 -08:00
samcake	32bb8f020c	FIxing the diffuse contribution bug maybe	2015-12-17 17:40:35 -08:00
samcake	e179326e58	Merge pull request #6688 from Atlante45/graphics ... Added live custom debug shader support	2015-12-17 16:19:49 -08:00
Seth Alves	688448fe41	more queryAABox experimenting	2015-12-17 16:18:41 -08:00
Atlante45	78b805a19a	Fix file shader file lookup on windows	2015-12-17 16:06:55 -08:00
Atlante45	c0a675dd9e	Fix msvc warning	2015-12-17 16:02:49 -08:00
Atlante45	f41ca9fc50	More custom debug work	2015-12-17 15:18:23 -08:00
Atlante45	d8a389ff92	First cut at custom pipelines	2015-12-17 15:18:23 -08:00
Atlante45	9d6618c341	Cleanup DebugDeferredBuffer code	2015-12-17 15:18:23 -08:00
Atlante45	06d7de7106	Make Shader interface take more consts	2015-12-17 15:18:23 -08:00
Atlante45	b271542b73	Save DebugMode to setting, restore on script start	2015-12-17 15:18:23 -08:00
Seth Alves	2dd2a49141	a non-set queryAACube is one with no volume	2015-12-17 15:02:07 -08:00
Seth Alves	473212e5b7	try to be more coherent about queryAABox meaning	2015-12-17 14:29:41 -08:00
Andrew Meadows	1bb6ddb99f	Merge pull request #6676 from sethalves/dejitter-hold-action ... Dejitter hold action	2015-12-17 14:29:39 -08:00
Clément Brisset	992cffd6d6	Merge pull request #6686 from samcake/hdr ... Graphics: Fix bad returned references which should be copied values	2015-12-17 13:20:59 -08:00
Seth Alves	9438015f3a	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-17 11:48:04 -08:00
Seth Alves	b80fa1c806	code review	2015-12-17 11:46:41 -08:00
Ryan Huffman	3da5cf1fe5	Merge pull request #6684 from birarda/read-type-assert ... fix reading of empty or malformed packets	2015-12-17 11:26:47 -08:00
Seth Alves	f3adb8a2f7	fix offset math in hold action	2015-12-17 11:16:59 -08:00