2990 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeffrey Ventrella	83e2bf2534	added menu option for setting display of lookat vectors	2013-05-22 14:42:03 -07:00
Jeffrey Ventrella	d786fd155f	clean up	2013-05-22 13:52:29 -07:00
Jeffrey Ventrella	86a2d2316f	added method to set look at vector on/off	2013-05-22 13:44:38 -07:00
Jeffrey Ventrella	c6c0f6d727	Merge remote-tracking branch 'upstream/master'	2013-05-22 13:24:40 -07:00
Jeffrey Ventrella	4d95d0a426	more cleanup on lookat	2013-05-22 13:24:19 -07:00
ZappoMan	cbd3497c5c	Merge pull request #385 from birarda/master ... non-DRY fix for resources copy on OS X	2013-05-22 13:18:34 -07:00
Stephen Birarda	62cf452e3d	non-DRY fix for correct copy of resources for OS X bundle	2013-05-22 13:16:55 -07:00
Jeffrey Ventrella	9de6060d0f	Merge remote-tracking branch 'upstream/master'	2013-05-22 13:14:09 -07:00
Jeffrey Ventrella	3c3a3fc82e	cleaning up look at code - Stephen helped find a transmission bug - fixed.	2013-05-22 13:12:11 -07:00
Philip Rosedale	fd9f600421	Merge pull request #384 from PhilipRosedale/master ... moved include stdint to header file	2013-05-22 13:11:55 -07:00
Philip Rosedale	e411b41be7	oops moving stdint to header file	2013-05-22 13:02:07 -07:00
Philip Rosedale	a55def02f3	Merge pull request #383 from PhilipRosedale/master ... Fix linux build, pair to own menu	2013-05-22 12:57:21 -07:00
Philip Rosedale	a03d6f8d80	moved pair to own menu	2013-05-22 12:55:46 -07:00
Philip Rosedale	bcf13b9754	hopefully fix linux broken build by including stdint in transmitter	2013-05-22 12:48:36 -07:00
Philip Rosedale	b95560587a	pitch force 4x bigger in transmitter	2013-05-22 12:42:28 -07:00
Stephen Birarda	b0ff1029f6	Merge branch 'master' of github.com:worklist/hifi	2013-05-22 12:40:48 -07:00
Stephen Birarda	0fdbfe8ea8	move gen_stars to the tools folder	2013-05-22 12:39:27 -07:00
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
Jeffrey Ventrella	f7b101b4aa	Merge remote-tracking branch 'upstream/master'	2013-05-22 11:43:12 -07:00
Jeffrey Ventrella	493aff3133	more prototyping of head feature geometry	2013-05-22 11:42:35 -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	a8c4e928b8	Merge pull request #380 from ZappoMan/master ... build buster fix?	2013-05-21 23:11:43 -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
ZappoMan	9d92b8041c	Merge pull request #378 from ZappoMan/master ... Fix compiler warning	2013-05-21 18:04:29 -07:00
ZappoMan	09711d86ed	fix compiler warning	2013-05-21 18:03:14 -07:00
Jeffrey Ventrella	9f82b9fb43	test	2013-05-21 17:51:41 -07:00
Jeffrey Ventrella	e219cd8223	Merge remote-tracking branch 'upstream/master'	2013-05-21 17:44:45 -07:00
Jeffrey Ventrella	006fc3268e	thingy	2013-05-21 17:44:24 -07:00
birarda	63fcb2eeef	Merge pull request #367 from ZappoMan/voxel_animation ... Fixes "Delete" voxel behavior	2013-05-21 17:43:36 -07:00
ZappoMan	c316899f27	CR feedback	2013-05-21 17:42:55 -07:00
Jeffrey Ventrella	6e5f036eeb	test	2013-05-21 17:41:50 -07:00
Jeffrey Ventrella	25dfc7bc4b	Merge remote-tracking branch 'upstream/master'	2013-05-21 17:38:36 -07:00
Jeffrey Ventrella	c32d621d5f	improving lookat behavior	2013-05-21 17:38:17 -07:00
ZappoMan	166ad4f73d	CR feedback	2013-05-21 17:37:21 -07:00
ZappoMan	273223cc5b	Merge pull request #377 from birarda/master ... remove the old menu code and the glew implementation file	2013-05-21 17:13:31 -07:00
Stephen Birarda	3ac20849d6	remove old menu code and glew implemenation file	2013-05-21 16:21:33 -07:00
Jeffrey Ventrella	7bb94ae8de	Merge remote-tracking branch 'upstream/master'	2013-05-21 16:14:01 -07:00
Jeffrey Ventrella	0b7e0ef43d	test	2013-05-21 16:13:41 -07:00
birarda	d12d20e193	Merge pull request #376 from birarda/master ... stop the animation server from being killed over and over	2013-05-21 15:54:30 -07:00
Stephen Birarda	944e7a32e9	trivial fix for the continously dying animation server	2013-05-21 15:53:58 -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