616 commits

Author	SHA1	Message	Date
tosh	349e89aaa6	integrates logging for interface	2013-04-17 19:04:10 +02:00
tosh	e7810179de	reduces default character size	2013-04-17 19:03:39 +02:00
tosh	81cae86559	brings logging component to stable state	2013-04-17 18:35:10 +02:00
tosh	4fa5760162	Merge branch 'master' of git://github.com/worklist/hifi into 19262 ... Conflicts: interface/src/Util.cpp	2013-04-17 18:34:43 +02:00
ZappoMan	184d28e905	Adding testOrientationClass() to run unit tests on the orientation class.	2013-04-17 00:42:49 -07:00
Jeffrey Ventrella	a6f82e1236	moved renderOrientstionDiretions to Utils	2013-04-16 23:39:43 -07:00
Jeffrey Ventrella	bd7c4273c3	tested camera orthonormals	2013-04-16 22:47:04 -07:00
Jeffrey Ventrella	f8d7b84a67	Merge remote-tracking branch 'origin'	2013-04-16 20:36:03 -07:00
Jeffrey Ventrella	1fb8d0b268	consolidated some code in Head.cpp	2013-04-16 20:35:50 -07:00
ZappoMan	7a239fc7f0	Small tweaks to initial values for offset camera, so people can make sense of it	2013-04-16 20:25:08 -07:00
tosh	9ea3c58087	removes leftover #include	2013-04-17 05:06:28 +02:00
Jeffrey Ventrella	1db06a8399	Merge branch 'master' of https://github.com/worklist/hifi	2013-04-16 18:27:26 -07:00
Jeffrey Ventrella	f766843b7a	adjusted the ordering of porcessed in camera update method	2013-04-16 18:27:19 -07:00
Stephen Birarda	d0a83f3c0e	correct the number of bytes per agent from avatar mixer	2013-04-16 18:09:27 -07:00
Jeffrey Ventrella	dcd6aafb77	trying to get around git confusion	2013-04-16 15:54:20 -07:00
Jeffrey Ventrella	fc5d412e53	fixed idealYaw issue	2013-04-16 15:51:22 -07:00
tosh	3be23b3faa	integrates logging	2013-04-17 00:48:27 +02:00
ZappoMan	4f5ddb3700	fixed yaw/ideal yaw problem correctly	2013-04-16 15:46:20 -07:00
ZappoMan	edfb1501f1	fixed merge problem with shifted avatar	2013-04-16 15:41:38 -07:00
tosh	ba4f6bc92c	Merge branch 'master' of git://github.com/worklist/hifi into 19262	2013-04-17 00:40:37 +02:00
tosh	e811410f77	works around GLUT bugs related to monospace glyphs	2013-04-17 00:39:35 +02:00
tosh	dc4dc887ac	silences warning about deprecated conversion of string literal to char*	2013-04-17 00:38:39 +02:00
tosh	cf3e2635c1	brings Log class into stable state	2013-04-17 00:38:21 +02:00
tosh	58b40f7ed2	adds Log class	2013-04-17 00:37:21 +02:00
Jeffrey Ventrella	fcbf44cad9	trying to get around git confusion	2013-04-16 15:11:23 -07:00
Jeffrey Ventrella	0c85f832e6	trying to get around git confusion	2013-04-16 14:56:49 -07:00
birarda	7ef80b37be	Merge pull request #55 from ZappoMan/view_frustum_work ... Latest view frustum work	2013-04-16 14:53:48 -07:00
Stephen Birarda	2f5d5398b2	comment cleanup in Camera.cpp	2013-04-16 14:39:23 -07:00
ZappoMan	0ff88b882b	tweaks to default Camera near clip, and camera positions in interface	2013-04-16 14:06:48 -07:00
Jeffrey Ventrella	1bef9544d9	Merge remote-tracking branch 'origin/master'	2013-04-16 13:56:45 -07:00
Jeffrey Ventrella	216cc465e7	Added idealYaw to camera and also switched ordering of gl camera rotation commands	2013-04-16 13:51:14 -07:00
Stephen Birarda	f8ab33ccc7	add missing packet header for broadcast head data	2013-04-16 12:48:47 -07:00
Stephen Birarda	8129c2477a	fix broken voxel server build, change some char* to unsigned char*	2013-04-16 12:35:49 -07:00
Stephen Birarda	53108b01ef	resolve conflicts on merge with upstream master	2013-04-16 12:02:33 -07:00
Stephen Birarda	1dd21a450e	Merge remote-tracking branch 'upstream/master'	2013-04-16 12:00:55 -07:00
Stephen Birarda	e71f21b7bf	fix broken builds from last commit, pull new avatar data in VoxelAgentData	2013-04-16 11:59:03 -07:00
Stephen Birarda	5c091a51a6	change signature of parseData to use unsigned char*, include packet header always	2013-04-16 11:51:36 -07:00
stojce	6b59374921	Merge pull request #48 from stojce/19261 ... Code Review for Job #19261	2013-04-16 08:40:01 -07:00
stojce	75c63f53fc	use safe version of sprintf	2013-04-16 17:38:34 +02:00
ZappoMan	a3fabaf300	Merge pull request #50 from tschw/19188 ... 19188	2013-04-16 08:25:07 -07:00
ZappoMan	1408be00f5	Merge pull request #47 from PhilipRosedale/master ... Cleanup and partial re-enabling of head gyros	2013-04-16 08:21:27 -07:00
Philip Rosedale	1cdeac0fec	Merge pull request #49 from ZappoMan/view_frustum_work ... Latest view frustum work	2013-04-16 07:24:36 -07:00
tosh	7c2cff824f	renames AngleUtils -> AngleUtil for consistency with the rest of the files	2013-04-16 14:07:19 +02:00
tosh	ac55c610be	tidies changeset	2013-04-16 14:06:03 +02:00
ZappoMan	246380b41e	temp fix to setPitch() problem. Removed some debug printfs. Fixed menu flicker bug.	2013-04-16 00:55:44 -07:00
Philip Rosedale	5e5a7e0a0c	Improved SerialInterface: Added gravity vector get function, closer to coding standards, better rendering of levels.	2013-04-15 20:52:18 -07:00
Philip Rosedale	b3e99513cb	Merge branch 'master' of https://github.com/worklist/hifi	2013-04-15 18:37:59 -07:00
Philip Rosedale	cd3e414eda	Removed unneeded variables in main.cpp for pitch,yaw. Renamed routines to make it more clear where gyros are being read. Re-enabled marker box being driven by head gyros.	2013-04-15 18:37:46 -07:00
Stephen Birarda	288a259ac1	more conflict resolutions for broken build after pull	2013-04-15 18:37:25 -07:00
Stephen Birarda	2b49442039	resolve conflicts on merge with upstream master	2013-04-15 18:34:40 -07:00