162 commits

Author	SHA1	Message	Date
Jeffrey Ventrella	f7a0e8018a	Merge remote-tracking branch 'upstream/master'	2013-05-29 16:15:16 -07:00
Jeffrey Ventrella	63434da23c	testing avatar touch	2013-05-29 16:14:55 -07:00
Stephen Birarda	b0a8de818d	make quit CMD-Q instead of just Q	2013-05-29 16:05:03 -07:00
Stephen Birarda	b6a0662c98	inline the shouldEchoAudio	2013-05-29 11:47:02 -07:00
Stephen Birarda	a5a30efec9	CR fixes	2013-05-29 11:42:10 -07:00
Stephen Birarda	5d74a865e8	make audio echo a menu option instead of forcing with mirror	2013-05-29 11:35:32 -07:00
Jeffrey Ventrella	e4c0aeb9a0	added AVATAR_FACING_THRESHOLD to avatarTouch	2013-05-28 18:15:29 -07:00
Jeffrey Ventrella	5d9b8c08b3	Merge remote-tracking branch 'upstream/master'	2013-05-28 17:57:42 -07:00
Jeffrey Ventrella	923c39cdc0	fixed third person shift bug	2013-05-28 17:57:11 -07:00
Stephen Birarda	e040c927f5	Merge remote-tracking branch 'upstream/master' into mouth-render	2013-05-28 15:58:11 -07:00
birarda	17e3902d17	Merge pull request #435 from Ventrella/master ... Integrated mohawk code, and did some cleanup and improvements on avatar	2013-05-28 15:50:48 -07:00
Stephen Birarda	9f2c0adec7	move audioLoudness to HeadData	2013-05-28 12:22:51 -07:00
Andrzej Kapolka	278ff00926	Fixed Linux build error and a warning on call to Avatar.simulate, moved grid ... size constant to world.h and made gravity bounds match.	2013-05-27 14:46:16 -07:00
Jeffrey Ventrella	883d21a5e4	added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code	2013-05-26 15:17:58 -07:00
Jeffrey Ventrella	8c24477a24	Merge remote-tracking branch 'upstream/master'	2013-05-24 18:01:47 -07:00
Freddy	6a4bcf32fa	Code review fixes	2013-05-24 17:58:31 -07:00
Freddy	30e951578e	procedural voxel create/delete noises	2013-05-24 17:27:56 -07:00
Jeffrey Ventrella	28f3af4ea5	Merge remote-tracking branch 'upstream/master'	2013-05-24 17:13:10 -07:00
Jeffrey Ventrella	6634ad2ed2	thingy	2013-05-24 16:31:17 -07:00
Philip Rosedale	608a4f71bf	ground surface is 20 meters across. play on!	2013-05-24 14:51:06 -07:00
Stephen Birarda	d12bc85376	go directly into oculus mode when the oculus is connected	2013-05-24 14:05:22 -07:00
Stephen Birarda	81307939d4	Merge remote-tracking branch 'upstream/master' into owner-pointers	2013-05-24 12:23:12 -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
Philip Rosedale	17c898c151	Long term averaging of the gyros for better stability	2013-05-24 11:33:00 -07:00
Jeffrey Ventrella	b74ceae61a	added avatar hair	2013-05-23 22:52:43 -07:00
Andrzej Kapolka	add84b2f39	Hide the cursor when in fullscreen Oculus mode.	2013-05-23 17:58:04 -07:00
Andrzej Kapolka	9be4f06e9a	Disable voxel textures by default.	2013-05-23 17:32:43 -07:00
Andrzej Kapolka	514c12c7fc	Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/Application.cpp	2013-05-23 15:39:04 -07:00
Andrzej Kapolka	9b433c974c	Fix for starfield rendering on Oculus: put inter-pupil translation in ... modelview matrix where it belongs, don't reset perspective projection for starfield.	2013-05-23 15:35:41 -07:00
Philip Rosedale	37cb914891	You can reset start location with 'G'	2013-05-23 15:02:32 -07:00
Philip Rosedale	235cfc8ab2	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-23 12:33:39 -07:00
Philip Rosedale	32d2418b7a	Added display head mouse option (default off) and all camera modes follow head gyros the same way.	2013-05-23 12:33:26 -07:00
ZappoMan	089d8d525e	Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation	2013-05-23 12:20:34 -07:00
ZappoMan	6e5ed6435b	added shortcut key to log menu	2013-05-23 12:06:59 -07:00
Philip Rosedale	c56509e5a2	Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset	2013-05-23 09:30:36 -07:00
Stephen Birarda	120c835004	fix head mouse	2013-05-22 19:46:33 -07:00
Philip Rosedale	5b3ac504c4	Updated merge conflicts	2013-05-22 19:43:11 -07:00
Philip Rosedale	22b534cd8e	Fixed headmouse	2013-05-22 19:39:37 -07:00
Stephen Birarda	3e192cda9b	correct rendering for first-person for oculus	2013-05-22 19:15:52 -07:00
Stephen Birarda	997a10c981	correct the sign of yaw for oculus	2013-05-22 18:56:38 -07:00
Jeffrey Ventrella	2f943b697a	cleanup	2013-05-22 17:27:48 -07:00
Jeffrey Ventrella	549d3a3671	Merge remote-tracking branch 'upstream/master'	2013-05-22 17:25:06 -07:00
Jeffrey Ventrella	8b49cfbf93	added back transitions to first person	2013-05-22 17:24:46 -07:00
Stephen Birarda	a1b556d6a2	space out if	2013-05-22 16:49:26 -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	0b014c5635	cleaned up some stuff	2013-05-22 15:50:36 -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
Philip Rosedale	6b854531aa	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-22 14:31:46 -07:00