Stephen Birarda
|
a3883a746c
|
add the basic structure for inclusion of ancestors/descendants in ESS queries
|
2017-02-16 16:46:09 -08:00 |
|
Howard Stearns
|
a1afbe7d5e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter
|
2017-01-25 19:16:29 -08:00 |
|
Atlante45
|
529286b2ea
|
More EntityScriptServer work
|
2017-01-17 13:47:45 -08:00 |
|
howard-stearns
|
f6446c6806
|
minimum entity edit filter
|
2017-01-13 13:18:24 -08:00 |
|
Brad Davis
|
09a218b9fd
|
Fix build after moving network function
|
2016-09-23 12:05:04 -07:00 |
|
Ryan Huffman
|
727d59ab27
|
Add backup directory setting to domain server
|
2016-08-16 17:33:32 -07:00 |
|
Brad Hefta-Gaub
|
e8af41c6ab
|
more CR feedback
|
2016-04-21 15:54:51 -07:00 |
|
Brad Hefta-Gaub
|
31f9d592e0
|
support for larger than 35 minute clock skew
|
2016-04-20 18:42:00 -07:00 |
|
Stephen Birarda
|
ed9faf4189
|
add a secondary check for local IP address
|
2016-03-07 18:00:09 -08:00 |
|
Stephen Birarda
|
f44cf3903c
|
re-instate verified domain ownership for full automatic networking
This reverts commit 34408c8144 .
|
2016-03-01 13:04:37 -08:00 |
|
Stephen Birarda
|
34408c8144
|
Revert "verified domain ownership for full automatic networking"
|
2016-02-25 17:02:08 -08:00 |
|
Stephen Birarda
|
f553becabe
|
data-server name tweak and isAgent behaviour change
|
2016-02-19 16:04:45 -08:00 |
|
Stephen Birarda
|
ea9d84bdc4
|
handle downloading of absolute persist file contents
|
2016-02-03 13:18:29 -08:00 |
|
Stephen Birarda
|
2c1623ed42
|
use extension with preceeding period
|
2016-02-02 16:07:14 -08:00 |
|
Stephen Birarda
|
8ab15770b8
|
use absolutePath for absolute persist path
|
2016-02-02 15:52:12 -08:00 |
|
Stephen Birarda
|
99d1fa08fd
|
handle incorrect casing in persist file extension
|
2016-02-02 15:49:40 -08:00 |
|
Stephen Birarda
|
90b78feb1e
|
force models file to end in .json.gz
|
2016-02-02 15:37:34 -08:00 |
|
Stephen Birarda
|
4d91b8b7d6
|
fix check for existing persist file directory
|
2016-02-02 14:38:17 -08:00 |
|
Stephen Birarda
|
cfff765731
|
allow for absolute path handling at entity-server
|
2016-02-02 14:21:34 -08:00 |
|
Ryan Huffman
|
a731a571e0
|
Update entity server to always make resource directory if it does not exist
|
2016-01-26 13:50:58 -08:00 |
|
Ryan Huffman
|
996f3f5df7
|
Fix entity server data migration to work with default persist filename
|
2016-01-21 15:43:45 -08:00 |
|
Ryan Huffman
|
37cfac404e
|
Move octree server data directory to /web
|
2016-01-19 15:23:14 -08:00 |
|
Ryan Huffman
|
4afb6992c3
|
Move entities resources into /entities
|
2016-01-19 14:41:57 -08:00 |
|
Ryan Huffman
|
a9afa53fb7
|
Add migration of old octree server data
|
2016-01-14 12:57:48 -08:00 |
|
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 |
|