22 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	5b00783f18	more warnings fixes	2015-09-22 20:54:36 -07:00
Bradley Austin Davis	b3aeaba5f4	CR feedback	2015-09-21 15:44:47 -07:00
Bradley Austin Davis	e024d23366	Instancing work, second pass	2015-09-21 13:27:02 -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
ZappoMan	47888b4671	fix transforms for items with non-default registration point	2015-06-11 09:34:56 -07:00
ZappoMan	93c0bd63e9	fix debug rendering transforms	2015-06-10 18:54:07 -07:00
Andrew Meadows	6497ac6c82	renderBoundingBox() for sim-ownership debug	2015-06-10 14:24:00 -07:00
Andrew Meadows	4df87ec4e8	fix rendering of simulation ownership debug info	2015-06-09 17:23:37 -07:00
ZappoMan	f8a2fff5a7	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 11:06:10 -07:00
Andrew Meadows	b0ca2df3aa	move API from PhysicsEngine to ObjectMotionState	2015-06-03 14:56:04 -07:00
Atlante45	c847de0a2e	Missing batch args	2015-05-18 16:37:00 +02:00
Atlante45	802e963bba	Debug entity render in batch ... Also removed unnecessary glPush/Pop	2015-05-17 12:42:14 +02:00
Atlante45	c13ad83cc4	Rename getCenter by get CenterPosition	2015-05-15 18:34:28 +02:00
Seth Alves	867fe18472	put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked	2015-05-07 10:11:36 -07:00
Seth Alves	5ac8558168	flash yellow box when transmitting an edit packet	2015-05-06 17:03:27 -07:00
Seth Alves	c35edd8eb4	some debugging on Andrew's refactor	2015-05-05 16:40:10 -07:00
Seth Alves	82828f0b93	print when bullet and local octree don't agree on position of an entity	2015-05-05 13:52:10 -07:00
Seth Alves	1cd93b9ec8	pull andrew's branch, add back in visual indicator of an entity being active in bullet	2015-05-05 13:14:22 -07:00
Seth Alves	bd1f77b8f3	cleanups	2015-05-01 11:35:14 -07:00
Seth Alves	ea1ec0186e	stop doing useless multiple inheritance	2015-05-01 11:31:58 -07:00
Seth Alves	b443ce5d3e	oops	2015-05-01 11:20:34 -07:00
Seth Alves	3765ace7ef	move common debugging rendering into a new class	2015-05-01 11:17:46 -07:00