Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 04:00:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64851 commits 72 branches 59 tags 1.2 GiB
Commit graph

243 commits

Author SHA1 Message Date
Ryan Huffman
4851def51c Add status HTTP server to AC Monitor 2016-01-08 10:35:04 -08:00
Atlante45
2c8be15e66 Unnecessary shutdown (Already shutting down) 2015-12-16 15:56:22 -08:00
Atlante45
b709c8162c Fix node flapping race 2015-12-16 14:27:26 -08:00
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -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
Brad Hefta-Gaub
4497d21aec remove nodes that disconnect from out viewer stats 2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub
08ba535c38 add some basic send tracking 2015-12-02 13:43:05 -08:00
Stephen Birarda
27227181f0 fix for infinite loop in OctreeeInboundPacketProcessor 2015-12-01 10:45:19 -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
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
Brad Hefta-Gaub
e318537af4 Merge pull request #6425 from birarda/handshake-ds-settings 
fix case where servers could run without settings
 2015-11-19 10:10:28 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
Brad Hefta-Gaub
456da661ff implement support to download the persist file from entity server status page 2015-11-18 17:30:07 -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
3ba0c9d042 resolve conflicts on merge with upstream master 2015-11-18 15:29:39 -08:00
Stephen Birarda
20485b817c use safer domain-server settings request in entity-server 2015-11-18 15:27:57 -08:00
Stephen Birarda
c21fbc9a46 fix for messages-mixer bail early on empty settings 2015-11-17 18:53:23 -08:00
Brad Hefta-Gaub
83e7eb58b9 add special packets and nack packets to outbound stats 2015-11-12 16:36:06 -08:00
Brad Hefta-Gaub
3718149157 include inbound queue PPS stats in server stats page 2015-10-15 15:49:12 -07:00
Brad Hefta-Gaub
e1570e3197 include inbound queue PPS stats in server stats page 2015-10-15 15:31:52 -07:00
Brad Hefta-Gaub
82a211174b added packet recieved,lost,recovered stats to detailed server stats page 2015-10-15 15:23:12 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Hefta-Gaub
0aed08a006 more robust handling of readConfiguration 2015-09-15 16:52:15 -07:00
Brad Hefta-Gaub
4a24a3767b couple of entity server corner cases 2015-09-15 16:17:05 -07:00
Brad Hefta-Gaub
22b979a663 couple of entity server corner cases 2015-09-15 16:02:22 -07:00
Stephen Birarda
d189fb932f Merge pull request #5785 from Atlante45/protocol 
Update AssetServer stats with units
 2015-09-14 11:18:23 -07:00
Brad Davis
e458eb7ae9 Merge pull request #5734 from sethalves/octree-shared-pointers 
octree uses shared pointers
 2015-09-11 16:00:04 -07:00
Atlante45
8ee56b59c9 Update AssetServer stats with units 
Also removed array for better layout
 2015-09-11 22:33:58 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
801f32295d Update JSON stats building 2015-09-11 14:21:54 +02:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Seth Alves
4a456488a1 remove the option to persist entities as anything other than json.gz files 2015-08-17 14:01:25 -07:00
Stephen Birarda
67294d3a23 rename nodesToKill to nodesToShutdown 2015-07-22 13:55:22 -07:00
Stephen Birarda
55b4784a02 avoid entity-server node/octree deadlock on shutdown 2015-07-22 13:52:49 -07:00
Stephen Birarda
29f91267d9 repairs to nack packet receiving for entity-server 2015-07-16 15:29:50 -07:00
Stephen Birarda
010cbd9934 don't handle octree query while server shutting down 2015-07-16 14:42:16 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -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
10c5589629 Update OctreeServer to use dynamic_cast 2015-07-14 14:26:06 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Ryan Huffman
b45af742ef Remove datagram processing from OctreeServer 2015-07-14 09:37:09 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Ryan Huffman
c86e481d4f Update OctreeServer packet receive handling 2015-07-10 17:28:27 -07:00
Ryan Huffman
09f978207b Add packet handling to OctreeServer 2015-07-10 12:23:58 -07:00
Atlante45
e2718d5c94 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-08 18:26:36 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00
ZappoMan
ce613d59fd add inbound edit packet queue depth to entity server 2015-07-01 14:46:37 -07:00
Seth Alves
f9618ca2cb implicit cast 2015-06-18 10:07:12 -07:00
Seth Alves
7391aebf60 fix change that introduced interger division 2015-06-17 06:51:38 -07:00
Seth Alves
fdd5953e44 fix change that introduced interger division 2015-06-17 06:48:06 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Stephen Birarda
2dc866755d fix OS comments, remove test call from Agent 2015-05-11 09:56:10 -07:00
Stephen Birarda
3d06a86670 drop packets on floor when shutting down 2015-05-08 11:57:25 -07:00
Stephen Birarda
0f71e93c7f ensure no new OST creation on OctreeServer shutdown 2015-05-08 10:12:14 -07:00
Stephen Birarda
d75d204ff6 standardize cleanup of ThreadedAssignments 2015-05-07 17:03:43 -07:00
Stephen Birarda
bfccf02912 use lamdbas for linkedDataCreateCallback 2015-05-07 15:37:02 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Seth Alves
e985f56b12 cleanups 2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71 all 4 types of assignment-client appear to exit cleanly, now 2015-04-29 15:16:00 -07:00
Seth Alves
e7d8bccd5d cleanups 2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405 types 0 and 1 exit cleanly, type 6 crashes 2015-04-29 11:56:45 -07:00
Stephen Birarda
61806935bb add a networking constants class with metaverse URL 2015-03-31 16:40:21 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
Atlante45
7b5babb02a Set AddressManager before NodeList 2015-01-14 15:46:33 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
ZappoMan
bdfe02bbd0 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h
 2014-11-17 11:22:00 -08:00
ZappoMan
f44513ebe7 added support for rolling version numbers in backups 2014-11-15 22:55:12 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
ZappoMan
cd4b267732 implement persist backup 2014-11-14 11:11:32 -08:00
ZappoMan
11058355a0 implement aboutToFinish for persist thread to allow final save before shutdown 2014-11-14 09:55:32 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
Stephen Birarda
881d03b11d migrate EntityServer and OctreeServer to tbb concurrent map 2014-11-06 13:54:40 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
ZappoMan
e9a332de4d make entity and voxel servers support domain based configuration 2014-11-05 12:12:17 -08:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00