Stephen Birarda
6ca21d96d1
don't add agents in DS packet to avatar mixer agent list
2013-04-29 15:06:46 -07:00
birarda
b7a746648a
Merge pull request #166 from birarda/master
...
fix agent type for agents added to avatar mixer
2013-04-29 15:00:02 -07:00
Stephen Birarda
d1a7a20e4c
agents added to avatar-mixer are of type avatar
2013-04-29 14:59:24 -07:00
ZappoMan
ea219cdd16
Merge pull request #163 from birarda/no-avatars
...
remove half-baked ping reply setup from avatar mixer
2013-04-29 14:53:24 -07:00
ZappoMan
a638542aa0
added support for LOD scanned sendding order of voxel scene
2013-04-29 14:34:17 -07:00
Jeffrey Ventrella
6b66d8e789
Merge remote-tracking branch 'upstream/master'
2013-04-29 14:12:01 -07:00
Jeffrey Ventrella
fe9ab0a213
improved collisions
2013-04-29 14:11:33 -07:00
Philip Rosedale
30414fb433
Merge pull request #164 from ey6es/master
...
To fix chat crash, lock agent list when updating from network, simulating, or rendering.
2013-04-29 13:56:42 -07:00
Andrzej Kapolka
c9c32630e8
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-29 13:22:25 -07:00
Andrzej Kapolka
0fe4d57ad7
I think this is the least intrusive fix for the chat crashes: lock the agent
...
list when we're updating from the network, simulating, or rendering. I think
there are likely to be other synchronization issues, but this is a start.
2013-04-29 13:17:39 -07:00
Stephen Birarda
c3c9616afb
avatar mixer still needs to check in with DS
2013-04-29 12:53:05 -07:00
Stephen Birarda
be0bf37109
remove the unused avatarIndex variable
2013-04-29 12:48:19 -07:00
Stephen Birarda
7b8d377eb4
simplify the avatar mixer communication while publicly accessible
2013-04-29 12:47:03 -07:00
Stephen Birarda
1ceda66ab8
remove added debugging in avatar-mixer, light refactoring
2013-04-29 12:38:46 -07:00
Philip Rosedale
da4d541ecb
Merge pull request #162 from Ventrella/master
...
improved hand holding algorithm
2013-04-29 12:06:19 -07:00
Stephen Birarda
b7189ef263
add debug to avatar mixer to figure out invisible avatars
2013-04-29 12:04:53 -07:00
Jeffrey Ventrella
9924be9188
Merge remote-tracking branch 'upstream/master'
2013-04-29 10:41:58 -07:00
Jeffrey Ventrella
4e4521325d
added 'isCollidable' to avatar bone so that some bones do not collide (for handshaking)
2013-04-29 10:38:29 -07:00
ZappoMan
e7296e1851
made tempOutputBuffer static, added some comments
2013-04-29 08:00:31 -07:00
ZappoMan
781721b79c
clean up constants for voxels
2013-04-29 06:49:57 -07:00
ZappoMan
78e8751a79
use constant for 'V' header
2013-04-29 06:31:06 -07:00
ZappoMan
7c180c800f
printf/pringLog cleanup
2013-04-29 06:28:19 -07:00
ZappoMan
ff996c9946
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-29 06:18:25 -07:00
Philip Rosedale
84a8af4808
Merge pull request #154 from PhilipRosedale/master
...
Code cleanup, better gyro look, removed cloud/field
2013-04-28 14:51:00 -07:00
Philip Rosedale
3787c93142
Fixes per review
2013-04-28 14:49:08 -07:00
Jeffrey Ventrella
caac600030
improved hand holding algorithm
2013-04-27 22:00:02 -07:00
Philip Rosedale
b9234b0a02
Merge remote-tracking branch 'upstream/master'
2013-04-27 17:19:55 -07:00
Philip Rosedale
bb4500886b
Merge pull request #160 from Ventrella/master
...
made camera first-person prototype and improved avatar collisions
2013-04-27 17:18:22 -07:00
Jeffrey Ventrella
37e304fd14
Merge remote-tracking branch 'upstream/master'
2013-04-27 16:45:58 -07:00
Philip Rosedale
5e737ce5d4
Merge remote-tracking branch 'upstream/master'
2013-04-27 16:39:19 -07:00
Philip Rosedale
f6ef117788
Merge pull request #157 from tschw/19165
...
19165
2013-04-27 16:37:46 -07:00
ZappoMan
0ebf339562
removed some dead code
2013-04-27 15:25:44 -07:00
ZappoMan
2f9c3da914
removed some dead code
2013-04-27 15:22:50 -07:00
ZappoMan
628b74b8e1
removed some dead code
2013-04-27 15:21:40 -07:00
ZappoMan
7fda49a5e1
removed some dead code
2013-04-27 15:17:59 -07:00
ZappoMan
7155557127
removed some dead code
2013-04-27 15:13:24 -07:00
ZappoMan
c364ec0dc7
removed mutex locking from VoxelTree for now
2013-04-27 15:09:32 -07:00
ZappoMan
9d6c53a535
remove mutex locking from VoxelTree for now, isn't needed
2013-04-27 15:08:17 -07:00
ZappoMan
e55993abf1
removed accidental whitespace
2013-04-27 15:04:08 -07:00
ZappoMan
e373a8b866
removed accidentally added whitespace
2013-04-27 14:59:58 -07:00
ZappoMan
2d518520f5
removed extra AgentList() constructor which got accidentally included in merge mistake
2013-04-27 14:58:38 -07:00
ZappoMan
94bb6a1b0f
removed some testing/debug code
2013-04-27 14:57:23 -07:00
ZappoMan
999930743e
removed some debug code
2013-04-27 14:55:34 -07:00
ZappoMan
2f2af7ec09
removed some debug code
2013-04-27 14:53:08 -07:00
ZappoMan
e4c39369aa
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-27 14:49:03 -07:00
ZappoMan
2fb172f3db
added support for command line option to use OLD or NEW voxel distribution schemes
...
- moved new voxel distribution strategy to helper function
- added back old technique
- added "--newVoxelDistributor" command line option
- fixed crashing bug for derefrencing NULL pointer in case where server is started
which interface agents already in the domain. Basically agentData may not yet
be setup properly
- added proper cleanup support to node bag in case where voxel tree is erased
- first cut at new version of sphere scene, we will make it richer in case of
new distribution
- bumped packets per interval to 5
2013-04-27 12:12:43 -07:00
ZappoMan
82c5c3706a
Latest work on new voxel sending strategy
...
- removed mutex locking for now. do we need this?
- fixed bug in createMissingNode() where we would accidentally stomp on
a previously created peer tree while creating a new node
- improved printTreeForDebugging() to include more details
- fixed a bug in readBitstreamToTree() for multi-tree case where we
weren't correctly walking through the buffer
2013-04-27 12:08:50 -07:00
ZappoMan
d49607b4cd
fix typo
2013-04-27 12:05:38 -07:00
ZappoMan
5758e42870
Added deleteAll() member to VoxelNodeBag class
2013-04-27 12:04:33 -07:00
ZappoMan
70818bd3fe
Added some new debugging code, removed some old debugging code, some small coding standard tweaks
2013-04-27 12:03:20 -07:00
