1568 commits

Author	SHA1	Message	Date
Andrzej Kapolka	d89939e0bd	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-22 15:17:13 -07:00
ZappoMan	f3855e54f9	Merge pull request #388 from birarda/master ... DRY up the resource copying	2013-05-22 15:04:45 -07:00
Andrzej Kapolka	7a8aa7c04f	Restore "floor."	2013-05-22 14:50:11 -07:00
Andrzej Kapolka	53ae8235f3	Fixed threading issue with Environment, more work on avatar righting.	2013-05-22 14:43:25 -07:00
Stephen Birarda	200d81e0eb	DRY up resource subdir copying for OS X bundle	2013-05-22 14:40:01 -07:00
Andrzej Kapolka	dd101b393d	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-22 14:33:31 -07:00
birarda	9ec04855f8	Merge pull request #386 from ZappoMan/voxel_animation ... Fix some crashing issues on delete	2013-05-22 14:27:29 -07:00
Philip Rosedale	f8c39a8617	Merge pull request #382 from ey6es/master ... Support for multiple environments, each with their own gravity (and currently, collision spheres).	2013-05-22 14:04:28 -07:00
Andrzej Kapolka	bcd8e746f2	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-22 13:32:34 -07:00
Andrzej Kapolka	365bb10d6b	More work on righting based on gravity vector.	2013-05-22 13:30:30 -07:00
ZappoMan	06f2528d6a	fix crashing on deleting voxels in server and client	2013-05-22 13:23:01 -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
Philip Rosedale	e411b41be7	oops moving stdint to header file	2013-05-22 13:02:07 -07:00
Philip Rosedale	a03d6f8d80	moved pair to own menu	2013-05-22 12:55:46 -07:00
Andrzej Kapolka	88bc6caf51	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-22 12:49:35 -07:00
Andrzej Kapolka	30958e3ce6	Working on reorientation.	2013-05-22 12:49:25 -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
Andrzej Kapolka	0e7c0e08eb	Since we're not using deltaTime (yet), don't pass it as a parameter (yet).	2013-05-22 11:29:46 -07:00
Andrzej Kapolka	ada32f1a8b	Added back "floor," "bounce."	2013-05-22 11:08:04 -07:00
Andrzej Kapolka	7e5418f8db	Fix for default environment, better capsule placement.	2013-05-22 10:53:58 -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	8d255f7685	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-21 22:38:23 -07:00
Andrzej Kapolka	c7e840e0d4	The end parameter to glDrawRangeElements is inclusive.	2013-05-21 22:36:27 -07:00
Andrzej Kapolka	8b1362636e	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-21 22:29:46 -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
Andrzej Kapolka	a864a6f8c6	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-21 21:34:09 -07:00
Andrzej Kapolka	fd98982fa6	Support for multiple environments, collisions with notional planet surfaces.	2013-05-21 21:33:08 -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