Stephen Birarda
|
836d286b75
|
initial transition from vector to multi-dimensional array in AgentList
|
2013-04-25 13:11:13 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Jeffrey Ventrella
|
1a300c8ad3
|
Merge pull request #126 from Ventrella/master
removed orientation lines in bones
|
2013-04-23 22:06:18 -07:00 |
|
Jeffrey Ventrella
|
8135a45ccf
|
removed pinky orientation lines in avatar bones
|
2013-04-23 22:05:02 -07:00 |
|
Jeffrey Ventrella
|
54aac82e9c
|
cleanup
|
2013-04-23 21:30:53 -07:00 |
|
Jeffrey Ventrella
|
e11c6edda3
|
Merge pull request #125 from Ventrella/master
one more fix
|
2013-04-23 21:19:02 -07:00 |
|
Jeffrey Ventrella
|
61a17060c3
|
one more glitch...
|
2013-04-23 21:17:39 -07:00 |
|
Philip Rosedale
|
d65f577268
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 21:12:24 -07:00 |
|
Philip Rosedale
|
0f403de592
|
Merge pull request #124 from Ventrella/master
fixed breakage in voxel and eve
|
2013-04-23 21:10:06 -07:00 |
|
Jeffrey Ventrella
|
48da3f726e
|
fixed bug - didn't change bodyPosition in eve or voxel
|
2013-04-23 21:07:40 -07:00 |
|
Philip Rosedale
|
a440570cb4
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 21:00:53 -07:00 |
|
Philip Rosedale
|
daa8350fa7
|
Merge pull request #118 from Ventrella/master
prepared for hand state changes, and also renamed bodyPosition to position
|
2013-04-23 20:54:55 -07:00 |
|
Jeffrey Ventrella
|
428cb89895
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 20:44:50 -07:00 |
|
Jeffrey Ventrella
|
61d7a82fc6
|
made lots of changes in the logic of how my avatar encounters other avatars and detects hand state
|
2013-04-23 20:44:12 -07:00 |
|
Philip Rosedale
|
99a4d0f3dc
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 20:11:35 -07:00 |
|
birarda
|
a4c1f646c1
|
Merge pull request #123 from birarda/master
hard code eve's listen port again to fix EC2 problem
|
2013-04-23 17:35:56 -07:00 |
|
Stephen Birarda
|
0014b045af
|
hard code eve's listen port again so she shows up on EC2
|
2013-04-23 17:35:00 -07:00 |
|
birarda
|
8c4d8f4def
|
Merge pull request #122 from birarda/master
add IP address debug to domain server info
|
2013-04-23 15:58:54 -07:00 |
|
Stephen Birarda
|
11986ca00f
|
add IP address to DS information output
|
2013-04-23 15:58:06 -07:00 |
|
birarda
|
b24ad5e89b
|
Merge pull request #121 from birarda/master
add some randomization to eve so there can be many
|
2013-04-23 15:48:22 -07:00 |
|
Stephen Birarda
|
a4244da27e
|
add randomization of eve's listening port on launch
|
2013-04-23 15:46:57 -07:00 |
|
Stephen Birarda
|
2b7095925d
|
add randomization of eve's position, face eve down z-axis
|
2013-04-23 15:45:29 -07:00 |
|
birarda
|
e20f267b22
|
Merge pull request #120 from birarda/master
fix size for SOLO_AGENT_TYPES in AgentList header
|
2013-04-23 14:13:02 -07:00 |
|
Stephen Birarda
|
3344016212
|
SOLO_AGENT_TYPES needs a defined size
|
2013-04-23 14:12:21 -07:00 |
|
birarda
|
b21c0ae9df
|
Merge pull request #119 from birarda/master
add cstring for memset and memcpy in AudioInjector
|
2013-04-23 14:09:39 -07:00 |
|