13076 commits

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
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
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
Bradley Austin Davis	2f13488f11	Fixing FBO bug on resizing windows	2015-07-22 11:28:36 -04: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
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
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
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
Seth Alves	abfe60aa20	whenever Model class uses _jointState, use the Rig version if there is a Rig.	2015-07-20 18:31:42 -07:00
Brad Davis	51973674f5	Merge remote-tracking branch 'upstream/master' into marge	2015-07-20 17:26:36 -07:00
Brad Davis	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -07:00
Sam Gateau	5bf85961d2	removing dead code	2015-07-20 17:13:02 -07:00
Sam Gateau	ad1771c738	removing dead code	2015-07-20 17:09:11 -07:00
Brad Davis	94d57a2e43	fixing missing glew init	2015-07-20 16:51:01 -07:00
Sam Gateau	9d9142c274	cleaning commented code supposedly dead now	2015-07-20 16:50:24 -07:00
Sam Gateau	6a0ca6e113	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-20 16:22:12 -07:00
Stephen Birarda	9fb8b55359	repairs to early return for sendNackPackets	2015-07-20 16:10:11 -07:00
ZappoMan	65a79cfefb	fix a bunch of warnings	2015-07-20 15:58:25 -07:00
Sam Gateau	b5090883a0	merge with latest network pr	2015-07-20 15:49:10 -07:00
Sam Gateau	59666f664a	merging my changes to remove cruff from application to AUstin;s latest	2015-07-20 15:37:17 -07:00
ZappoMan	648d0f6d43	fix a bunch of warnings	2015-07-20 15:12:27 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
Brad Davis	c0859ffd4c	Removing some dead forward declarations	2015-07-20 14:33:10 -07:00
Andrew Meadows	7578a70c4c	Merge pull request #5359 from birarda/protocol ... Network Protocol Refactor	2015-07-20 14:30:58 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Brad Davis	488a449cb1	Merge branch 'master' into homer	2015-07-20 13:34:21 -07:00
Stephen Birarda	462ff97722	remove FlowLayout.cpp that was accidentally kept	2015-07-20 13:06:31 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Sam Gateau	1a9f6e12a5	something not compiling but just before merge with upstream	2015-07-20 12:20:04 -07:00