11178 commits

Author	SHA1	Message	Date
ericrius1	59d5f61af4	incremented protocol number	2015-08-10 14:20:46 -07:00
ericrius1	8e7398ac7d	small comment change	2015-08-10 13:41:30 -07:00
ericrius1	c9ad8e6e10	fixed comment formatting.	2015-08-10 12:10:27 -07:00
ericrius1	0f7c21ddd7	rearranged entity props and added check in setNormals to avoid uninitialized binormal values	2015-08-10 11:55:47 -07:00
Andrew Meadows	5acd1e7d58	Merge pull request #5467 from sethalves/polyvox ... Polyvox improvements (Warning: protocol change)	2015-08-10 11:12:10 -07:00
ericrius1	c299d77c92	fixed implicit double to float casting and incorrect header author attribution	2015-08-10 10:57:53 -07:00
Andrew Meadows	331c8c0967	Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements ... Improvements to FloatingUIPanels.	2015-08-07 17:21:51 -07:00
ericrius1	4fbd6f6337	removed old PacketHeaders.h file, updated udt version	2015-08-07 16:42:10 -07:00
ericrius1	6a4e2728ee	deleted old packet headers file	2015-08-07 16:29:57 -07:00
ericrius1	19e645fc65	fixed the way colors are handled to work with new core profile changes	2015-08-07 16:26:52 -07:00
ericrius1	205a2d53b6	no longer returning early on NaN	2015-08-07 16:15:51 -07:00
Andrew Meadows	48c5a227a7	Merge pull request #5528 from ZappoMan/removeBrokenShadows ... remove shadow menu items	2015-08-07 16:09:00 -07:00
Brad Davis	64fcd2da96	Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization ... optimizations to RenderableModelEntityItem::render()	2015-08-07 15:32:07 -07:00
Seth Alves	732f9ceca5	pass voxel dimensions from PolyVoxEntityItem to pixel-shader so that the textures line up with the edges	2015-08-07 14:21:20 -07:00
Seth Alves	0a5ed0eb9b	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-07 13:50:22 -07:00
Seth Alves	b1e69537f3	Merge pull request #5524 from howard-stearns/cleanup-jointstate ... Clean Up JointState	2015-08-07 13:50:02 -07:00
ZappoMan	cec0f8ed1d	optimize ModelEntityItem::getAnimationFrame()	2015-08-07 13:43:57 -07:00
Seth Alves	f9685efa4b	set payload bounds for polyvoxs	2015-08-07 13:43:34 -07:00
Seth Alves	fcb30dbbe7	hook textures up to polyvoxs	2015-08-07 13:33:00 -07:00
ZappoMan	f4c3c30f6a	quick optimization to RenderableModelEntityItem::render()	2015-08-07 12:49:48 -07:00
Howard Stearns	145b730f80	Clean up instantiation.	2015-08-07 12:27:26 -07:00
ericrius1	d735c85806	moving polyLineEntity over to core profile	2015-08-07 11:41:55 -07:00
ZappoMan	87f609b9af	remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows	2015-08-07 11:26:07 -07:00
ericrius1	3910cb0d69	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
Stephen Birarda	eec382ade8	Merge pull request #5513 from bwent/domain-server-authentication ... Add connection token UUId to sign with username when connecting to domain-server	2015-08-07 10:05:00 -07:00
Seth Alves	44ee13a185	Merge branch 'cleanup-jointstate' of github.com:howard-stearns/hifi into polyvox	2015-08-07 09:24:40 -07:00
Seth Alves	3953bb5b01	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-07 09:08:01 -07:00
Seth Alves	19aec4a3e7	update polyvox shader	2015-08-07 09:07:54 -07:00
Brad Hefta-Gaub	a10d310403	Merge pull request #5526 from samcake/daft ... Fix the multi part per mesh with various opacity level issue	2015-08-07 08:57:31 -07:00
Seth Alves	c07119c30b	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-07 07:37:25 -07:00
Howard Stearns	a840a17106	Change name originalRotation defaultRotation.	2015-08-06 19:45:58 -07:00
Seth Alves	66f595f4b2	Merge pull request #5520 from howard-stearns/single-animation-vs-blend ... Don't let individual startAnimation get messed up by blend/fade.	2015-08-06 18:55:14 -07:00
Sam Gateau	e4ce1002ea	cleaning th ecode	2015-08-06 18:54:58 -07:00
Sam Gateau	561a058dc8	cleaning th ecode	2015-08-06 18:53:21 -07:00
Sam Gateau	f0f141a2b4	SImple fix to the case of multiple material in a mesh with different opacity	2015-08-06 18:51:44 -07:00
Howard Stearns	42cc34cd64	JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.	2015-08-06 16:54:09 -07:00
Zander Otavka	be4e827281	Merge: master -> panel-attachable-improvements.	2015-08-06 16:29:38 -07:00
Brad Hefta-Gaub	0947bf2cd0	Merge pull request #5517 from samcake/punk ... Improving the quality of the normal encoding in the Deferred Buffer	2015-08-06 15:13:08 -07:00
Howard Stearns	02f57286e4	Don't let individual startAnimation get messed up by blend/fade.	2015-08-06 11:30:18 -07:00
bwent	ffccc9ca96	clean up formatting, make connectionUUID const in NodeList	2015-08-06 10:11:22 -07:00
bwent	a8f9f9d746	clean-up formatting	2015-08-05 17:43:03 -07:00
samcake	07a9dd3404	Ready for release	2015-08-05 17:41:23 -07:00
Sam Gateau	95682e6270	Introducing the Normal fitting algorithm for better normal in the deferred buffer	2015-08-05 17:17:00 -07:00
Atlante45	3dc8bd47ae	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
Zander Otavka	4a1fcbf160	Fix error in an unused method declaration.	2015-08-05 16:11:09 -07:00
bwent	ab2b54a6b2	Add connection token to sign with username when connecting to domain-server	2015-08-05 15:33:59 -07:00
Stephen Birarda	998a8168a3	remove an extra unneeded message	2015-08-05 14:38:14 -07:00
Stephen Birarda	653e0d29c7	resolve conflicts on merge with upstream/core	2015-08-05 14:37:30 -07:00
Stephen Birarda	6c337b8aeb	repairs for build type of glew external	2015-08-05 14:30:36 -07:00
bwent	8868148c94	Parital fix for padding error using RSA_sign and RSA_verify	2015-08-05 14:07:25 -07:00