1650 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrzej Kapolka	10a9f31d65	Merge branch 'master' of https://github.com/worklist/hifi	2013-04-25 09:41:13 -07:00
Andrzej Kapolka	1a79bbd80d	Fleshing out the chat entry widget.	2013-04-24 18:30:46 -07:00
birarda	50fe1db3c6	Merge pull request #142 from Ventrella/master ... fixed avatar collisions	2013-04-24 17:55:23 -07:00
Jeffrey Ventrella	80576120ee	Merge remote-tracking branch 'upstream/master'	2013-04-24 17:54:31 -07:00
Jeffrey Ventrella	72e6e18992	fixed avatar collisions	2013-04-24 17:54:09 -07:00
Andrzej Kapolka	9d4fded901	Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/main.cpp	2013-04-24 17:11:37 -07:00
Andrzej Kapolka	f538e2bdbc	Added key state to avatar data, started on chat entry field.	2013-04-24 17:06:55 -07:00
birarda	d4e64462dd	Merge pull request #141 from PhilipRosedale/master ... Wider log, log screen in menu	2013-04-24 17:05:12 -07:00
birarda	080b8b7337	Merge pull request #140 from Ventrella/master ... renamed "Head" to "Avatar" and cleaned up some comments to comply with coding standards	2013-04-24 17:04:16 -07:00
Jeffrey Ventrella	2163976f06	adding the files	2013-04-24 17:01:59 -07:00
Philip Rosedale	0e4da5198d	Merge remote-tracking branch 'upstream/master'	2013-04-24 16:59:18 -07:00
Jeffrey Ventrella	ff1334d8b6	Merge remote-tracking branch 'upstream/master'	2013-04-24 16:58:54 -07:00
Philip Rosedale	bc65126004	Wider log window, log panel on by default, menu->tools->log to control.	2013-04-24 16:58:52 -07:00
Jeffrey Ventrella	e54fd0dd7d	renamed "Head" to "Avatar" and did a bunch a cleanups, including removing the three-lined comments	2013-04-24 16:54:07 -07:00
Philip Rosedale	6c986a1049	Merge pull request #127 from tschw/19188 ... 19188	2013-04-24 16:53:04 -07:00
birarda	b8054790b0	Merge pull request #138 from Ventrella/master ... major changes to hand holding logic (ordering mostly)	2013-04-24 16:45:33 -07:00
birarda	9802940f8c	Merge pull request #139 from ey6es/master ... Fix for font rendering on Linux.	2013-04-24 15:39:59 -07:00
Jeffrey Ventrella	a9ff483d3d	fix	2013-04-24 15:35:11 -07:00
Andrzej Kapolka	6c435569c2	Merge branch 'master' of https://github.com/worklist/hifi	2013-04-24 15:31:10 -07:00
Andrzej Kapolka	e02aaa39f7	To fix font rendering on Linux (which uses points), we need to restore the ... default point size attenuation settings.	2013-04-24 14:59:11 -07:00
Jeffrey Ventrella	e93430d553	fix	2013-04-24 14:56:29 -07:00
Jeffrey Ventrella	bfc4befb9b	Merge remote-tracking branch 'upstream/master'	2013-04-24 14:55:25 -07:00
Jeffrey Ventrella	86086ef20c	just did a fairly major re-ordering of avatar interaction logic in Head.cpp	2013-04-24 14:52:04 -07:00
birarda	eb4e757a66	Merge pull request #137 from birarda/master ... only change hand state if for mouse press if it is your hand	2013-04-24 14:11:47 -07:00
Stephen Birarda	9c3ebf9f64	only set hand state for mouse press for me	2013-04-24 14:11:07 -07:00
ZappoMan	e4743bb3e6	Merge pull request #136 from birarda/master ... more const repairs in AvatarData	2013-04-24 13:55:00 -07:00
Stephen Birarda	87386cb05a	line the consts back up in AvatarData	2013-04-24 13:54:35 -07:00
Stephen Birarda	461ca6ecb4	revert some of the const changes that make sense	2013-04-24 13:51:27 -07:00
Stephen Birarda	a423d3c38f	more const repairs in AvatarData	2013-04-24 13:49:24 -07:00
ZappoMan	2a601799ce	Merge pull request #135 from birarda/master ... remove double consts in AvatarData	2013-04-24 13:48:00 -07:00
Stephen Birarda	142a8a6f08	remove double const in AvatarData.h	2013-04-24 13:45:17 -07:00
Philip Rosedale	7c69b85bc5	Merge pull request #132 from PhilipRosedale/master ... Fixed mouth/eyebrow movements of other avatars	2013-04-24 13:14:07 -07:00
Philip Rosedale	179bdc9fa2	Merge remote-tracking branch 'upstream/master'	2013-04-24 13:12:40 -07:00
Philip Rosedale	33f95c696b	Fixes per code review	2013-04-24 13:12:08 -07:00
birarda	ca19176312	Merge pull request #134 from birarda/master ... fix getter for hand state	2013-04-24 12:41:57 -07:00
Stephen Birarda	cfbe8a719c	fix getter for hand state in AvatarData	2013-04-24 12:39:25 -07:00
Philip Rosedale	055e62c165	Merge remote-tracking branch 'upstream/master'	2013-04-24 12:24:09 -07:00
birarda	3c36c7b726	Merge pull request #133 from ey6es/master ... Normals for voxel geometry.	2013-04-24 11:59:27 -07:00
Andrzej Kapolka	63a581dae4	Added normals to voxel geometry, enabling lighting.	2013-04-24 11:47:44 -07:00
Jeffrey Ventrella	7ae91c4b7b	Merge remote-tracking branch 'upstream/master'	2013-04-24 11:40:09 -07:00
Jeffrey Ventrella	4e7f1ee422	more cleanup of hand holding code	2013-04-24 11:39:43 -07:00
Philip Rosedale	b66d07a6b3	Merge remote-tracking branch 'upstream/master'	2013-04-24 11:27:36 -07:00
Philip Rosedale	78aa4fdf80	Simplified average loudness calculation, mouths and eyebrows of other people now move again!	2013-04-24 11:26:59 -07:00
ZappoMan	f00a3082cf	Merge pull request #131 from birarda/master ... fix agent address debugging	2013-04-24 11:20:30 -07:00
Stephen Birarda	a5ea1dca7e	fix incorrect debugging of agent local and public addresses	2013-04-24 11:16:13 -07:00
Jeffrey Ventrella	eca6999c2c	added behavior in Eve for alternating between grasping and ungrasping hand (tho unable to test transmission). Also, improved readability of hand grasping logic in Head.cpp	2013-04-24 11:02:23 -07:00
Philip Rosedale	50af1f68bf	Merge remote-tracking branch 'upstream/master'	2013-04-24 08:46:27 -07:00
Jeffrey Ventrella	22cb78afca	Merge pull request #129 from Ventrella/master ... fixed a logic issue in hand-holding	2013-04-24 08:14:38 -07:00
Jeffrey Ventrella	ee9ae3f220	improved avatar hand-holding logic	2013-04-24 08:13:15 -07:00
tosh	0332b455cb	removes leftover something and misplaced const-qualification that keeps it from compiling	2013-04-24 13:33:53 +02:00