ZappoMan
c9e1c898c2
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-14 19:50:38 -07:00
Stephen Birarda
a141e3dc5d
resolve conflicts on merge with upstream master
2013-06-13 16:31:40 -06:00
ZappoMan
8320925add
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 13:30:18 -07:00
Andrzej Kapolka
b57a78c414
Another fix: using strlen to determine the length of the packet is... unwise.
...
Remember the length when we create it. This should fix the voxel server's not
appearing.
2013-06-13 13:15:08 -07:00
Andrzej Kapolka
db729a04aa
Converted double timestamps to long long (64 bit integers), fixed bug with
...
updating agent timestamps.
2013-06-13 11:11:59 -07:00
ZappoMan
72b2845178
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 09:40:45 -07:00
Andrzej Kapolka
6dae9db01d
Initialize members in the right order.
2013-06-12 15:54:13 -07:00
Andrzej Kapolka
e4ed9162b9
This should help, as well as fix another annoyance: bind to an ephemeral port,
...
rather than a fixed one.
2013-06-12 15:52:29 -07:00
ZappoMan
2e58a77180
make originalIndexArray optional in insertIntoSortedArrays()
2013-06-12 12:35:02 -07:00
Stephen Birarda
7d1bcf07ef
add a Logstash class to prepare for sending stats over UDP
2013-06-11 17:09:39 -07:00
Andrzej Kapolka
ee526265a1
Fix for nibble packing.
2013-06-11 16:00:14 -07:00
Stephen Birarda
b15f5a721b
remove hacked method to keep servers alive
2013-06-10 14:03:34 -07:00
Stephen Birarda
7fb42dcb8a
fix bug with sent and received agent interest packets
2013-06-10 13:48:34 -07:00
Stephen Birarda
ed79a9f72a
prepend the agent types of interest with the number that follow
2013-06-10 12:18:25 -07:00
Stephen Birarda
d33f3e43bd
agentTypesOfInterest need not be unsigned and remove debugging
2013-06-07 15:28:30 -07:00
Stephen Birarda
1e05936aea
unthread DS check in, allow agents to tell DS who they want to hear about
2013-06-07 15:19:12 -07:00
Stephen Birarda
95971b8303
rename AGENT_TYPE_VOXEL and PACKET_HEADER_DOMAIN_RFD
2013-06-07 14:12:42 -07:00
ZappoMan
ba7863605c
fix several delete/delete[] mismatches
2013-06-07 10:49:43 -07:00
Philip Rosedale
3b149265d7
Merge pull request #495 from ZappoMan/recursive_voxel_delete
...
Fixes to delete voxel and color/add voxel to allow for unwinding color reaveraging
2013-06-06 11:17:57 -07:00
Stephen Birarda
f52b110b5c
conditional cleanup in Agent to re-fire PRB
2013-06-06 10:13:08 -07:00
ZappoMan
66ebb7d01c
Made readCodeColorBufferToTree() use self contained recursion so we can
...
implement color averaging properly
2013-06-06 01:39:40 -07:00
Stephen Birarda
5bbf96d946
allow avatar agents to ask for audio loopback
2013-06-05 17:31:52 -07:00
Andrzej Kapolka
a4aa8e7bde
Basic sharing of the avatar voxel URLs.
2013-06-05 14:55:49 -07:00
ZappoMan
9310876531
Merge pull request #485 from birarda/cube-injector
...
spherical audio injector and quaternion rotations for audio
2013-06-05 09:37:38 -07:00
Stephen Birarda
6bf6d5a28e
cleanup NULL comparisons in AgentList
2013-06-04 17:29:37 -07:00
Stephen Birarda
d02fb65a13
Merge remote-tracking branch 'upstream/master' into cube-injector
2013-06-04 11:25:39 -07:00
ZappoMan
026fb5b344
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 09:34:37 -07:00
ZappoMan
ceb15d407d
removed assert
2013-06-03 22:08:19 -07:00
ZappoMan
510dfc7353
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-03 21:43:38 -07:00
ZappoMan
cf3ff53e2c
copy and paste working
2013-06-03 18:08:11 -07:00
ZappoMan
0b7f4b21f4
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 16:42:27 -07:00
Stephen Birarda
f3ce68e5e4
remove space at the top of PacketHeaders
2013-06-03 12:21:44 -07:00
ZappoMan
7dd217b318
more work on copy and paste
2013-06-03 10:57:18 -07:00
ZappoMan
e5e200345b
more work on copy and paste
2013-05-31 11:52:18 -07:00
Andrzej Kapolka
98759c3ba1
Include <unistd.h> to address a build error experienced by Clement.
2013-05-31 10:27:25 -07:00
ZappoMan
b0397e8eb9
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-30 21:41:55 -07:00
Stephen Birarda
1f4e9f3051
update last heard from time for audio injectors
2013-05-29 18:37:03 -07:00
ZappoMan
46c6f2f9b5
latest copy paste
2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936
latest copy and paste
2013-05-29 12:06:58 -07:00
ZappoMan
04f4e499e1
Optimize wire-format for AvatarData
...
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
Stephen Birarda
6158410658
provide a getter for the owning agent in AgentData
2013-05-24 12:32:00 -07:00
Stephen Birarda
59a6016f4b
use a NULL default for owningAvatar to simplify constructors
2013-05-24 12:18:38 -07:00
Stephen Birarda
36892da488
keep a pointer to owning agent in AgentData
2013-05-24 12:17:34 -07:00
Andrzej Kapolka
629c7b0146
Send all environment data in the same packet and only send it about once a
...
second.
2013-05-22 17:09:35 -07:00
birarda
9ec04855f8
Merge pull request #386 from ZappoMan/voxel_animation
...
Fix some crashing issues on delete
2013-05-22 14:27:29 -07:00
ZappoMan
c2ebd6fc95
CR feedback
2013-05-22 14:23:27 -07:00
Andrzej Kapolka
f70b2ceb76
Reverted change that would have added glm to shared library.
2013-05-22 11:23:55 -07:00
Andrzej Kapolka
8b1362636e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75
Merge pull request #352 from tschw/master
...
refactors logging, adds comments, and revises names & formatting in all submitted code
2013-05-21 22:10:10 -07:00
