11 commits

Author	SHA1	Message	Date
Clément Brisset	7ffe7b31a6	Merge pull request #5041 from ZappoMan/team-teaching-all-entities ... TEAM TEACHING - overlays and entities, fix to shrunken avatars	2015-06-04 18:00:44 +02:00
Atlante45	166eff7df1	Fix line entity rendering	2015-06-04 10:54:57 +02:00
ZappoMan	c6fb22b915	make sure all entities are rendering in pipeline part 1	2015-06-03 17:16:45 -07:00
ZappoMan	7c40b666e8	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-06-03 09:52:40 -07:00
Eric Levin	5cce4edec8	fix merge conflicts attemp 1	2015-06-01 11:18:33 -07:00
ZappoMan	2fba5a0928	more work on simple renderable	2015-05-28 12:19:43 -07:00
ZappoMan	806ee88f1f	place burden of adding/removing to/from scene on entity	2015-05-28 09:43:36 -07:00
Eric Levin	1f312b4e02	successfully using geometry cache!	2015-05-26 16:17:31 -07:00
ZappoMan	9988f2d1cd	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
ZappoMan	8b78fc4190	EnitityItem smart pointers	2015-05-22 17:57:50 -07:00
Seth Alves	38caed00ca	Attempt to draw line entity item	2015-05-12 10:25:50 -07:00