ZappoMan
|
002d35932e
|
Merge pull request #21 from birarda/19170B
Leo's Avatar Mixer + birarda's AgentData updates
|
2013-04-11 10:43:02 -07:00 |
|
Stephen Birarda
|
010c7e028d
|
switch from strchr to memchr for broadcastToAgents
|
2013-04-10 15:30:21 -07:00 |
|
vincent
|
4dbff46234
|
#19171 Code Review changes
|
2013-04-11 00:13:40 +02:00 |
|
Stephen Birarda
|
d56952cdc7
|
don't copy agent delete mutex
|
2013-04-10 13:39:31 -07:00 |
|
vincent
|
d6189694c8
|
#19171 move of usleep function to SharedUtil.cpp
|
2013-04-10 21:55:29 +02:00 |
|
Stephen Birarda
|
fcee05e9f0
|
handle pinging of unknown agents in AgentList thread
|
2013-04-10 12:37:14 -07:00 |
|
Stephen Birarda
|
ec520752f1
|
Merge remote-tracking branch 'upstream/master' into 19170B
|
2013-04-10 12:07:35 -07:00 |
|
Stephen Birarda
|
cf1f087b38
|
add method to parse bulk agent data from a mixer
|
2013-04-10 11:57:24 -07:00 |
|
vincent
|
1e2e505301
|
Another merge and fix ...
|
2013-04-10 20:41:46 +02:00 |
|
vincent
|
bb380e841e
|
Code review changes
|
2013-04-10 08:28:26 +02:00 |
|
Stephen Birarda
|
8fe87d08e9
|
refactoring broadcast avatar data, auto-activate AM public socket
|
2013-04-09 17:59:54 -07:00 |
|
Stephen Birarda
|
4f576ba86f
|
some spacing issues, conversions from const char to char *
|
2013-04-09 17:33:53 -07:00 |
|
Stephen Birarda
|
11a317da96
|
remove comments in processAgentData
|
2013-04-09 17:15:40 -07:00 |
|
Stephen Birarda
|
f2377ea541
|
some refactoring in updateDataForAllAgents
|
2013-04-09 17:14:27 -07:00 |
|
Stephen Birarda
|
48077b62c8
|
remove unnecessary cast and other lines
|
2013-04-09 17:10:04 -07:00 |
|
Stephen Birarda
|
7742d3114e
|
add avatar mixer to agent type names, remove head
|
2013-04-09 17:03:10 -07:00 |
|
Stephen Birarda
|
ae7f3e71d8
|
broadcast to VS and avatar mixer on position change
|
2013-04-09 16:56:19 -07:00 |
|
Stephen Birarda
|
a0f3f161b1
|
move AvatarData class to AvatarAgentData subclass of AgentData
|
2013-04-09 16:39:57 -07:00 |
|
Leonardo Murillo
|
1cf75b37f3
|
Changes to interface side of code
|
2013-04-09 15:30:30 -06:00 |
|
Leonardo Murillo
|
6bff444f15
|
Removing unnecessary header file
|
2013-04-09 14:58:27 -06:00 |
|
ZappoMan
|
f5634a66aa
|
Got rid of AGENT_TYPE_HEAD and fixed voxel server to use AGENT_TYPE_INTERFACE
|
2013-04-09 13:27:15 -07:00 |
|
vincent
|
4f41aab89a
|
last merge without Curl
|
2013-04-09 22:17:59 +02:00 |
|
Leonardo Murillo
|
e0c31d68d1
|
Merge branch 'master' of github.com:/worklist/hifi into 19170B
|
2013-04-09 14:01:38 -06:00 |
|
ZappoMan
|
712997451b
|
Adding friendly names to AgentType display.
|
2013-04-09 13:00:20 -07:00 |
|
ZappoMan
|
2ec3f6b210
|
Adding new AgentTypes.h and moving over to new constants
|
2013-04-09 10:37:07 -07:00 |
|
vincent
|
56aac7077c
|
changes after merge
|
2013-04-09 19:12:49 +02:00 |
|
Leonardo Murillo
|
cb5d1b9214
|
Second take on Avatar Mixer
|
2013-04-09 09:22:34 -06:00 |
|
Leonardo Murillo
|
8c4c51a2e9
|
Merge branch 'master' of github.com:/worklist/hifi into 19170B
|
2013-04-09 09:19:37 -06:00 |
|
Philip Rosedale
|
87fd0f7a91
|
Fixed avatar lighting, head scaling, removed some extra log messages
|
2013-04-08 21:13:20 -07:00 |
|
Philip Rosedale
|
492ea68741
|
Merge remote-tracking branch 'origin/master'
|
2013-04-08 20:12:00 -07:00 |
|
Philip Rosedale
|
b9b57b8cc0
|
Packet reply changed to constant in packetHeaders.h
|
2013-04-08 20:10:19 -07:00 |
|
Leonardo Murillo
|
577d0d8e1d
|
Merge branch 'master' of github.com:/worklist/hifi into 19170B
|
2013-04-08 21:06:50 -06:00 |
|
ZappoMan
|
17f4c5d184
|
cleanup of packet header constants
|
2013-04-08 19:56:42 -07:00 |
|
ZappoMan
|
7480283dd4
|
cleanup of packet header constants
|
2013-04-08 19:54:14 -07:00 |
|
Philip Rosedale
|
06a5e4d8a9
|
Adding more packet headers
|
2013-04-08 19:03:49 -07:00 |
|
Stephen Birarda
|
6f8808e565
|
add the ping reply header
|
2013-04-08 18:25:21 -07:00 |
|
Stephen Birarda
|
f018d8e323
|
replace ping header char in processAgentData switch case
|
2013-04-08 18:24:47 -07:00 |
|
Stephen Birarda
|
b636536ab7
|
remove interface define in PacketHeader.h
|
2013-04-08 18:23:57 -07:00 |
|
Stephen Birarda
|
2031d26ffe
|
fix incorrect agent type replacement
|
2013-04-08 18:23:01 -07:00 |
|
Stephen Birarda
|
d462bff512
|
add a PacketHeaders header file and sub a couple as an example
|
2013-04-08 18:22:21 -07:00 |
|
ZappoMan
|
7f1af81cf9
|
fixed compiler error for strict compilers
|
2013-04-08 17:08:14 -07:00 |
|
ZappoMan
|
53cfd0ecdd
|
adding CounterStats class and support for showing running average stats on voxels recieved, created, and colored in client
|
2013-04-08 17:03:22 -07:00 |
|
ZappoMan
|
5415543dcd
|
adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands
|
2013-04-06 12:03:46 -07:00 |
|
ZappoMan
|
12e06135bb
|
fixed reaverageVoxelColors() behavior. seems to work better now
|
2013-04-05 13:18:06 -07:00 |
|
ZappoMan
|
57829785eb
|
fix to LOD bug caused by flip-flopped X and Z, add color randomization to inserted voxels on server, added head position display to display_stats()
|
2013-04-04 20:50:51 -07:00 |
|
tosh
|
284530f7d6
|
tightens memory use
|
2013-04-04 11:59:16 +02:00 |
|
tosh
|
7d479af9c7
|
adjusts braces to agreed conventions
|
2013-04-04 10:52:42 +02:00 |
|
ZappoMan
|
f859d8ed9c
|
Added PaintMode, toggle for stars, etc.
|
2013-04-03 22:42:02 -07:00 |
|
Leonardo Murillo
|
56c59e9074
|
Merge branch 'master' of github.com:/worklist/hifi into 19170B
|
2013-04-03 17:18:08 -06:00 |
|
Leonardo Murillo
|
09df9d3dc7
|
Second take on avatar mixer
|
2013-04-03 15:17:15 -06:00 |
|