121 commits

Author	SHA1	Message	Date
Jeffrey Ventrella	26bbb9917b	more work on avatar touch	2013-06-03 16:23:55 -07:00
Jeffrey Ventrella	00dce6b59e	fix	2013-06-03 12:01:01 -07:00
Jeffrey Ventrella	8d031b5c2d	preparation for extending the avatar ball array to accommodate more touch capabilities	2013-06-03 11:53:00 -07:00
Jeffrey Ventrella	de49d7fc6c	more fixes	2013-05-31 17:32:30 -07:00
Jeffrey Ventrella	d92471860d	cleanup	2013-05-31 16:58:58 -07:00
Jeffrey Ventrella	4f49f1769e	separated springy balls from skeleton	2013-05-31 16:54:56 -07:00
Jeffrey Ventrella	fdfc639c23	merge	2013-05-31 13:52:22 -07:00
Jeffrey Ventrella	108ce62d1a	committing latest skeleton-separation changes (more to come as Andrzej and I work on it more)	2013-05-31 11:51:03 -07:00
Andrzej Kapolka	e2ec8245b0	Rather than adding Euler angles, compose quaternions for gyros.	2013-05-30 14:56:12 -07:00
Andrzej Kapolka	bcd3833898	Align chat with full camera rotation (not just yaw).	2013-05-30 13:46:53 -07:00
Andrzej Kapolka	fff9d1c372	Formatting.	2013-05-30 10:23:19 -07:00
Andrzej Kapolka	021dce72be	Moved direction vectors to AvatarData, made them align with OpenGL view space ... (to avoid the 180 degree rotations).	2013-05-30 09:55:34 -07:00
Andrzej Kapolka	d6855b6430	Massive changes to orientations: use quaternions rather than Orientation ... class.	2013-05-29 19:05:33 -07:00
Jeffrey Ventrella	75b57d17a7	fixed some things based on recent code review	2013-05-27 18:54:44 -07:00
Jeffrey Ventrella	096e465d36	cleaned up some formatting and in-line functions in Avatar.cpp	2013-05-27 10:31:31 -07:00
Jeffrey Ventrella	6634ad2ed2	thingy	2013-05-24 16:31:17 -07:00
Stephen Birarda	59a6016f4b	use a NULL default for owningAvatar to simplify constructors	2013-05-24 12:18:38 -07:00
Stephen Birarda	36892da488	keep a pointer to owning agent in AgentData	2013-05-24 12:17:34 -07:00
Jeffrey Ventrella	b74ceae61a	added avatar hair	2013-05-23 22:52:43 -07:00
Stephen Birarda	b673715aa2	remove the no longer in use AvatarRenderer	2013-05-23 15:18:32 -07:00
Philip Rosedale	37cb914891	You can reset start location with 'G'	2013-05-23 15:02:32 -07:00
Jeffrey Ventrella	77324ebb46	made avatars appear to float above the ground	2013-05-23 10:14:46 -07:00
Stephen Birarda	4738fc888b	return Avatar Head by reference so setters actually do something	2013-05-22 16:43:41 -07:00
Jeffrey Ventrella	4940a6ae9a	Merge remote-tracking branch 'upstream/master'	2013-05-22 15:51:03 -07:00
Jeffrey Ventrella	0b014c5635	cleaned up some stuff	2013-05-22 15:50:36 -07:00
Andrzej Kapolka	53ae8235f3	Fixed threading issue with Environment, more work on avatar righting.	2013-05-22 14:43:25 -07:00
Jeffrey Ventrella	7cae808d29	Merge remote-tracking branch 'upstream/master'	2013-05-22 14:42:25 -07:00
Jeffrey Ventrella	83e2bf2534	added menu option for setting display of lookat vectors	2013-05-22 14:42:03 -07:00
Jeffrey Ventrella	4d95d0a426	more cleanup on lookat	2013-05-22 13:24:19 -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	fd98982fa6	Support for multiple environments, collisions with notional planet surfaces.	2013-05-21 21:33:08 -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	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
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	7f0d2e572e	some preliminary work on avatarRenderer	2013-05-20 07:38:00 -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	c214e9b179	use the default Avatar destructor, comment out unused consts in Head	2013-05-17 10:46:59 -07:00
Stephen Birarda	a1ea7b58dd	remove unused GLUQuadric sphere from Avatar class	2013-05-17 10:45:26 -07:00
Jeffrey Ventrella	7e0877e753	cleanup	2013-05-17 08:48:54 -07:00
Jeffrey Ventrella	1c126e2525	resolved conflicts	2013-05-16 17:32:54 -07:00
Jeffrey Ventrella	750a48bb73	cleaned up head class - made most members private. Added copy constructor	2013-05-16 17:20:00 -07:00
Philip Rosedale	b2709652b4	Tweaks to improve mouse Yaw behavior.	2013-05-16 14:43:46 -06:00
Philip Rosedale	78bd5ab40f	Fixes per review	2013-05-16 13:34:48 -06:00