Jeffrey Ventrella
57cbd9c6d9
cleaned up collision code some
2013-04-27 09:47:46 -07:00
Jeffrey Ventrella
5c3bd5fe87
improved collisions between avatars
2013-04-27 09:33:58 -07:00
Jeffrey Ventrella
308b9dcf82
Merge remote-tracking branch 'upstream/master'
2013-04-26 17:44:42 -07:00
Jeffrey Ventrella
adccd62f87
made a different prototype for camera shifting into first-person
2013-04-26 17:43:47 -07:00
Philip Rosedale
16ea53f921
Merge remote-tracking branch 'upstream/master'
2013-04-26 17:40:27 -07:00
Philip Rosedale
ebc5d665c0
Merge pull request #158 from ey6es/master
...
Reverted threading change by default, since we're seeing lower frame rates.
2013-04-26 17:19:11 -07:00
birarda
7ddf33b9c3
Merge pull request #159 from birarda/audio
...
tune distance ratio, remove debugging in audio mixer
2013-04-26 17:14:36 -07:00
Stephen Birarda
14012ee44b
remove the debugging to confirm that distance attenuation is working
2013-04-26 17:11:51 -07:00
Andrzej Kapolka
c26becf6cb
Added toggle for nonblocking networking; default to threaded for now, since
...
we're seeing lower frame rates.
2013-04-26 17:10:52 -07:00
Philip Rosedale
99957f31f3
Merge remote-tracking branch 'upstream/master'
2013-04-26 17:09:05 -07:00
Stephen Birarda
5442362b3a
change DISTANCE_RATIO const in audio-mixer main
2013-04-26 17:01:54 -07:00
Philip Rosedale
69cf6e303d
Merge pull request #155 from Ventrella/master
...
merge
2013-04-26 16:54:28 -07:00
Philip Rosedale
996a8794d0
Merge remote-tracking branch 'upstream/master'
2013-04-26 16:37:58 -07:00
Philip Rosedale
1804357eab
Merge pull request #156 from ey6es/master
...
Style fixes to chat code, and moved packet reading to main thread to fix synchronization issues.
2013-04-26 16:34:41 -07:00
tosh
dbfef9d802
Merge branch 'master' of git://github.com/worklist/hifi into 19165
...
Conflicts:
interface/src/Audio.cpp
2013-04-27 00:53:29 +02:00
Jeffrey Ventrella
2486b6e15c
moved inline functions from Camera.h to Camera.cpp as per Stephen's request
2013-04-26 13:33:36 -07:00
Jeffrey Ventrella
59ef9e5d7e
removed incomplete code snippet in Avatar.h
2013-04-26 13:21:49 -07:00
Andrzej Kapolka
21f1669388
How'd those tabs get in there?
2013-04-26 13:10:44 -07:00
Andrzej Kapolka
c4776fcd27
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-26 13:03:09 -07:00
Jeffrey Ventrella
e9592f9360
moved handController
2013-04-26 12:55:13 -07:00
ZappoMan
3cb41a6fa6
re-apply agentlist changes to voxel server that somehow got smashed
2013-04-26 12:36:25 -07:00
ZappoMan
88039e6dac
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-26 12:17:09 -07:00
ZappoMan
bcdc4d6654
new version of voxel encoding and sending
2013-04-26 12:16:41 -07:00
Jeffrey Ventrella
10b6c7759d
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-26 12:16:22 -07:00
Jeffrey Ventrella
dc11055f8e
merge with upstream master and resolve conflicts
2013-04-26 12:15:48 -07:00
ZappoMan
8445790183
added new voxel sending support to VoxelAgentData
...
- added VoxelNodeBag member to keep track of which nodes this agent needs to
have sent to it
- added _voxelPacket and other members to keep track of the next packet to
be sent to this client. This is because as we fill in packets to send we
may run out of room in the current packet, but not want to have to reencode
that data
- cleaned up constructors to use common init() method
2013-04-26 12:13:37 -07:00
ZappoMan
e93cab40ed
change default grow size
2013-04-26 12:12:41 -07:00
Stephen Birarda
7744685de4
debug of distance should be float and not integer
2013-04-26 12:01:47 -07:00
Stephen Birarda
e2cb1866ed
add another line of debugging for audio mixer distance coeff
2013-04-26 11:59:26 -07:00
Philip Rosedale
824abca443
Removed field and Cloud classes
2013-04-26 11:57:04 -07:00
Stephen Birarda
57c39ceb99
add some debugging to audio mixer for distance attenuation
2013-04-26 11:53:10 -07:00
Stephen Birarda
948f9607f6
send head position as source position to mixer
2013-04-26 11:49:52 -07:00
Philip Rosedale
2e518f8dac
Removed renderPitchRate, renderYawRate, startYaw from main.cpp, they are not doing anything.
2013-04-26 11:36:44 -07:00
birarda
a987d95af0
Merge pull request #153 from birarda/audio
...
correct the sign of the absolute head yaw
2013-04-26 11:36:27 -07:00
Stephen Birarda
ded5da47ff
correct the sign of the absolute head yaw sent to avatar mixer
2013-04-26 11:35:55 -07:00
Andrzej Kapolka
0932a8b382
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-26 11:31:15 -07:00
ZappoMan
8dfd235491
Merge pull request #152 from birarda/audio
...
send correct avatar yaw to the audio mixer
2013-04-26 11:25:54 -07:00
Stephen Birarda
7c855464e1
make the absolute head yaw getter const
2013-04-26 11:22:42 -07:00
Stephen Birarda
fbdcd57529
correct yaw sent to audio-mixer in Audio
2013-04-26 11:21:34 -07:00
Andrzej Kapolka
b9fdba2711
Rather than creating a thread to read datagrams, just set the socket to
...
nonblocking mode and check it before simulating. This addresses one aspect
of the lack of synchronization on AgentList, but there are other issues...
2013-04-26 11:08:41 -07:00
Stephen Birarda
1884bfc17e
some spacing cleanup in Audio class
2013-04-26 10:58:01 -07:00
Jeffrey Ventrella
fe2e180f16
merge with upstream master
2013-04-26 10:56:48 -07:00
birarda
d3d59ff915
Merge pull request #151 from birarda/audio
...
fix for other agent iterator in audio mixer
2013-04-26 10:51:05 -07:00
Stephen Birarda
f18942d016
fix otherAgent iterator in audio-mixer main
2013-04-26 10:50:19 -07:00
Philip Rosedale
e304e0dfb3
Fixing spacing nits in balls class
2013-04-26 10:21:17 -07:00
Andrzej Kapolka
46041b2ed9
Style tweaks: preface privates with underscore, capitalize enum members.
2013-04-26 10:21:14 -07:00
ZappoMan
4916da39fa
Merge pull request #150 from PhilipRosedale/master
...
Added balls class for avatar simulation, removed particles class.
2013-04-26 10:07:44 -07:00
Philip Rosedale
61578d1ddb
Added balls class
2013-04-26 09:59:50 -07:00
Philip Rosedale
e4c2004a69
Added constant to turn OFF avatar BALLS testing
2013-04-26 09:34:10 -07:00
ZappoMan
91f6aaa96e
testing of new searchForColoredNodes()
2013-04-26 09:23:48 -07:00
