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 |
|
Philip Rosedale
|
69cac10cee
|
null change
|
2013-05-06 18:21:33 -07:00 |
|
Philip Rosedale
|
ef68ef9c5d
|
Merge pull request #217 from birarda/off-axis
add off-axis attenuation to audio
|
2013-05-06 18:18:23 -07:00 |
|
birarda
|
16e0448f2d
|
Merge pull request #219 from birarda/master
some spring cleaning
|
2013-05-06 18:13:22 -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 |
|
birarda
|
77f75be83a
|
Merge pull request #218 from birarda/master
spacing repairs in SerialInterface
|
2013-05-06 17:51:05 -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 |
|
Stephen Birarda
|
8187724410
|
correct the angle of delivery
|
2013-05-06 17:30:37 -07:00 |
|
Stephen Birarda
|
04b223a020
|
add off axis attenuation to audio-mixer
|
2013-05-06 17:14:33 -07:00 |
|
Stephen Birarda
|
81fade33dc
|
refactoring in audio mixer in preparation for off axis attenuation
|
2013-05-06 17:07:57 -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 |
|
Philip Rosedale
|
76b45a79c6
|
Merge pull request #216 from ZappoMan/render_voxels_optimization
First Cut at View Frustum Culling in Client to Speed up Rendering
|
2013-05-06 16:48:43 -07:00 |
|
ZappoMan
|
bccad01e0e
|
fixed CR issue
|
2013-05-06 16:47:31 -07:00 |
|
ZappoMan
|
342e3e0407
|
fixed CR issue
|
2013-05-06 16:43:25 -07:00 |
|
ZappoMan
|
c2588e0120
|
fixed CR issue
|
2013-05-06 16:42:12 -07:00 |
|
ZappoMan
|
84da976383
|
removed _voxelCleanupLock
|
2013-05-06 16:38:24 -07:00 |
|
ZappoMan
|
cfbcc4418f
|
some cleanup pre CR
|
2013-05-06 16:34:34 -07:00 |
|
ZappoMan
|
37b165c8e9
|
some cleanup pre CR
|
2013-05-06 16:30:34 -07:00 |
|
ZappoMan
|
f5808f43b5
|
some cleanup pre CR
|
2013-05-06 16:24:09 -07:00 |
|
ZappoMan
|
9fb57feb3b
|
some cleanup pre CR
|
2013-05-06 16:21:58 -07:00 |
|
Philip Rosedale
|
642dca2c91
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 16:19:06 -07:00 |
|
ZappoMan
|
239aa1ed49
|
some cleanup pre CR
|
2013-05-06 16:18:30 -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
|
0e9d9dccaf
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 16:17:46 -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
|
4b0cde0b0d
|
bump up voxel send rate, since client can now handle it
|
2013-05-06 16:09:04 -07:00 |
|
ZappoMan
|
dc481002ec
|
fixed Xcode compiler warnings
|
2013-05-06 16:00:43 -07:00 |
|
ZappoMan
|
35c840fefa
|
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
|
2013-05-06 15:57:44 -07:00 |
|
ZappoMan
|
09923d1c97
|
second cut at view culling voxels
|
2013-05-06 15:51:56 -07:00 |
|
ZappoMan
|
89226b18a5
|
switched getAABox() interface
|
2013-05-06 15:50:42 -07:00 |
|
ZappoMan
|
96561e97d8
|
added VIEW_CULLING_RATE_IN_MILLISECONDS
|
2013-05-06 15:49:54 -07:00 |
|
ZappoMan
|
c975699cea
|
added debug to ViewFrustum::matches()
|
2013-05-06 15:48:05 -07:00 |
|
birarda
|
1aeb448009
|
Merge pull request #215 from birarda/master
another missing include for stacktraces
|
2013-05-06 15:38:54 -07:00 |
|
Stephen Birarda
|
84a8e481ff
|
include signal for signal handler in audio mixer
|
2013-05-06 15:38:28 -07:00 |
|
birarda
|
d117ec1f8a
|
Merge pull request #214 from birarda/master
add missing cstdlib include
|
2013-05-06 15:37:13 -07:00 |
|
Stephen Birarda
|
90a8027f69
|
include cstdlib for call to exit
|
2013-05-06 15:36:48 -07:00 |
|
ZappoMan
|
026016e869
|
Merge pull request #213 from birarda/stacktraces
output stack trace on audio mixer crash
|
2013-05-06 15:31:44 -07:00 |
|
Stephen Birarda
|
c742c292b6
|
have the audio mixer output a stacktrace when it crashes
|
2013-05-06 15:29:21 -07:00 |
|
Jeffrey Ventrella
|
1f2335da26
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-06 15:14:37 -07:00 |
|
Jeffrey Ventrella
|
c1ac3eb320
|
improving the code for detecting collisions, hand movement and handholding
|
2013-05-06 15:14:13 -07:00 |
|
birarda
|
7991cb2612
|
Merge pull request #212 from birarda/master
fix warning on comparison in DS
|
2013-05-06 14:49:18 -07:00 |
|
Stephen Birarda
|
c3ae1136e1
|
fix warning on comparison in DS
|
2013-05-06 14:48:57 -07:00 |
|