Stephen Birarda
67912cc325
merge with birarda/qt5 and resolve conflicts
2013-07-24 12:14:31 -07:00
Stephen Birarda
8d34c707a1
Merge branch 'master' of github.com:worklist/hifi into assignee
2013-07-22 14:04:09 -07:00
ZappoMan
86ad0da09f
Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats
2013-07-20 11:35:10 -07:00
ZappoMan
d9c8a59929
send voxel scene stats from server to client
2013-07-19 15:09:38 -07:00
Andrzej Kapolka
8863645dc9
Working on transmitting and receiving the face video.
2013-07-17 18:02:27 -07:00
Stephen Birarda
d6601ad333
resolve conflicts on merge with upstream master
2013-07-11 14:33:50 -07:00
Stephen Birarda
e3d9289f1f
refactor packet version handling and apply to DS
2013-07-08 13:44:01 -07:00
Stephen Birarda
693463ae5b
voxel-server packet version handling
2013-07-08 11:54:00 -07:00
Stephen Birarda
5062ae8965
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
2013-07-08 11:37:39 -07:00
Stephen Birarda
b9c1525321
add the base of the assignment-server
2013-07-01 14:05:14 -07:00
Stephen Birarda
3349419c68
inital changes to add a version byte to packets
2013-06-28 16:23:35 -07:00
Stephen Birarda
95971b8303
rename AGENT_TYPE_VOXEL and PACKET_HEADER_DOMAIN_RFD
2013-06-07 14:12:42 -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
Stephen Birarda
f3ce68e5e4
remove space at the top of PacketHeaders
2013-06-03 12:21:44 -07:00
ZappoMan
c2ebd6fc95
CR feedback
2013-05-22 14:23:27 -07:00
Philip Rosedale
7728a54d26
Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter
2013-05-20 19:00:49 -07:00
Stephen Birarda
ce34a8f3e0
add packet headers and agent types for audio clarity
2013-05-15 11:43:49 -07:00
birarda
6f7d2a6922
Merge pull request #314 from birarda/transmitter
...
add new packet header for V2 transmitter data
2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6
add a V2 transmitter data packet for new iOS transmitter
2013-05-14 16:29:39 -07:00
ZappoMan
8dc61d89fc
Added support for "destructive" vs "non-destructive" voxel create
...
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
2013-05-14 14:19:31 -07:00
ZappoMan
b196227385
Added wantResIn and wantColor feature between client and server
...
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
2013-05-13 15:02:46 -07:00
Andrzej Kapolka
c7e31ec414
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-07 14:44:17 -07:00
Stephen Birarda
d5d9479b65
make eve send her ID to identify with the avatar mixer
2013-05-07 13:38:56 -07:00
Andrzej Kapolka
2226d722cf
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-06 13:31:46 -07:00
Andrzej Kapolka
b4dd6b57aa
Starting on environment bits.
2013-05-06 13:30:07 -07:00
Stephen Birarda
beca9cac8d
update timestamp variables in Agent, use new packet headers for DS
2013-05-06 12:40:52 -07:00
Stephen Birarda
67efc12e59
move shared to libraries, DRY library macro, rename libs
2013-04-12 12:38:34 -07:00