1540 commits

Author	SHA1	Message	Date
Philip Rosedale	4ad2f9a943	Merge pull request #381 from Geenz/19319 ... Code Review for Job #19319	2013-05-22 12:32:47 -07:00
ZappoMan	6733d83f2d	Merge pull request #379 from PhilipRosedale/master ... Sensor fusion to better stabilize transmitter roll, pitch	2013-05-22 12:00:08 -07:00
Philip Rosedale	53dc81e309	Fixes per code review.	2013-05-22 11:57:11 -07:00
Geenz	fb553fce80	Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time).	2013-05-22 10:53:35 -04:00
Philip Rosedale	0d231b5550	Added lift to transmitter with finger, for true god-like flight!	2013-05-21 23:24:58 -07:00
ZappoMan	a311e40f25	hopefully fix unix build buster	2013-05-21 23:10:57 -07:00
Philip Rosedale	2edd085941	Added sensor fusion with gravity to transmitter to stabilize drift offset in pitch and roll.	2013-05-21 22:40:13 -07:00
Andrzej Kapolka	c7e840e0d4	The end parameter to glDrawRangeElements is inclusive.	2013-05-21 22:36:27 -07:00
Philip Rosedale	8b65fcae75	Merge pull request #352 from tschw/master ... refactors logging, adds comments, and revises names & formatting in all submitted code	2013-05-21 22:10:10 -07:00
Philip Rosedale	47d9035def	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-21 20:34:55 -07:00
birarda	63fcb2eeef	Merge pull request #367 from ZappoMan/voxel_animation ... Fixes "Delete" voxel behavior	2013-05-21 17:43:36 -07:00
Stephen Birarda	3ac20849d6	remove old menu code and glew implemenation file	2013-05-21 16:21:33 -07:00
Philip Rosedale	8e73abe6e6	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-21 15:47:47 -07:00
Philip Rosedale	f7e75ee57c	Fixed conflict	2013-05-21 15:47:15 -07:00
birarda	31a11e8221	Merge pull request #374 from birarda/master ... include QtGui dir with isystem flag to get rid of compiler warning in Xcode	2013-05-21 15:46:44 -07:00
Philip Rosedale	6ff4b88ea4	starting tweaks to head gyro motion	2013-05-21 15:46:11 -07:00
Jeffrey Ventrella	b881507f51	fixed mouth and added a test for transmitting look at	2013-05-21 15:43:40 -07:00
Stephen Birarda	910683c047	remove an extra space	2013-05-21 15:43:29 -07:00
Stephen Birarda	d2c2150b8f	include QtGui dir with isystem flag to remove warning	2013-05-21 15:39:57 -07:00
Jeffrey Ventrella	16a1dd103d	Merge remote-tracking branch 'upstream/master'	2013-05-21 15:27:37 -07:00
Jeffrey Ventrella	2781a354a8	reversed gyro for head (didn't know the headset was on backwards :)	2013-05-21 15:27:03 -07:00
ZappoMan	4f0aca4b0c	Merge pull request #372 from birarda/master ... refactor FindGLM to not check twice, revert the previous audio change	2013-05-21 15:12:43 -07:00
Jeffrey Ventrella	e09e01b81e	Merge remote-tracking branch 'upstream/master'	2013-05-21 15:09:23 -07:00
Jeffrey Ventrella	6840ce0bbe	thingy	2013-05-21 15:09:05 -07:00
Philip Rosedale	dc8dea727a	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-21 15:04:24 -07:00
Philip Rosedale	330c59b36b	Fixed conflicts	2013-05-21 15:04:12 -07:00
Jeffrey Ventrella	1f82d339d0	Merge remote-tracking branch 'upstream/master'	2013-05-21 15:03:06 -07:00
Jeffrey Ventrella	c11851b75d	cleaned up formatting stuff	2013-05-21 15:02:44 -07:00
Stephen Birarda	95cef67e33	Revert "remove unused variable in Audio" ... This reverts commit bbdd601855.	2013-05-21 15:01:08 -07:00
Philip Rosedale	f47b5a196a	Added missing transmitter files	2013-05-21 15:00:22 -07:00
birarda	ca9738a101	Merge pull request #370 from birarda/master ... remove unused varible in Audio	2013-05-21 14:52:45 -07:00
Stephen Birarda	bbdd601855	remove unused variable in Audio	2013-05-21 14:52:05 -07:00
Jeffrey Ventrella	ef95b13723	Merge remote-tracking branch 'upstream/master'	2013-05-21 14:21:14 -07:00
Jeffrey Ventrella	d21b48ad6e	cleaned up a lot of pitch/yaw/roll confusion in Head and made new versions of eyes, eyebrows and mouth (Head still needs work)	2013-05-21 14:20:44 -07:00
tosh	0ab2d4c741	Merge branch 'master' of git://github.com/worklist/hifi	2013-05-21 23:13:21 +02:00
ZappoMan	fdba349d9b	temporary hack fix to busted build	2013-05-21 13:57:54 -07:00
tosh	ba4f4b9809	Merge branch 'master' of git://github.com/worklist/hifi	2013-05-21 22:49:39 +02:00
ZappoMan	0bcd629c8a	Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation	2013-05-21 13:46:04 -07:00
ZappoMan	6f0035b297	Merge pull request #365 from PhilipRosedale/master ... Made Transmitter it's own class, removed V1 Transmitter code (Glass and Android)	2013-05-21 13:45:15 -07:00
Andrzej Kapolka	1118c06f5d	Only do collision checking for own avatar.	2013-05-21 13:01:01 -07:00
Andrzej Kapolka	597769a861	Added basic capsule/sphere collisions between avatar and voxels.	2013-05-21 12:58:02 -07:00
ZappoMan	9f23f846a9	Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation	2013-05-21 12:47:46 -07:00
Philip Rosedale	71a875042a	Updated transmitter class to handle correct orientation of gyros	2013-05-21 11:57:14 -07:00
ZappoMan	7c9be4b9f5	cleanup code	2013-05-21 11:42:13 -07:00
ZappoMan	a7f0a66aee	code cleanup	2013-05-21 11:31:47 -07:00
ZappoMan	0dde5b6411	remove dead code, comment cleanup	2013-05-21 11:28:12 -07:00
ZappoMan	4f9c7fed59	removed UI for want exists bits, defaults to true	2013-05-21 11:25:50 -07:00
ZappoMan	ef2d27aba6	getting closer to working delete	2013-05-21 10:43:31 -07:00
Philip Rosedale	340882a330	Changed 1P view to turn off head rendering when close/inside head rather than showing disembodied neck	2013-05-21 10:22:05 -07:00
Andrzej Kapolka	b15162abfd	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-21 09:49:12 -07:00