901 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	837ff45763	Removing code aroung the selfie fremebuffer	2015-07-22 10:57:08 -07: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	9596452c32	Trying to fix oculus rendering	2015-07-22 08:07:44 -04:00
Bradley Austin Davis	d6994c6dfd	Restoring star size and color variation	2015-07-21 19:22:10 -04: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
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	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	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -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
ZappoMan	d41d86c33c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-20 14:31:58 -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
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
Brad Davis	3d09e772f9	Merge branch 'marge' into homer	2015-07-20 12:09:51 -07:00
Brad Davis	23b058e4eb	Removing starfield tilt and reducing grid alpha	2015-07-20 11:40:12 -07:00
Brad Davis	dcaaeec593	Removing AO effect (temporarily) and wireframe mode	2015-07-20 10:55:11 -07:00
Atlante45	fc2956342e	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 10:39:16 -07:00
Brad Davis	cd677ccb18	Removing animation from star grid	2015-07-20 10:18:14 -07:00
Seth Alves	9af104f745	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-07-20 09:47:23 -07:00
Stephen Birarda	6b11495a20	resolve conflicts on merge with upstream master	2015-07-20 08:51:48 -07:00
Brad Davis	4c3cfe1e82	Starfield jazz hands	2015-07-19 20:53:50 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Bradley Austin Davis	5e0a0409bf	Removing setupWorldLight from viewstateinterface	2015-07-18 12:16:51 -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	1c965736e8	Remove merge error	2015-07-17 18:15:11 -07:00
Atlante45	052c3c987b	Fix some more smart pointer	2015-07-17 18:10:34 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
ZappoMan	816fd41624	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-17 17:10:52 -07:00
Brad Hefta-Gaub	2423d25839	Merge pull request #5355 from ctrlaltdavid/20620 ... QA for #20620 - Make renderGrid handle changing position and dimensions	2015-07-17 17:10:43 -07:00
ZappoMan	9c52f28ff4	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-17 17:05:13 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
ZappoMan	26e8090ec1	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 16:48:42 -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
ZappoMan	efa2001325	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 09:25:37 -07:00