Andrzej Kapolka
1df7806464
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09
Fix for NaN.
2013-05-27 14:37:07 -07:00
Andrzej Kapolka
cfb66bee95
Capsule/box collisions.
2013-05-27 14:05:44 -07:00
Philip Rosedale
7aebbe3047
Merge pull request #434 from ZappoMan/voxel_animation
...
Improve "Delta Sending" mode..
2013-05-26 09:45:54 -07:00
Andrzej Kapolka
70b25fd6c4
Sphere/box collisions for voxels, various utility functions.
2013-05-25 19:59:07 -07:00
ZappoMan
db97a96fdf
Merge pull request #428 from birarda/mixer-crash
...
don't copy the incorrect amount of audio data into a buffer to avoid a mixer crash
2013-05-25 15:38:58 -07:00
ZappoMan
77e5fbb590
Merge pull request #427 from birarda/oculus
...
go into oculus mode when connected, fix the yaw pull
2013-05-25 15:38:20 -07:00
ZappoMan
1a2921e3e8
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-25 15:32:12 -07:00
ZappoMan
60f2b9a438
removed debug
2013-05-25 15:31:28 -07:00
ZappoMan
f6863081f9
Fix Delta Sending mode by not culling out of view voxels until we STOP moving
...
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
2013-05-25 15:29:23 -07:00
ZappoMan
48ca562b10
tweak ViewFrustum::matches() to use EPSILON compare
2013-05-25 15:28:56 -07:00
ZappoMan
1f8842c6af
tweak recording of lastKnownViewFrustum as part of delta sending fix
2013-05-25 15:28:09 -07:00
Jeffrey Ventrella
fc3e56742e
Merge pull request #433 from Ventrella/master
...
cleanup
2013-05-24 18:06:21 -07:00
Jeffrey Ventrella
1e4771fe27
fix
2013-05-24 18:05:14 -07:00
birarda
0558bba32f
Merge pull request #431 from Ventrella/master
...
improved movable hair tufts code - and fixed mouth
2013-05-24 18:04:13 -07:00
Jeffrey Ventrella
8c24477a24
Merge remote-tracking branch 'upstream/master'
2013-05-24 18:01:47 -07:00
Jeffrey Ventrella
0c2c90b84d
cleanup
2013-05-24 18:01:25 -07:00
birarda
744278b502
Merge pull request #432 from FreddyHeibs/master
...
Voxel create/delete noises
2013-05-24 17:59:33 -07:00
Freddy
6a4bcf32fa
Code review fixes
2013-05-24 17:58:31 -07:00
Freddy
30e951578e
procedural voxel create/delete noises
2013-05-24 17:27:56 -07:00
Jeffrey Ventrella
28f3af4ea5
Merge remote-tracking branch 'upstream/master'
2013-05-24 17:13:10 -07:00
Jeffrey Ventrella
56438435c1
made mouth conform to the head sphere
2013-05-24 17:12:14 -07:00
birarda
82f5e0a3b1
Merge pull request #426 from PhilipRosedale/master
...
big ground plane
2013-05-24 16:37:53 -07:00
birarda
b883f4073d
Merge pull request #430 from birarda/master
...
tune the distance attenuation to be a little less dramatic
2013-05-24 16:33:19 -07:00
Stephen Birarda
12d0ccb712
tune the distance attenuation to use log of base 2.5
2013-05-24 16:32:52 -07:00
Jeffrey Ventrella
6634ad2ed2
thingy
2013-05-24 16:31:17 -07:00
birarda
e7f2bfc7ff
Merge pull request #429 from birarda/master
...
require that crotch grabbing be intentional
2013-05-24 16:19:04 -07:00
Stephen Birarda
a8b08647d0
require that crotch grabbing be explicit, not implicit
2013-05-24 16:18:36 -07:00
Stephen Birarda
c661796b81
don't copy audio data if the agent sent the wrong amount
2013-05-24 15:37:48 -07:00
Stephen Birarda
65168e6aec
add a yaw offset to the oculus so it can pull body
2013-05-24 15:23:25 -07:00
Philip Rosedale
608a4f71bf
ground surface is 20 meters across. play on!
2013-05-24 14:51:06 -07:00
Philip Rosedale
995fbcf4f9
mohawk also follows body pitch when accelerating
2013-05-24 14:46:26 -07:00
Philip Rosedale
aae6d0cf3c
Merge pull request #425 from ey6es/master
...
Made planet atmospheres twice as thick, have the big planet's be red.
2013-05-24 14:33:53 -07:00
birarda
b866bfd879
Merge pull request #424 from PhilipRosedale/master
...
Mohawk same for everyone, rotates with head
2013-05-24 14:33:14 -07:00
Philip Rosedale
d796956a96
fix per review
2013-05-24 14:32:56 -07:00
Philip Rosedale
9baf087c9a
Avatar renders right arm in 1P mode
2013-05-24 14:29:26 -07:00
Andrzej Kapolka
93f9d0a5a5
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 14:26:54 -07:00
Andrzej Kapolka
5ca01842be
Made the atmospheres twice as thick, made the large planet one's red.
2013-05-24 14:24:47 -07:00
Philip Rosedale
31e41260c1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 14:17:44 -07:00
Philip Rosedale
f5c0f84d27
Mohawk is different/stable for each person, and rotates correctly with head
2013-05-24 14:15:53 -07:00
Andrzej Kapolka
5ba5fd984f
Merge pull request #423 from birarda/oculus
...
go directly into oculus mode when oculus is connected
2013-05-24 14:08:40 -07:00
Stephen Birarda
d12bc85376
go directly into oculus mode when the oculus is connected
2013-05-24 14:05:22 -07:00
Andrzej Kapolka
d32511ee47
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 13:59:08 -07:00
Philip Rosedale
ccff880493
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 12:33:16 -07:00
Philip Rosedale
cb7381fcd1
incremental fix rotation
2013-05-24 12:33:05 -07:00
birarda
007e9fe447
Merge pull request #422 from birarda/owner-pointers
...
provide a getter for the owning agent
2013-05-24 12:32:38 -07:00
Stephen Birarda
6158410658
provide a getter for the owning agent in AgentData
2013-05-24 12:32:00 -07:00
Philip Rosedale
360c9c8ab1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 12:30:12 -07:00
Philip Rosedale
dc9b2e33b5
Fixing mohawk orientation
2013-05-24 12:30:05 -07:00
ZappoMan
f0ce749877
Merge pull request #421 from birarda/owner-pointers
...
add pointers back to owning avatar and owning agent
2013-05-24 12:28:10 -07:00