2190 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
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07: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
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
Brad Davis	9016f437a8	Merge pull request #5371 from Atlante45/smart_pointers ... Smart pointers fixes	2015-07-21 08:52:29 -07:00
David Rowe	716211c6b7	Merge branch 'master' into fix-speech-bubble-not-rendering	2015-07-21 08:45:13 -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
Sam Gateau	ad1771c738	removing dead code	2015-07-20 17:09:11 -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
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Seth Alves	2814ad78fe	Merge branch 'rig' of github.com:howard-stearns/hifi into rig	2015-07-20 11:16:11 -07:00
Howard Stearns	9623ccf792	Change instantiation of Rig.	2015-07-20 11:07:25 -07:00
David Rowe	73ffe5d9f6	Fix Avatar > Blue Sphere While Speaking not rendering	2015-07-20 10:25:59 -07:00
Seth Alves	9af104f745	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-07-20 09:47:23 -07:00
Brad Davis	81543d9185	Removing unneeded undef	2015-07-19 19:06:21 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
Atlante45	e3f7c33767	Fix index check in setJointRotation	2015-07-17 15:39:25 -07:00
Seth Alves	d287817829	give SkeletonModel created by MyAvatar a Rig pointer	2015-07-17 14:52:37 -07:00
Seth Alves	bcd6b30ec3	move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists	2015-07-17 13:31:48 -07:00
Stephen Birarda	ce6585ccc8	fix AC monitor and AM double register	2015-07-16 17:44:43 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
Stephen Birarda	61f23f6a5e	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-16 11:56:26 -07:00
Seth Alves	75a35f9fcf	Merge branch 'rig' of github.com:howard-stearns/hifi into rig	2015-07-16 09:49:25 -07:00
samcake	b7ac84e174	Merge pull request #5342 from ZappoMan/removeNakeGL ... remove some more dead code and naked gl	2015-07-15 17:07:55 -07:00
Howard Stearns	b87ed7dc18	Remove dead code.	2015-07-15 17:05:57 -07:00
Howard Stearns	01a3701b52	Merge pull request #5329 from SamGondelman/hydraFix ... Hydra hand and mouse fixes	2015-07-15 19:03:04 -05:00
ZappoMan	d5a6e87a02	remove naked gl from Avatar::calculateDisplayNameTransform()	2015-07-15 16:34:23 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
Howard Stearns	6ca458b624	Instantiated in MyAvatar	2015-07-15 15:59:24 -07:00
ZappoMan	7795eaace6	remove more naked gl	2015-07-15 15:56:27 -07:00
ZappoMan	819fa852b8	first pass at GlowEctomy	2015-07-15 12:47:59 -07:00
ZappoMan	53c3e3d731	fix CR feedback	2015-07-15 09:03:07 -07:00
David Rowe	fc0ae17a87	Mirror head when using face tracker in fullscreen mirror ... Mirror translation, yaw, and roll in the same manner as done for HMD case, to mimic what you would expect to see in a mirror.	2015-07-15 07:27:55 -07:00
David Rowe	0af62ca946	Convert tabs to spaces	2015-07-15 07:27:54 -07:00
ZappoMan	8bb6616a25	remove nakedGL from skeleton IK constraint rendering	2015-07-14 18:47:35 -07:00