3189 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
birarda	0558bba32f	Merge pull request #431 from Ventrella/master ... improved movable hair tufts code - and fixed mouth	2013-05-24 18:04:13 -07:00
Jeffrey Ventrella	8c24477a24	Merge remote-tracking branch 'upstream/master'	2013-05-24 18:01:47 -07:00
Jeffrey Ventrella	0c2c90b84d	cleanup	2013-05-24 18:01:25 -07:00
birarda	744278b502	Merge pull request #432 from FreddyHeibs/master ... Voxel create/delete noises	2013-05-24 17:59:33 -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	56438435c1	made mouth conform to the head sphere	2013-05-24 17:12:14 -07:00
birarda	82f5e0a3b1	Merge pull request #426 from PhilipRosedale/master ... big ground plane	2013-05-24 16:37:53 -07:00
birarda	b883f4073d	Merge pull request #430 from birarda/master ... tune the distance attenuation to be a little less dramatic	2013-05-24 16:33:19 -07:00
Stephen Birarda	12d0ccb712	tune the distance attenuation to use log of base 2.5	2013-05-24 16:32:52 -07:00
Jeffrey Ventrella	6634ad2ed2	thingy	2013-05-24 16:31:17 -07:00
birarda	e7f2bfc7ff	Merge pull request #429 from birarda/master ... require that crotch grabbing be intentional	2013-05-24 16:19:04 -07:00
Stephen Birarda	a8b08647d0	require that crotch grabbing be explicit, not implicit	2013-05-24 16:18:36 -07:00
Philip Rosedale	608a4f71bf	ground surface is 20 meters across. play on!	2013-05-24 14:51:06 -07:00
Philip Rosedale	995fbcf4f9	mohawk also follows body pitch when accelerating	2013-05-24 14:46:26 -07:00
Philip Rosedale	aae6d0cf3c	Merge pull request #425 from ey6es/master ... Made planet atmospheres twice as thick, have the big planet's be red.	2013-05-24 14:33:53 -07:00
birarda	b866bfd879	Merge pull request #424 from PhilipRosedale/master ... Mohawk same for everyone, rotates with head	2013-05-24 14:33:14 -07:00
Philip Rosedale	d796956a96	fix per review	2013-05-24 14:32:56 -07:00
Philip Rosedale	9baf087c9a	Avatar renders right arm in 1P mode	2013-05-24 14:29:26 -07:00
Andrzej Kapolka	93f9d0a5a5	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-24 14:26:54 -07:00
Andrzej Kapolka	5ca01842be	Made the atmospheres twice as thick, made the large planet one's red.	2013-05-24 14:24:47 -07:00
Philip Rosedale	31e41260c1	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-24 14:17:44 -07:00
Philip Rosedale	f5c0f84d27	Mohawk is different/stable for each person, and rotates correctly with head	2013-05-24 14:15:53 -07:00
Andrzej Kapolka	5ba5fd984f	Merge pull request #423 from birarda/oculus ... go directly into oculus mode when oculus is connected	2013-05-24 14:08:40 -07:00
Stephen Birarda	d12bc85376	go directly into oculus mode when the oculus is connected	2013-05-24 14:05:22 -07:00
Andrzej Kapolka	d32511ee47	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-24 13:59:08 -07:00
Philip Rosedale	ccff880493	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-24 12:33:16 -07:00
Philip Rosedale	cb7381fcd1	incremental fix rotation	2013-05-24 12:33:05 -07:00
birarda	007e9fe447	Merge pull request #422 from birarda/owner-pointers ... provide a getter for the owning agent	2013-05-24 12:32:38 -07:00
Stephen Birarda	6158410658	provide a getter for the owning agent in AgentData	2013-05-24 12:32:00 -07:00
Philip Rosedale	360c9c8ab1	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-24 12:30:12 -07:00
Philip Rosedale	dc9b2e33b5	Fixing mohawk orientation	2013-05-24 12:30:05 -07:00
ZappoMan	f0ce749877	Merge pull request #421 from birarda/owner-pointers ... add pointers back to owning avatar and owning agent	2013-05-24 12:28:10 -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	eb25fd3b46	pass the owning agent for VoxelAgentData constructor	2013-05-24 12:18:19 -07:00
ZappoMan	0a1a86ca94	Merge pull request #418 from PhilipRosedale/master ... More stable gyro averaging	2013-05-24 12:18:02 -07:00
Stephen Birarda	49b483ef53	maintain a pointer to owning avatar from HeadData	2013-05-24 12:17:48 -07:00
Stephen Birarda	36892da488	keep a pointer to owning agent in AgentData	2013-05-24 12:17:34 -07:00
birarda	a3f30970d6	Merge pull request #420 from ZappoMan/voxel_animation ... Fix to missing voxels	2013-05-24 12:16:42 -07:00
ZappoMan	8560e42357	fix issue with duplicate VBO slots	2013-05-24 12:08:25 -07:00
Philip Rosedale	8b5901d904	simplified per stephens code review	2013-05-24 12:04:17 -07:00
Jeffrey Ventrella	51ddf40ffe	cleaned up hair code	2013-05-24 11:54:55 -07:00
Philip Rosedale	17c898c151	Long term averaging of the gyros for better stability	2013-05-24 11:33:00 -07:00
ZappoMan	1c427c9a02	Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation	2013-05-24 11:18:26 -07:00
ZappoMan	b1232d0a87	coding standard cleanup	2013-05-24 11:18:14 -07:00
Philip Rosedale	59ac5ebd66	Head will always render when body does - no decapitation	2013-05-24 11:07:19 -07:00
Philip Rosedale	f961a40d1c	Chat message height doubled to clear mohawk	2013-05-24 10:55:26 -07:00
birarda	fc30aa4470	Merge pull request #416 from ZappoMan/voxel_animation ... lower send rate	2013-05-24 10:49:58 -07:00