Stephen Birarda
|
92daa8e6e0
|
revert the type squish
|
2013-05-07 13:43:07 -07:00 |
|
Stephen Birarda
|
9be92cebdd
|
revert type squish, spacing, code review comment
|
2013-05-07 13:41:48 -07:00 |
|
Stephen Birarda
|
d5d9479b65
|
make eve send her ID to identify with the avatar mixer
|
2013-05-07 13:38:56 -07:00 |
|
Stephen Birarda
|
0566330a8a
|
some magic number removals
|
2013-05-07 12:44:45 -07:00 |
|
Stephen Birarda
|
85dfb23fbd
|
add constant for UNKNOWN_AGENT_ID
|
2013-05-07 12:39:35 -07:00 |
|
Stephen Birarda
|
83e59b1aa8
|
more deletions
|
2013-05-07 12:05:32 -07:00 |
|
Stephen Birarda
|
5c90b4575e
|
trivial deletions for cleanup
|
2013-05-07 12:05:25 -07:00 |
|
Stephen Birarda
|
4eeb1ed5b1
|
have interface clients tell the avatar-mixer and voxel-server what their ID is
|
2013-05-07 12:05:19 -07:00 |
|
Philip Rosedale
|
be1b803656
|
Noise Test function, adjust chat position
|
2013-05-07 10:41:39 -07:00 |
|
Philip Rosedale
|
27540f1286
|
Fixes per code review
|
2013-05-07 09:59:37 -07:00 |
|
Philip Rosedale
|
c7635604a9
|
Fixes in merge.
|
2013-05-07 08:40:11 -07:00 |
|
Jeffrey Ventrella
|
65181cb4e0
|
changed some spacing formatting things
|
2013-05-06 22:23:16 -07:00 |
|
Philip Rosedale
|
31593dccd4
|
improved comment of function
|
2013-05-06 18:46:19 -07:00 |
|
Philip Rosedale
|
00c8673ceb
|
Added Utility function angleBetween() which returns the positive angle between any two 3D vectors.
|
2013-05-06 18:45:06 -07:00 |
|
Jeffrey Ventrella
|
ef76c6ba0a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 18:29:42 -07:00 |
|
Jeffrey Ventrella
|
22a0e39d6c
|
more work on avatar touch, reachable radius, and hand states
|
2013-05-06 18:29:20 -07:00 |
|
Philip Rosedale
|
631ee8f478
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 18:23:06 -07:00 |
|
Stephen Birarda
|
d4ca60a668
|
remove image files that are no longer in use
|
2013-05-06 18:11:57 -07:00 |
|
Stephen Birarda
|
55a1e26585
|
remove the Texture class no longer in use
|
2013-05-06 18:10:21 -07:00 |
|
Stephen Birarda
|
f424b75e7b
|
some spacing repairs after merging Philip's levels pull
|
2013-05-06 17:50:44 -07:00 |
|
birarda
|
133e95f116
|
Merge pull request #210 from PhilipRosedale/master
Added invensense gyro level indicators
|
2013-05-06 17:47:38 -07:00 |
|
Jeffrey Ventrella
|
9c1f163175
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 17:00:04 -07:00 |
|
Philip Rosedale
|
9c56e5a2f7
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 16:59:46 -07:00 |
|
Jeffrey Ventrella
|
9fc56a6230
|
working out avatar touch stuff
|
2013-05-06 16:59:43 -07:00 |
|
ZappoMan
|
84da976383
|
removed _voxelCleanupLock
|
2013-05-06 16:38:24 -07:00 |
|
ZappoMan
|
f5808f43b5
|
some cleanup pre CR
|
2013-05-06 16:24:09 -07:00 |
|
Philip Rosedale
|
ff88d1fc06
|
Created a drawVector() call that will draw a vector in 3-space with axes for testing
|
2013-05-06 16:18:27 -07:00 |
|
Jeffrey Ventrella
|
fd4a0c9acd
|
working on detection of avatars entering into each other's peripersonal space
|
2013-05-06 16:17:16 -07:00 |
|
ZappoMan
|
94529d54e8
|
some cleanup pre CR
|
2013-05-06 16:16:21 -07:00 |
|
ZappoMan
|
b69c1a3474
|
some cleanup pre CR
|
2013-05-06 16:14:10 -07:00 |
|
ZappoMan
|
68d58650a5
|
removed some debug code
|
2013-05-06 16:09:21 -07:00 |
|
ZappoMan
|
09923d1c97
|
second cut at view culling voxels
|
2013-05-06 15:51:56 -07:00 |
|
Jeffrey Ventrella
|
c1ac3eb320
|
improving the code for detecting collisions, hand movement and handholding
|
2013-05-06 15:14:13 -07:00 |
|
Jeffrey Ventrella
|
114dfeacf6
|
thingy
|
2013-05-06 14:22:01 -07:00 |
|
Jeffrey Ventrella
|
40771e4c47
|
thingy
|
2013-05-06 14:18:14 -07:00 |
|
Jeffrey Ventrella
|
bc15bc2292
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 13:53:16 -07:00 |
|
ZappoMan
|
4f7adf7a05
|
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
|
2013-05-06 13:47:13 -07:00 |
|
Philip Rosedale
|
3b3e6ae075
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 13:42:23 -07:00 |
|
Stephen Birarda
|
784fa5882a
|
closing of serial interface should be conditional on __APPLE__
|
2013-05-06 13:36:58 -07:00 |
|
ZappoMan
|
043a284d4d
|
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
|
2013-05-06 13:36:31 -07:00 |
|
ZappoMan
|
7ba9d4aa86
|
First cut are removing out of view voxels and switch to using PerformanceWarnings
|
2013-05-06 13:32:09 -07:00 |
|
Stephen Birarda
|
250df35bc1
|
resolve conflicts on merge with upstream master
|
2013-05-06 13:31:50 -07:00 |
|
Philip Rosedale
|
eedbb98c32
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 13:29:34 -07:00 |
|
Philip Rosedale
|
f39fa3549b
|
invensense horizontal lines for RT indicator
|
2013-05-06 13:29:02 -07:00 |
|
Stephen Birarda
|
6666229d83
|
close the serial file descriptor in destructor
|
2013-05-06 13:25:49 -07:00 |
|
Stephen Birarda
|
49042046de
|
remove duplicated constructor after merge
|
2013-05-06 13:20:13 -07:00 |
|
Stephen Birarda
|
6d91e4721e
|
Merge remote-tracking branch 'upstream/master' into domain-rfd
|
2013-05-06 13:18:34 -07:00 |
|
Stephen Birarda
|
ee4c55afe7
|
move SerialInterface constructor to header file
|
2013-05-06 13:18:06 -07:00 |
|
Stephen Birarda
|
0b810fa4c2
|
if we fail to open SerialInterface twice then don't keep trying
|
2013-05-06 13:09:15 -07:00 |
|
Stephen Birarda
|
f3a9dcf777
|
if we fail to open SerialInterface twice then don't keep trying
|
2013-05-06 13:08:45 -07:00 |
|