29359 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	e9f2cadfff	Update BUILD_OSX.md	2015-08-07 10:49:20 -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
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	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
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
samcake	db7e457325	Merge pull request #5521 from huffman/fix-billboard-backface ... Disable back-face culling when rendering BillboardOverlay	2015-08-06 14:14:16 -07:00
Ryan Huffman	cefb7be51d	Disable back-face culling when rendering BillboardOverlay	2015-08-06 14:09:32 -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	73ea958640	add check if user is local user	2015-08-06 09:01:25 -07:00
Brad Davis	9215ea8894	Merge pull request #5516 from Atlante45/warnings ... Fix warning and remove unused headers	2015-08-05 19:12:09 -07:00
Brad Davis	37dc2d00cd	Merge pull request #5515 from sethalves/zlib-in-build-instructions ... update build instructions -- interface now depends on zlib	2015-08-05 19:10:42 -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	7be736d6de	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-08-05 17:17:30 -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
Seth Alves	12286b7e9b	Merge pull request #5514 from howard-stearns/only-update-motion-state-for-my-avatar ... Don't try to animate other people's avatars!	2015-08-05 16:17:22 -07:00
Seth Alves	bee21b13b7	interface now depends on zlib. describe how to install on windows	2015-08-05 16:13:25 -07:00
bwent	45e3eafce3	Remove ERR_get_error call	2015-08-05 16:00:25 -07:00
Howard Stearns	ca6d798aa5	Don't try to animate other people's avatars!	2015-08-05 15:59:22 -07:00
bwent	ab2b54a6b2	Add connection token to sign with username when connecting to domain-server	2015-08-05 15:33:59 -07:00
samcake	a4f105f6c3	Merge pull request #5495 from highfidelity/core ... Update the rendering pipeline to use OpenGL 4.1 Core profile everywhere	2015-08-05 15:10:46 -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	078e60076c	don't set a default build type	2015-08-05 14:34:00 -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
Bradley Austin Davis	252677e1c2	Fix MD5 of glew dep	2015-08-05 14:02:14 -07:00
Bradley Austin Davis	89cc2ccfa5	More merge comments	2015-08-05 13:53:19 -07:00
Bradley Austin Davis	649b9d6ce9	Fixing signed/unsigned comparisons	2015-08-05 13:48:05 -07:00
Brad Davis	754bf5c6f7	Merge pull request #5509 from birarda/core ... get GLEW for all platforms as external project	2015-08-05 13:41:48 -07:00
Brad Davis	5723d2689b	Merge pull request #5510 from SamGondelman/core ... Core Profile: Merge from master	2015-08-05 12:52:37 -07:00
Sam Gondelman	513c652ab3	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
Stephen Birarda	34e188fe6e	log more of the steps for glew external project	2015-08-05 12:35:37 -07:00
Stephen Birarda	cc909507f4	get GLEW for all platforms as external project	2015-08-05 12:34:11 -07:00
Anthony Thibault	49be7c49b7	Merge pull request #5506 from howard-stearns/smooth-faded-animations ... Smooth fading of animations in and out.	2015-08-05 12:02:44 -07:00
Stephen Birarda	4b673838ac	Merge pull request #5508 from jherico/marge ... Removing integrated glew	2015-08-05 11:31:17 -07:00
Bradley Austin Davis	04d579be7a	Removing integrated glew	2015-08-05 11:21:59 -07:00
Andrew Meadows	59f6988e56	Merge pull request #5465 from SamGondelman/connexionFixes ... Trying to fix/clean up 3DConnexion stuff	2015-08-05 11:16:34 -07:00
Howard Stearns	bb974edf7f	Add assert on mix range.	2015-08-05 11:09:04 -07:00
Howard Stearns	f51b5be167	Simplify fade normalization, eliminating a loop.	2015-08-05 11:00:40 -07:00
Andrew Meadows	5be8583b7d	Merge pull request #5494 from sethalves/gzip-json-entity-persist-files ... gzip json entity persist files	2015-08-05 10:56:03 -07:00
Howard Stearns	653e46fdd3	const methods.	2015-08-05 10:51:26 -07:00
bwent	60fdc390c5	fix username signature not const	2015-08-05 10:42:10 -07:00
bwent	fc385d9bc1	debugging	2015-08-05 10:29:30 -07:00
Seth Alves	eb87023416	code review	2015-08-05 10:16:45 -07:00