Simon Walton
3f894fe5fa
Merge fix
2018-04-20 11:15:59 -07:00
Simon Walton
ed0fd8c4d2
Merge fix
2018-04-20 11:13:15 -07:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
...
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
SimonWalton-HiFi
9d06890aea
Merge branch 'master' into short-id
2018-04-19 10:09:34 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Simon Walton
01c39d4310
Use NULL_LOCAL_ID in more places, as requested by review
2018-04-18 11:53:47 -07:00
Simon Walton
104788de50
Take out useless noisy message timer
2018-04-04 16:03:56 -07:00
Simon Walton
d05f0600d4
Handle one-time messages outside LogHandler class
...
Also change to std::call_once for the file-scope message IDs.
2018-04-04 15:44:47 -07:00
Stephen Birarda
3a8c9de4fb
fix some xcode warnings for unnecessary captured this
2018-04-04 10:38:32 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Simon Walton
1b0b280f3a
Fix SequenceNumberStats, misc. clean-up
2018-03-29 10:47:11 -07:00
Simon Walton
b409e04734
Handle all case of nodes being deleted from nodelist
...
Delete erased nodes from local ID mapping, as this uses
SharedPointer. Don't keep the mapping from local IDs
to UUIDs in GateKeeper as it isn't used.
2018-03-28 17:42:23 -07:00
Clement
cb07fc47dc
Fix ESS remote method calls for connect only users
2018-03-28 14:01:03 -07:00
Simon Walton
f823f63211
Add domain local ID to DomainServerList
...
Also handle domain local ID for 'domain sourced' packets;
bump packet version.
2018-03-28 13:27:43 -07:00
Simon Walton
bed4033554
Local node IDs now working correctly
...
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
2018-03-27 18:18:14 -07:00
Simon Walton
d3464378b7
Short local source IDs - checkpoint
...
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
2018-03-27 13:46:58 -07:00
Simon Walton
4ec77e3af6
WIP - assign short IDs to nodes and distribute them.
2018-03-26 14:57:59 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable
...
Merge stable back into master
2018-03-22 15:08:30 -07:00
Ryan Huffman
dc694fb0b7
Update content backup downloads to be asynchronous
...
Previously backups would be consolidated into a full .zip when the
backup was requested. Because of the potential for a large number of
assets, this could take awhile, causing a browser to fail due to timeout
before the backup was available. This change splits the download
endpoint into 2 parts - one to request information about a backup and
possibly kick off a consolidation, and another to request the actual
file once the consolidate backup is available.
2018-03-21 15:02:38 -07:00
Ryan Huffman
3a98cf284f
Fix DS not handling lowercase header keys
2018-03-16 14:30:03 -07:00
Ryan Huffman
d140ccb790
Fix constexpr compile error on Windows
2018-03-15 14:52:15 -07:00
Ryan Huffman
9275fe1f7d
Update backup downloads to use .content.zip extension
2018-03-15 12:47:51 -07:00
Ryan Huffman
bee8899c46
Add support for uploading .content.zip files
2018-03-15 12:17:21 -07:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65
...
merge back RC65 to master after RC hotfixes
2018-03-07 17:22:41 -08:00
John Conklin II
e0a11271bf
Merge pull request #12573 from birarda/bug/domain-settings-metaverse
...
fix for getSetting QVariant ref in DomainServer
2018-03-07 12:11:45 -08:00
Stephen Birarda
a83b54e10d
fix for getSetting QVariant ref in DomainServer
2018-03-06 13:55:50 -08:00
Atlante45
a23884d0e0
Prevent crash during long backup web requests
2018-03-06 13:21:02 -08:00
Atlante45
85b4c3b422
Protect session UUID from concurrent read/writes
2018-03-02 17:34:18 -08:00
Stephen Birarda
2af0e5fc2b
Merge pull request #12501 from huffman/feat/content-settings
...
Code review changes
2018-02-26 17:58:08 -07:00
Ryan Huffman
ec210e1750
Move OctreeUtils to OctreeDataUtils
2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d
Add RawEntityData subclass
2018-02-26 16:32:09 -08:00
Stephen Birarda
2872412f9c
fixes for comments from code reviews
2018-02-26 14:35:34 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
Stephen Birarda
946474c615
do not init caching for asset requests in domain-server
2018-02-21 16:33:58 -08:00
Stephen Birarda
1e36a5b218
Merge pull request #12430 from birarda/feat/pending-content-archives
...
make filename regex less restrictive
2018-02-16 18:21:56 -07:00
Stephen Birarda
2faa67c68d
make filename regex less restrictive
2018-02-16 17:01:46 -08:00
Atlante45
acc68d65c2
Backup bug fixes
2018-02-16 16:59:12 -08:00
Stephen Birarda
1c053730eb
make DomainServerSettingsManager thread-safe for use in content backup
2018-02-16 16:01:40 -08:00
Stephen Birarda
8e621a95a3
fix typo in debug for writing new entities
2018-02-16 16:01:40 -08:00
Stephen Birarda
441b55301f
cleanup LNL last during DS shutdown
2018-02-16 16:01:40 -08:00
Stephen Birarda
494f93304b
take down AssetClient after content manager
2018-02-16 16:01:40 -08:00
Stephen Birarda
de75fe8e9f
CR fix for typo in comment
2018-02-16 15:37:14 -08:00
Stephen Birarda
2020ce5907
add API to recover from content archive
2018-02-16 15:37:14 -08:00
Stephen Birarda
910f3425f8
fix latest backup refreshing with no caching
2018-02-16 15:34:55 -08:00
Stephen Birarda
b019895fce
handle entity file upload from new content upload
2018-02-16 15:34:55 -08:00
Stephen Birarda
dd5a705836
move rolling interval backup rules to automatic content archives
2018-02-16 15:34:55 -08:00
Ryan Huffman
0230abea79
Fix backup loading not getting auto backups
2018-02-16 13:54:35 -08:00
Ryan Huffman
2942a53a1d
Add recovery mode and full backup information to DS
2018-02-15 16:47:48 -08:00
Ryan Huffman
dd0b8a0c2f
Add backup download API to DS
2018-02-15 16:47:23 -08:00
Ryan Huffman
9e99c5c744
Add restart of ES during backup recovery
2018-02-15 16:47:23 -08:00
Stephen Birarda
f5cad5683d
make sure backup handlers end up on the correct thread
2018-02-15 15:39:25 -08:00
Stephen Birarda
f624e1b464
add a content settings backup handler
2018-02-15 15:10:51 -08:00
Atlante45
9fca92facd
Move EntitiesBackupHandler to its own file
2018-02-15 11:28:52 -08:00
Atlante45
d8d05fe045
Rename backup supervisor
2018-02-15 11:27:21 -08:00
Atlante45
ce93b9a1f4
Simplify BackupHandler pattern
2018-02-15 11:27:20 -08:00
Ryan Huffman
efb2473fcf
Updaet createManualBackup to defer response until creation is done
2018-02-15 11:02:55 -08:00
Ryan Huffman
b6240e8622
Move backup recover API to POST
2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec
CR
2018-02-15 10:22:35 -08:00
Ryan Huffman
dd398da2e0
Update DS to use promises for backup APIs
2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f
Add backup DS APIs
...
Add backup apis
2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80
Add BackupHandler for entity file backups
2018-02-15 10:22:35 -08:00
Atlante45
69298246c4
CR
2018-02-15 10:09:21 -08:00
Atlante45
a6447da64c
More Asset Backup work
2018-02-15 10:09:21 -08:00
Atlante45
11b7fb89a9
Integrate new backup systems
2018-02-15 10:09:21 -08:00
Ryan Huffman
0bbbff95cd
Fix replacement octree data not working
2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
ff5be2d690
Fix entity data ID sometimes being reset
2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Stephen Birarda
6240181474
initial separation of content settings and domain settings
2018-02-14 12:09:56 -08:00
Atlante45
87f77b6257
Asset Server Backup
2018-02-09 11:32:42 -08:00
Atlante45
314c51ab3b
Fix settings init in all exe
2018-01-26 15:53:08 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
Stephen Birarda
25c10d5de2
Merge pull request #11735 from highfidelity/stable
...
Merge stable back into master
2017-11-02 14:22:31 -07:00
Ryan Huffman
ed99541b5f
Fix domain info not loading for temp domains in DS settings
2017-10-29 20:47:52 -07:00
Atlante45
b0d838cb9b
Fix UNIX warning
2017-10-28 14:57:16 -07:00
Ryan Huffman
88e22f7507
Remove unneeded logging in DomainServer.cpp
2017-10-28 14:19:14 -07:00
Ryan Huffman
c42ef4f88c
Update most DS API forwarding APIs to use a single forwarding function
2017-10-27 15:53:50 -07:00
Atlante45
203a419f2a
Setup Wizard
2017-10-27 12:52:36 -07:00
Ryan Huffman
2944d76ef0
Update settings with auto domain creation and restart
2017-10-27 11:49:41 -07:00
Ryan Huffman
1bb778c21f
Fix label support in DS settings and add automatic domain generation:
2017-10-27 11:49:41 -07:00
Ryan Huffman
92aa66cdd7
Update domain settings to include domain info editing
2017-10-27 11:49:40 -07:00
Ryan Huffman
7dc475c695
Update domain server settings
...
Move requests that require access token to go through DS
Update various styling and ease of use on DS settings page
Update domain server settings
CP
CP
2017-10-27 11:49:34 -07:00
Stephen Birarda
9345f4545f
sanitize the ice-server addresses before using
2017-10-25 14:10:11 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Brad Hefta-Gaub
7cce45017b
Merge pull request #11244 from birarda/bug/ice-dns-fail
...
add a timeout for ICE server DNS lookup
2017-09-07 11:09:05 -07:00
Stephen Birarda
3003f64514
add debug for ice server lookup fail
2017-08-24 16:42:53 -07:00
Stephen Birarda
c7affea411
add a timeout for ICE server DNS lookup
2017-08-24 16:40:16 -07:00
Stephen Birarda
133b7e66b7
adjust a comment and remove some debug
2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc
add additional IP check to DS packet filter operator
2017-08-23 15:32:25 -07:00
Stephen Birarda
2d0c5ff37a
remove preloading of allowed user keys since it happens on connect
2017-07-25 11:41:34 -07:00
Stephen Birarda
d22b146370
Merge pull request #10845 from birarda/bug/domain-cookie-restart
...
fix for OAuth OPTIONS firing every XHR 302
2017-07-06 17:22:03 -07:00
Stephen Birarda
6d98d20b12
cleanup bad QEventLoop::exec() OAuth handling code
2017-07-06 16:19:47 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
utkarshgautamnyu
9d2fe8da9c
Update DomainServer.cpp
2017-07-05 18:02:44 -07:00
Atlante45
5c731636b1
Sandbox restarts crashed processes
2017-06-29 12:13:52 -07:00
Stephen Birarda
cf92144748
fix for OAuth OPTIONS firing on XHR 302
2017-06-28 14:13:09 -07:00
Stephen Birarda
86eb5b14ca
disable the user activity logger in DS/AC/ac-client
2017-06-28 13:19:58 -07:00
Seth Alves
8510b60a87
Merge pull request #10789 from sethalves/fix-domain-server-ice-messages
...
fix the messages printed by domain-server about which name it's using to find ice-servers
2017-06-22 17:59:09 -07:00
Seth Alves
f1c7d54010
fix the messages printed by domain-server about which name it's using to find ice-servers
2017-06-22 13:53:06 -07:00
Stephen Birarda
0c7baa3ce4
remove an extra blank line
2017-06-22 13:36:58 -07:00
Stephen Birarda
dd44a81791
verify that replication server type is also present
2017-06-22 13:36:24 -07:00
Stephen Birarda
ea45e341ee
send upstream nodes down to avatar/audio
2017-06-22 13:33:57 -07:00
seefo
48b5989b60
add upstream nodes to domain nodelist
2017-06-22 13:33:57 -07:00
Stephen Birarda
c516dd06e4
Merge pull request #10714 from highfidelity/replicants
...
add broadcasting/replication to downstream avatar mixers and audio mixers
2017-06-21 17:55:07 -07:00
Stephen Birarda
aeb3f443f8
address code review comments
2017-06-21 16:14:14 -07:00
seefo
0c7f1cda0f
Added a restart button to domain server settings page
2017-06-19 15:01:50 -07:00
Stephen Birarda
ea6a38148c
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
2017-06-15 14:30:08 -07:00
Ryan Huffman
330a27b3a0
Fix removing all downstream nodes in settings not killing nodes
2017-06-15 14:27:01 -07:00
Stephen Birarda
94abfc2d6b
nomenclature changes from replication to broadcast
2017-06-15 11:47:13 -07:00
Stephen Birarda
10649c8f6e
change new Node flag to isForcedNeverSilent
2017-06-14 17:20:37 -07:00
Stephen Birarda
224a559602
keep downstream nodes around in domain, alive in upstream
2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f
Move downstram server adding to DS
2017-06-14 16:54:04 -07:00
Stephen Birarda
e818a511b9
cleanup debug in updateReplicatedNodes
2017-06-14 15:07:48 -07:00
Stephen Birarda
54832d995d
fix a typo in shouldReplicateNode
2017-06-14 15:05:58 -07:00
Ryan Huffman
67113330b3
Make replicated username list case insensitive
2017-06-14 15:03:54 -07:00
Ryan Huffman
8d5dc21de8
Fix replicated nodes not being properly updated when logging in or changing settings
2017-06-14 15:03:53 -07:00
Ryan Huffman
7f75a5f7f5
Make replicated username list case insensitive
2017-06-14 13:57:04 -07:00
Ryan Huffman
59a420a358
Fix replicated nodes not being properly updated when logging in or changing settings
2017-06-14 13:53:50 -07:00
Ryan Huffman
029e6de2a0
Fix replicated users not being checked after username verified
2017-06-13 17:18:29 -07:00
Ryan Huffman
ea56c568a7
Add support for replicating by username
2017-06-13 17:18:28 -07:00
Ryan Huffman
84e1a6f893
Rename isReplicant to isReplicated
2017-06-12 13:38:58 -07:00
Ryan Huffman
ff2800e8d5
Add isReplicant to Node
2017-06-12 13:37:49 -07:00
seefo
8a8f971186
empty passwords will no longer allow any password to pass DS HTTP auth
2017-05-23 12:01:00 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07:00
Stephen Birarda
a21a34a4a4
add entities file replacement to DS and ES
2017-04-27 16:56:27 -07:00
Zach Pomerantz
808973d7d2
use QStandardPaths instead of hardcoded paths
2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0
move resource paths to PathUtils
2017-03-13 17:26:34 -04:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
Stephen Birarda
9b8cbba53f
add isInInterestSet to DomainServer for extra checks
2017-01-24 18:32:33 -08:00
Stephen Birarda
e511b6e84c
cleanup connect check in DomainServer
2017-01-24 17:14:05 -08:00
Stephen Birarda
fc42c1bc94
don't tell ESS about script Agents that won't talk to it
2017-01-24 17:10:05 -08:00
Stephen Birarda
1802e1520d
change some dynamic_cast to static_cast for DomainServerNodeData
2017-01-23 13:15:48 -08:00
Stephen Birarda
fb8d2e34fb
fix needless reinterpret_cast for DomainServerNodeData
2017-01-23 13:14:53 -08:00
Ryan Huffman
b6893a0100
Keep Agents and EntityScriptServers from connecting if lacking permissions
2017-01-19 14:35:27 -08:00
Atlante45
529286b2ea
More EntityScriptServer work
2017-01-17 13:47:45 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
Brad Davis
2d73588361
Fix stat tracker missing in agents
2016-12-16 17:34:00 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
Atlante45
3035d43772
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-21 13:05:08 -08:00
Stephen Birarda
39afb24982
explictly remove Agent from NIS for other Agents
2016-11-15 10:37:19 -08:00
Stephen Birarda
1791a1c1fe
never send agents to other agents
2016-11-15 10:15:17 -08:00
Ryan Huffman
528b8e93f0
Remove extraneous logging in DomainServer for whitelist
2016-11-11 14:33:34 -08:00
Ryan Huffman
fc1a7255f6
Remove unneeded 'this->'
2016-11-11 14:24:28 -08:00
Ryan Huffman
d522d03bd2
Add repeated message suppression to request assignment packets
2016-11-11 11:29:52 -08:00
Ryan Huffman
bd1bcaf1a4
Clean up subnet whitelist implementation
2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302
Update naming for subnet whitelist in ds
2016-11-11 10:32:45 -08:00
Ryan Huffman
ca6a74d63d
Add whitelist filtering to assignment requests
2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca
Add ip address whitelist processing to domain server
2016-11-11 10:19:21 -08:00
Atlante45
ae29fe8ab2
Logging improvements
2016-11-04 14:26:19 -07:00
Stephen Birarda
5562d7e7a6
add a filter operator to decide if connections are created
2016-10-14 14:46:58 -07:00
Ryan Downe Karpf
397816679d
Merge pull request #8790 from huffman/feat/reliable-path-queries
...
Update ds path queries to be reliable
2016-10-13 09:21:44 -07:00
Ryan Huffman
a44653db57
Update ds path queries to be reliable
2016-10-12 10:47:42 -07:00
Atlante45
5bae69bb51
Fix DS
2016-10-12 10:20:19 -07:00
Atlante45
eaca3b672f
Switch to JSON for application settings
2016-10-12 10:20:19 -07:00
Seth Alves
e9961110e9
if we have new ice-server information, retry right away, even if the previous attempt failed
2016-10-10 15:40:59 -07:00
Seth Alves
9712301172
avoid a race that can cause metaverse to not have correct ice-server information about a domain
2016-10-10 11:54:33 -07:00
Thijs Wenker
7e3073e163
fix spelling bugs
2016-09-29 22:13:27 +02:00
Seth Alves
8cadd299a2
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1
2016-09-23 13:16:26 -07:00
Seth Alves
bd2ee56a27
fix domain-server command-line arguments
2016-09-22 12:45:49 -07:00
Seth Alves
7dc8a48dba
Merge branch 'ice-troubles' of github.com:sethalves/hifi into ice-troubles-1
2016-09-21 10:08:17 -07:00
Seth Alves
b9ea93de57
use qWarning rather than qCritical because qCritical may exit
2016-09-21 10:08:02 -07:00
Seth Alves
a3aea774fe
tell metaverse ice-server is 0.0.0.0 when domain-server doesn't have one
2016-09-21 10:07:12 -07:00
Seth Alves
ba8aa5b50c
fix camelcase
2016-09-19 16:38:34 -07:00
Seth Alves
571aaac4d7
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles
2016-09-19 15:37:53 -07:00
Seth Alves
8108557e10
whitespace
2016-09-19 15:37:50 -07:00
Brad Hefta-Gaub
fd474f6319
add basic support for master vs stable builds
2016-09-19 14:14:32 -07:00
Seth Alves
45b48c01bf
command-line arguments to control ice-server ip address and domain-server ID
2016-09-19 13:39:42 -07:00
Brad Hefta-Gaub
3d54600843
Merge pull request #8513 from Atlante45/feat/network-port
...
Add settings to change local port
2016-09-08 18:10:32 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd
Use invalid port to signal no value passed
2016-09-06 11:59:07 -07:00
Stephen Birarda
43b8e01d46
don't force auto networking on non metaverse domains
2016-08-23 11:21:15 -07:00
Stephen Birarda
d098a1ae28
allow temporary domains to use an access token when present
2016-08-22 10:50:39 -07:00
Zander Otavka
3df8aa0dba
Suppress repeated ice server connection messages
2016-08-08 17:01:32 -07:00
Stephen Birarda
f3e30221f0
only force a new temp name if already a temp domain-server
2016-08-04 09:33:31 -07:00
Stephen Birarda
ba49fd2c61
don't heartbeat immediately unless metaverse domain
2016-08-04 09:33:31 -07:00
Stephen Birarda
5b04ab6d53
add node kick request handling to DS
2016-08-02 14:35:11 -07:00
Seth Alves
60d6673950
switch data-web urls to point at production server rather than dev one
2016-08-01 12:00:08 -07:00
Seth Alves
96fd1cb841
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-22 11:40:29 -07:00
Howard Stearns
51bc3c51ca
less logging, change constant name.
2016-07-21 08:35:21 -07:00
Seth Alves
c1b27a9249
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-20 10:03:22 -07:00
howard-stearns
98f76924c5
log hearbeat like we do updates
2016-07-18 14:49:56 -07:00
howard-stearns
1a66574adb
add protocol version signature to metaverse heartbeat
2016-07-18 14:29:49 -07:00
Seth Alves
599b892296
refresh cached group information every 15 seconds
2016-07-14 11:20:57 -07:00
Seth Alves
0e86be8660
use dev metaverse
2016-07-13 14:48:23 -07:00
Seth Alves
02ce2468df
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-12 13:46:29 -07:00
Clément Brisset
2f07f0d24f
Revert "Revert "Fix crash in packet list""
2016-07-12 11:39:16 -07:00
Clément Brisset
d933238bda
Revert "Fix crash in packet list"
2016-07-08 18:15:14 -07:00
Atlante45
97da515585
Assign random UUID to DS without one.
2016-07-08 15:15:58 -07:00
Seth Alves
55d76abf48
back-out accidently changed api urls
2016-07-06 16:42:31 -07:00
Seth Alves
e6f456f494
each rank in a group has its own permissions
2016-07-06 16:39:08 -07:00
Seth Alves
aae42e3802
updates to track zach's changes to api
2016-06-30 16:14:46 -07:00
Seth Alves
408a77dd13
merge from upstream
2016-06-29 18:49:33 -07:00
Seth Alves
d4cc4bf1e4
represent node permissions as a bitfield rather than a list of bools
2016-06-27 14:55:13 -07:00
Brad Hefta-Gaub
cea4b27b4d
Merge pull request #8128 from zzmp/feat/heartbeat-build-version
...
add build version to heartbeat
2016-06-24 12:20:16 -07:00
Zach Pomerantz
1fcd7aa0c4
add build version to heartbeat
2016-06-23 19:55:16 -07:00
