Jeffrey Ventrella
|
2d8c15e0cb
|
cleaned up some spacing issues in Orientarion class
|
2013-05-07 18:32:56 -07:00 |
|
Jeffrey Ventrella
|
d99eef8c99
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-07 08:43:44 -07:00 |
|
Jeffrey Ventrella
|
fe11d929e3
|
cleaned up code spacing
|
2013-05-07 08:43:14 -07:00 |
|
Philip Rosedale
|
082b58ea5b
|
Merge pull request #222 from ZappoMan/render_voxels_optimization
Make sure that TREE_SCALE works for something other than 10
|
2013-05-07 08:38:57 -07:00 |
|
Jeffrey Ventrella
|
33d58b45f3
|
Merge pull request #220 from Ventrella/master
lots of changes to improve avatar touch
|
2013-05-06 22:25:18 -07:00 |
|
Jeffrey Ventrella
|
65181cb4e0
|
changed some spacing formatting things
|
2013-05-06 22:23:16 -07:00 |
|
ZappoMan
|
f45bb8c455
|
fix comment
|
2013-05-06 21:30:47 -07:00 |
|
ZappoMan
|
e05b74f252
|
cleaned up code in addScene()
|
2013-05-06 21:08:06 -07:00 |
|
ZappoMan
|
d11e490b62
|
cleaned up code in createSphere()
|
2013-05-06 21:07:42 -07:00 |
|
ZappoMan
|
94473d6b95
|
made TREE_SCALE 100
|
2013-05-06 21:07:10 -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
|
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 |
|
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 |
|
ZappoMan
|
239aa1ed49
|
some cleanup pre CR
|
2013-05-06 16:18:30 -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 |
|