28750 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	ee334ff826	JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.	2015-07-22 18:43:10 -07:00
Seth Alves	47965bc39c	merge from upstream	2015-07-22 13:48:19 -07:00
Seth Alves	7c8d52cbd1	back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer	2015-07-22 13:41:31 -07:00
Howard Stearns	a6395a2351	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-22 12:29:27 -07:00
Brad Hefta-Gaub	f86c064059	Merge pull request #5387 from samcake/punk ... Moving GL initialization to GLBackend and cleaning the gpu::Context in Application	2015-07-22 11:50:32 -07:00
Howard Stearns	a161f527c4	Comments documenting direction and questions.	2015-07-22 11:41:24 -07:00
Howard Stearns	dbb4a8b767	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-22 11:40:25 -07:00
Sam Gateau	f70553ec95	Fixing merge	2015-07-22 11:31:46 -07:00
Brad Davis	3407fd48a8	Merge pull request #5363 from PhilipRosedale/master ... Birds will die if abandoned, ability to fly with birds	2015-07-22 14:13:27 -04:00
Brad Hefta-Gaub	3f8348c3d7	Merge pull request #5384 from jherico/homer ... Make stars a little smaller	2015-07-22 11:04:15 -07:00
Sam Gateau	837ff45763	Removing code aroung the selfie fremebuffer	2015-07-22 10:57:08 -07:00
Sam Gateau	8dbd991652	USing a modern singleton guard	2015-07-22 10:54:40 -07:00
Bradley Austin Davis	68cf3776f0	Make stars a little smaller	2015-07-22 13:44:37 -04:00
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07:00
Brad Hefta-Gaub	bf0bf09c98	Merge pull request #5379 from jherico/marge ... Break framebuffer operations out of TextureCache, minor naked GL removal	2015-07-22 10:24:14 -07:00
Philip Rosedale	b7a4acaf87	changed to use new Vec3.toPolar() function	2015-07-22 10:06:08 -07:00
Bradley Austin Davis	2f13488f11	Fixing FBO bug on resizing windows	2015-07-22 11:28:36 -04:00
Bradley Austin Davis	de30288b5d	Merge remote-tracking branch 'upstream/master' into marge	2015-07-22 11:03:36 -04:00
Brad Hefta-Gaub	4e04f0d887	Merge pull request #5381 from jherico/bart ... Fix deadlock when using textoverlay from main thread	2015-07-22 07:59:35 -07:00
Brad Hefta-Gaub	2bd2004bda	Merge pull request #5380 from jherico/maggie ... Restoring starfield size and color variation	2015-07-22 07:58:15 -07:00
Brad Hefta-Gaub	60637befbc	Merge pull request #5382 from jherico/homer ... Fix domain connection status border	2015-07-22 07:42:03 -07:00
Bradley Austin Davis	65732d874c	Merge branch 'maggie' into marge	2015-07-22 09:07:50 -04:00
Bradley Austin Davis	c0048afbec	Merge branch 'bart' into marge	2015-07-22 09:07:45 -04:00
Bradley Austin Davis	190984657e	Merge branch 'homer' into marge	2015-07-22 09:07:33 -04:00
Bradley Austin Davis	a93e17d622	Fix domain connection status border	2015-07-22 08:27:51 -04:00
Bradley Austin Davis	9596452c32	Trying to fix oculus rendering	2015-07-22 08:07:44 -04:00
Bradley Austin Davis	ae539afafb	Fix deadlock when using textoverlay from main thread	2015-07-22 07:23:12 -04:00
Bradley Austin Davis	bd5da87551	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 19:23:38 -04:00
Bradley Austin Davis	d6994c6dfd	Restoring star size and color variation	2015-07-21 19:22:10 -04:00
Bradley Austin Davis	c3f77a1c24	Merge branch 'master' into maggie	2015-07-21 19:21:45 -04:00
Brad Hefta-Gaub	6dbe6bc375	Merge pull request #5332 from ctrlaltdavid/20612 ... Fix full-screen mirror not mirroring correctly with Faceshift or DDE	2015-07-21 13:32:56 -07:00
Andrew Meadows	d6aa6b930b	Merge pull request #5368 from bwent/keyLightDirectionFix ... Add Vec3 function to convert a Vec3 to/from Euler angles	2015-07-21 13:31:28 -07:00
bwent	5a8106a049	fixes in edit.js UI	2015-07-21 13:15:24 -07:00
Philip Rosedale	6c51c9e950	added ability to follow/fly with the birds	2015-07-21 12:18:52 -07:00
bwent	2b745395ec	use radius for z-component	2015-07-21 11:38:10 -07:00
Sam Gateau	7b35048e52	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-21 11:18:15 -07:00
Sam Gateau	93afdf79a3	Removing the gl driver version report intiialization code out of applciation	2015-07-21 11:17:41 -07:00
bwent	d688e5f915	fix case where v not normalizable	2015-07-21 11:08:53 -07:00
bwent	30d4b9f635	switch to radians, overload fromPolar, use atan2	2015-07-21 11:08:53 -07:00
bwent	89eed589e2	Add Vec3 function to convert vec3 to/from euler angles	2015-07-21 11:08:53 -07:00
Seth Alves	fecdc08720	merge from upstream	2015-07-21 09:53:51 -07:00
Seth Alves	cdc26526b4	merge from upstream	2015-07-21 09:51:16 -07:00
Philip Rosedale	cf88bce082	Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering ... Fix Avatar > Blue Sphere While Speaking not rendering	2015-07-21 09:11:36 -07:00
Bradley Austin Davis	fda1cb6f7b	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
Brad Davis	9016f437a8	Merge pull request #5371 from Atlante45/smart_pointers ... Smart pointers fixes	2015-07-21 08:52:29 -07:00
Brad Davis	5b63863dca	Merge pull request #5378 from ZappoMan/warningFixes ... coding standard fix	2015-07-21 08:52:17 -07:00
David Rowe	716211c6b7	Merge branch 'master' into fix-speech-bubble-not-rendering	2015-07-21 08:45:13 -07:00
ZappoMan	558f10640b	coding standard fix	2015-07-21 08:30:33 -07:00
Brad Davis	6d4c7cd4f2	Merge pull request #5374 from ZappoMan/warningFixes ... Warning fixes and removing dead code	2015-07-21 07:23:40 -07:00
Brad Davis	57f9abe5c8	Merge pull request #5377 from samcake/punk ... Removing extra gl calls and removing cruff from Application.cpp	2015-07-21 06:28:27 -07:00