232 commits

Author	SHA1	Message	Date
Philip Rosedale	56a0471e5f	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-22 15:45:21 -07:00
Philip Rosedale	5bee5f07e3	Don't render body if looking in mirror, don't render test sphere over and over again for everyone.	2013-05-22 15:45:15 -07:00
Philip Rosedale	803c41d636	Chat text floats above head, not torso.	2013-05-22 15:28:24 -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
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
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	b95560587a	pitch force 4x bigger in transmitter	2013-05-22 12:42:28 -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
Philip Rosedale	0d231b5550	Added lift to transmitter with finger, for true god-like flight!	2013-05-21 23:24:58 -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	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
Jeffrey Ventrella	c11851b75d	cleaned up formatting stuff	2013-05-21 15:02:44 -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
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
Philip Rosedale	3539ec858e	Added hand movement and body motion to transmitter. Feel much better - like dancing.	2013-05-20 23:22:28 -07:00
Philip Rosedale	7728a54d26	Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter	2013-05-20 19:00:49 -07:00
Jeffrey Ventrella	9d3e76efe2	operating on head. patient under anesthesia	2013-05-20 17:53:55 -07:00
Jeffrey Ventrella	6e994ed425	Merge remote-tracking branch 'upstream/master'	2013-05-20 17:33:27 -07:00
Jeffrey Ventrella	72f8f447a1	starting a rework of Head renderer	2013-05-20 17:30:13 -07:00
Stephen Birarda	564244ddd3	move _leanSideways and _leanForwards to HeadData	2013-05-20 17:13:40 -07:00
Stephen Birarda	570dfba934	code review comments, cleanup Avatar constructor	2013-05-20 16:12:38 -07:00
Stephen Birarda	de84b7803f	move _lookAtPosition to HeadData class	2013-05-20 15:51:40 -07:00
Stephen Birarda	257a1d1f2e	move head rotations to new HeadData class to be used for transmission	2013-05-20 15:21:02 -07:00
Jeffrey Ventrella	d144fb7f84	fix	2013-05-20 14:34:39 -07:00
Jeffrey Ventrella	1e9b04d28f	cleanup	2013-05-20 12:16:18 -07:00
Jeffrey Ventrella	677f0b5d2e	Merge remote-tracking branch 'upstream/master'	2013-05-20 12:13:21 -07:00
Jeffrey Ventrella	a192a21ef0	added _lookatPosition to avatar Data	2013-05-20 12:08:58 -07:00
Jeffrey Ventrella	d384e36af1	test	2013-05-20 11:59:19 -07:00
Jeffrey Ventrella	ffbc70814a	preparing to add transmitted lookat position data	2013-05-20 11:41:21 -07:00
Jeffrey Ventrella	7f0d2e572e	some preliminary work on avatarRenderer	2013-05-20 07:38:00 -07:00
Jeffrey Ventrella	5a4813d5c9	improved algorithm for rotating eyes to look at target	2013-05-18 14:31:27 -07:00
Philip Rosedale	5475b19a9e	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-18 12:33:31 -07:00
Stephen Birarda	3e65d5a548	inline getters and setters in Avatar	2013-05-17 12:25:00 -07:00
Stephen Birarda	1ba1b56b2c	disallow copying of Avatar objects	2013-05-17 12:15:19 -07:00
Stephen Birarda	a1ea7b58dd	remove unused GLUQuadric sphere from Avatar class	2013-05-17 10:45:26 -07:00
Stephen Birarda	0e7c0776f2	refactor the Head class to remove _sphere and use default copy constructor	2013-05-17 10:43:26 -07:00
Jeffrey Ventrella	0edf72a2be	trying to fix merge conflicts	2013-05-17 09:20:42 -07:00
Jeffrey Ventrella	7e0877e753	cleanup	2013-05-17 08:48:54 -07:00
Philip Rosedale	c43847946c	Tweaked mouse camera movement a bit	2013-05-16 20:31:17 -06:00