Commit graph

51 commits

Author SHA1 Message Date
ZappoMan
fe8b6f7d63 * Moved load file and create sphere from VoxelSystem to VoxelTree
* Added --local command line support to domain and voxel servers so that
  you can run them locally without recompiling.
* made command line option parsing more cross platform
* added --NoColorRandomizer to interface when loading local models
* added -i file load support to voxel server to load in a preexisting model at launch
* added --NoRandomVoxelSheet to voxel server to NOT create the built in voxel sheet
* added first cut at 'I' command from clients to voxel server to insert voxels into voxel tree
* changed ambient light settings in interface to not be so aggressive
* added randInIntRange() helper to SharedUtils
* tweat to pruneTree() to also repair child mask
* some coding standard refactoring
2013-03-28 13:54:28 -07:00
Stephen Birarda
9eac649268 merge Leo's ID additions to DS 2013-03-25 16:27:25 -07:00
Stephen Birarda
507b6e0064 use abstracted DS check in method from AgentList 2013-03-25 16:24:14 -07:00
Leonardo Murillo
54a946ee80 Splitting line, adding agentId to copy constructor and swap 2013-03-25 15:54:08 -06:00
Leonardo Murillo
61c866a34c Handling increase of id smarter 2013-03-22 16:57:30 -06:00
Leonardo Murillo
ed7234d56a Fixing index 2013-03-22 13:50:32 -06:00
Leonardo Murillo
e5b0843212 Resolving conflicts 2013-03-22 13:40:16 -06:00
Leonardo Murillo
dc92f0be42 More agent IDing around the code 2013-03-22 13:34:35 -06:00
Stephen Birarda
dd37d60b65 remove extra _WIN32 declaration 2013-03-22 10:47:15 -07:00
Leonardo Murillo
e3d842dff7 Packing agent ID on domain broadcast packet 2013-03-22 11:43:16 -06:00
Leonardo Murillo
a76f8a46cd Handle new and existing agent Ids 2013-03-22 11:20:45 -06:00
Leonardo Murillo
d8b80006b8 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-21 14:25:35 -06:00
Leonardo Murillo
203bf333c4 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-20 20:53:16 -06:00
Kees van Prooijen
9ae11ffe77 more windows port 2013-03-20 12:13:14 -07:00
Stephen Birarda
c7213d6593 conditionally include winsock2.h instead of UNIX socket stuff 2013-03-19 11:46:53 -07:00
Kees van Prooijen
cd27c74a2d prelimanary changes for windows port 2013-03-19 11:01:08 -07:00
Leonardo Murillo
9e0df2dbd1 Add unique id to agents and broadcast back 2013-03-18 17:10:05 -06:00
Stephen Birarda
9167c8e038 force STDOUT buffer flush on newline 2013-03-13 13:30:45 -07:00
Stephen Birarda
971f5b6ad6 recreate the newestSoloAgents map for each broadcastPacket 2013-02-26 16:55:39 -08:00
Stephen Birarda
1783ee5f85 send interface client position to audio mixer 2013-02-26 13:13:40 -08:00
Stephen Birarda
b6d255477b remove extraneous logging for Domain server solo agents 2013-02-25 13:06:44 -08:00
Stephen Birarda
d211eb6c84 use getters and setters for all member variables in AgentList and Agent 2013-02-25 12:51:52 -08:00
Stephen Birarda
1317be2382 domain server only returns newest of types in SOLO_AGENT_TYPES_STRING 2013-02-25 11:52:38 -08:00
Stephen Birarda
16bdacb8bf add missing byte to domain server packets 2013-02-22 16:14:47 -08:00
Stephen Birarda
6a16d6e3bb clean up agent killing/re-adding for interface and domain 2013-02-22 14:54:19 -08:00
Stephen Birarda
92f5c88ab7 have domain server remove dead agents from list 2013-02-22 13:43:29 -08:00
Stephen Birarda
9ec51116d5 fix unecessary copy of Agent, blow away linkedData to rebuild it 2013-02-21 14:36:53 -08:00
Stephen Birarda
060f4dceca use AgentData class to abstract implemenation of linked data 2013-02-21 12:56:57 -08:00
Stephen Birarda
c57380012e hook domain server up to AgentList, pack sockets 2013-02-20 18:32:23 -08:00
Stephen Birarda
8c8309c1f4 add some comments to the CMakeLists files 2013-02-18 11:08:12 -08:00
Stephen Birarda
fd73b8de82 always store ports as unsigned short ports 2013-02-18 09:50:15 -08:00
Stephen Birarda
612662c475 actually allocate memory for the agent private address 2013-02-18 09:36:47 -08:00
Stephen Birarda
0cea1e80ff fix memory overwrite in domain server 2013-02-18 09:30:50 -08:00
Stephen Birarda
d1433aa2bd a bad version of UDP hole punching for local agents 2013-02-18 08:53:16 -08:00
Stephen Birarda
1e4213b676 fix UDPSocket pointer to pointer, use in domain 2013-02-14 18:34:24 -08:00
Stephen Birarda
c50252322e remove the test domain and mixer triggers 2013-02-14 17:02:30 -08:00
Stephen Birarda
5f1b7449e4 test jenkins upstream job block 2013-02-14 16:54:57 -08:00
Stephen Birarda
d840b2baa9 remove the test trigger, we are good to go 2013-02-14 15:58:38 -08:00
Stephen Birarda
ac363ef517 another trigger test 2013-02-14 15:57:18 -08:00
Stephen Birarda
19301e7f54 another change to hopefully trigger jobs 2013-02-14 15:54:46 -08:00
Stephen Birarda
b1cea687f1 modify trigger to push domain build and deploy 2013-02-14 15:49:50 -08:00
Stephen Birarda
612c95c83f attempt to trigger a domain server build 2013-02-14 15:47:24 -08:00
Stephen Birarda
0dcf774262 link hifi shared libs to domain project 2013-02-14 15:41:30 -08:00
Stephen Birarda
9c822b9d58 dynamic switchover of audio mixer 2013-02-13 20:43:10 -08:00
Stephen Birarda
7f35fe9993 fix agent comparison for add of agent 2013-02-13 20:17:35 -08:00
Stephen Birarda
9de42bdf75 same IP but different port is a new agent 2013-02-13 19:36:42 -08:00
Philip Rosedale
ecc7eee161 changed to EC2 domain server by default in interface, increased domain server keep alive timeout to 5 seconds. 2013-02-13 10:53:03 -08:00
Philip Rosedale
8d5a53b2c9 Added agent type to domain server, interface client 2013-02-12 20:48:09 -08:00
Philip Rosedale
6f9d223454 Fixed network-to-host byte order problems when storing ports. 2013-02-12 10:58:30 -08:00
Philip Rosedale
b58bb6fe80 Head data streaming to other users, domain server improved, network.cpp removed and replaced with UDPSocket objects, input audio drives mouth color and size. 2013-02-12 01:41:36 -08:00