34965 commits

Author	SHA1	Message	Date
Stephen Birarda	f6adac1399	change a couple more long ints	2013-04-12 15:35:06 -07:00
Stephen Birarda	d30512e273	remove another long int	2013-04-12 15:25:41 -07:00
Stephen Birarda	83ee450759	change long int to long in CounterStats	2013-04-12 15:18:04 -07:00
Stephen Birarda	9b73d2559d	Revert "add dependency to shared library from voxel library" ... This reverts commit e9d71c9406.	2013-04-12 15:15:19 -07:00
Stephen Birarda	e9d71c9406	add dependency to shared library from voxel library	2013-04-12 15:06:51 -07:00
ZappoMan	77996fb140	Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work	2013-04-12 15:06:41 -07:00
Stephen Birarda	13cde69da2	include the shared headers to the voxel library	2013-04-12 15:03:02 -07:00
ZappoMan	d568cce0cd	changed interface to use ViewFrustum class for rendering view frustum ... - updated ViewFrustum class to work correctly - added new keyboard interface to adjust offset camera position and up - removed keyboard interface for local add sphere, since we don't need that anymore	2013-04-12 15:01:48 -07:00
Stephen Birarda	c3b457febb	moved MarkerNode from shared to voxel library	2013-04-12 14:51:12 -07:00
ZappoMan	862ee47fbb	moving voxellib to libraries/voxels	2013-04-12 13:40:33 -07:00
ZappoMan	cf6b8fe72f	Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work	2013-04-12 13:37:34 -07:00
Stephen Birarda	b0ff960e37	use MACRO_DIR variable to find glm in root externals dir	2013-04-12 13:20:46 -07:00
Stephen Birarda	c2cb7cf397	rename MACRO_DIRECTORY variable to MACRO_DIR in voxels lib	2013-04-12 13:13:58 -07:00
Stephen Birarda	31f3f0c31c	add a MACRO_DIRECTORY variable to voxels CMakeLists	2013-04-12 13:09:22 -07:00
Stephen Birarda	67efc12e59	move shared to libraries, DRY library macro, rename libs	2013-04-12 12:38:34 -07:00