Commit graph

72 commits

Author SHA1 Message Date
howard-stearns
f9f0a4ea2d fix startup-failure case 2017-01-26 14:05:16 -08:00
howard-stearns
b62f3e550a error check/log on execution, too 2017-01-25 16:23:07 -08:00
howard-stearns
34e9c5debc initial script error checking 2017-01-25 14:56:06 -08:00
howard-stearns
df91ef5f5f blocking fetch of http scripts 2017-01-25 14:22:42 -08:00
howard-stearns
8eff3b1e83 restructure initialization so that server can do server-like things to get
the filter program from file
2017-01-24 16:14:41 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
Seth Alves
bade215907 maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour 2016-06-09 10:41:30 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Andrew Meadows
b4edfe2390 no expiry for simulation ownership 2016-02-25 12:07:20 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Seth Alves
4e74c98ae7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-03 11:00:13 -08:00
Brad Hefta-Gaub
4497d21aec remove nodes that disconnect from out viewer stats 2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub
1e51a90204 add edit times and entity ids to the viewer stats 2015-12-02 14:43:00 -08:00
Brad Hefta-Gaub
08ba535c38 add some basic send tracking 2015-12-02 13:43:05 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Stephen Birarda
b34934b849 resolve conflicts on merge with upstream/master 2015-11-20 11:52:53 -08:00
Ryan Huffman
07d21514c5 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-19 10:47:37 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Stephen Birarda
3773995bb7 remove true return for readAdditionalConfiguration 2015-11-18 15:41:27 -08:00
Stephen Birarda
20485b817c use safer domain-server settings request in entity-server 2015-11-18 15:27:57 -08:00
Brad Hefta-Gaub
e7a8df306c fix warnings 2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub
b6b5a5b1c2 add comment 2015-11-12 18:28:08 -08:00
Brad Hefta-Gaub
ecaa50c0ff fix for infinite loop in erase entities special packet 2015-11-12 18:25:18 -08:00
Brad Hefta-Gaub
bdfe304f7a remove some logging 2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00
Brad Hefta-Gaub
006a1d60c8 keep some additional erase entities history and send to viewers 2015-11-10 15:31:51 -08:00
Seth Alves
264b658132 hook up entities and avatars to SpatialParentFinder 2015-10-22 11:05:48 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Brad Hefta-Gaub
0aed08a006 more robust handling of readConfiguration 2015-09-15 16:52:15 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
2015-07-14 14:53:45 -07:00
Ryan Huffman
24dddac6b2 Fix call to register for multiple packet types 2015-07-14 14:41:28 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Ryan Huffman
921ee02414 Update EntityServer to use only 1 packet callback for all packet types 2015-07-14 14:25:09 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
2015-07-14 10:21:31 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Ryan Huffman
591c5d4b60 Fix EntityServer compilation errors 2015-07-13 12:06:43 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Ryan Huffman
28f6c4021b Fix compilation errors in EntityServer 2015-07-10 17:27:56 -07:00
Ryan Huffman
1ee7a83927 Add EntityServer packet handling 2015-07-10 12:23:35 -07:00
Atlante45
c77310019d Some .get() cleanup 2015-07-09 14:03:32 -07:00
Stephen Birarda
806862fae9 pass existing SharedNodePointer from EntityServer 2015-07-09 11:50:39 -07:00