Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 13:38:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25224 commits 76 branches 59 tags 1.2 GiB
Commit graph

420 commits

Author SHA1 Message Date
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Atlante45
1399de52a5 Only use limited nodelist in DS 2015-01-14 14:24:54 -08:00
Atlante45
48f1cbe644 Fixed QSharedPointer in connect() 2015-01-13 20:54:15 -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
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Stephen Birarda
66b1886b44 don't add the unused assignment type to DS queue 2014-12-19 12:33:26 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
aa0998dc7d Moved LimitedNodeList into DM 2014-12-18 10:32:34 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Atlante45
fcb8bf6425 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2014-12-17 10:28:17 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Stephen Birarda
77bc00e410 a simple model for persistent scripts in domain-server 2014-12-16 18:34:39 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Stephen Birarda
49a087018f fix for delayed heartbeats, late socket lookup 2014-12-03 08:22:50 -08:00
Stephen Birarda
8449575fa2 fix for ice-server heartbeat without an access token 2014-12-01 09:25:21 -08:00
Stephen Birarda
59432e8d29 complete sharing of local domain-server port to local AC 2014-11-30 17:54:10 -08:00
Stephen Birarda
fed7d789f6 have the domain-server write its local port into shared memory 2014-11-30 17:29:18 -08:00
Stephen Birarda
dff5695965 have domain server report its ID at /id 2014-11-21 16:20:44 -08:00
Stephen Birarda
8a69f0de61 test for android figuring out about audio-mixer 2014-11-18 17:36:53 -08:00
Stephen Birarda
996c76c723 repairs for node teardown on domain dissappear or node disconnect 2014-11-06 16:05:01 -08:00
Stephen Birarda
e92376cf64 distinguish between eachNode and eachNodeBreakable 2014-11-06 13:41:55 -08:00
Stephen Birarda
270823be43 update domain-server to leverage intel tbb hash 2014-11-06 13:39:15 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
Stephen Birarda
d671dec61b fix for ice server sock addr in domain-server 2014-11-04 13:21:48 -08:00
Stephen Birarda
96dd1eaf76 report restricted access state from domain-server in heartbeat 2014-11-03 16:57:10 -08:00
Stephen Birarda
0348251cc1 allow case insensitivity for allowed users in domain-server 2014-11-03 15:32:45 -08:00
Stephen Birarda
2250cdfcc2 have the domain-server unverifiably heartbeat the number of connected users 2014-11-03 14:50:45 -08:00
Stephen Birarda
22f4e8ec70 cleanup heartbeat method names 2014-11-03 14:37:56 -08:00
Stephen Birarda
eb856095a9 fix the domain server heartbeat timer 2014-11-03 12:49:24 -08:00
Stephen Birarda
d50a8f6309 send a heartbeat to data server every 15s 2014-11-03 12:40:56 -08:00
Stephen Birarda
e53ad09b3f rename the automatic networking update method to heartbeat 2014-11-03 12:24:17 -08:00
AndrewMeadows
415c7375cb Merge pull request #3614 from ZappoMan/removeParticles 
Remove particles
 2014-10-17 15:53:19 -07:00
Stephen Birarda
c89daa30da fix another dumb conditional mistake in domain-server 2014-10-17 11:07:02 -07:00
Stephen Birarda
9a842e2202 flip domain-server local connect conditional 2014-10-17 10:52:36 -07:00
Stephen Birarda
d00e11541e fix for pub key format returned to data-server 2014-10-17 09:39:04 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -07:00
Stephen Birarda
9a3ba972e1 preload the public keys for allowed users to allow immediate connection 2014-10-15 10:21:11 -07:00
Stephen Birarda
1613b16a93 remove another extra space 2014-10-15 09:51:52 -07:00
Stephen Birarda
3800389eb4 fix a bad equality check on QJsonObject 2014-10-15 09:51:40 -07:00
Stephen Birarda
4d8e44afd1 remove an extra space 2014-10-15 09:19:02 -07:00
Stephen Birarda
50f27d3e16 handle verification of username signature during connection 2014-10-14 18:02:22 -07:00
Stephen Birarda
e3ba8cddbb store returned public keys in domain-server 2014-10-14 16:35:07 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
ZappoMan
c36bcf2d7e removing particles 2014-10-13 14:11:11 -07:00
Stephen Birarda
f637f5a4a6 always allow connection from localhost user 2014-10-09 17:07:32 -07:00
Stephen Birarda
0d2b1e361c have domain-server reply back with username request is allowed_users is not empty 2014-10-09 16:29:52 -07:00
Stephen Birarda
b368e866fb change oauth request packet type to username request 2014-10-08 14:26:23 -07:00
Stephen Birarda
78920234bb handle changed domain-server port on start 2014-10-06 14:49:15 -07:00
Stephen Birarda
3cd71a33c9 disable ephemeral port for DS until ACs can discover 2014-10-06 12:28:44 -07:00
Stephen Birarda
319cf34b83 use an ephemeral port when using auto-networking for domain-server 2014-10-06 12:24:18 -07:00
Stephen Birarda
253fe53571 cleanup a couple of debug lines 2014-10-06 12:24:12 -07:00
Stephen Birarda
484c0d30cb don't require refresh of NetworkAccessManager, should handle restarts 2014-10-06 09:54:52 -07:00
Stephen Birarda
89cc7c7b0d add an optional forced reset of NetworkAccessManager 2014-10-06 09:35:44 -07:00
Stephen Birarda
0459254e3f fix connection to slot for local addr update, refresh AcctManager after restart 2014-10-06 09:24:48 -07:00
Stephen Birarda
b61e659382 send an ICE heartbeat anytime the domain-server local socket changes 2014-10-06 09:18:50 -07:00
Stephen Birarda
8ce474d3e1 make the ice server const scoped to remove warning 2014-10-03 15:29:16 -07:00
Stephen Birarda
4e0bb94cdd fix for double ICE connect attempts from domain-server 2014-10-03 15:25:47 -07:00
Stephen Birarda
f673ab316a tell the data-server about auto networking change to full 2014-10-03 15:06:27 -07:00
Stephen Birarda
52ec949aac Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-03 11:26:23 -07:00
Stephen Birarda
d02795cc85 have data-web respond with ice server hostname to use for connection 2014-10-03 10:48:09 -07:00
Stephen Birarda
cb6e420392 fix for peer addition from ice-server 2014-10-03 09:50:58 -07:00
Stephen Birarda
d9e0c91e02 remove a peer in domain-server after max connection attempts 2014-10-03 09:45:44 -07:00
Stephen Birarda
720f8ecae8 handle case where access_token is empty 2014-10-03 09:08:27 -07:00
Stephen Birarda
1a1ae43bc7 send back to the network peer on established sock addr if it exists 2014-10-03 09:02:18 -07:00
Stephen Birarda
49d081088a mode nodes to connected hash upon ping reply receipt 2014-10-03 08:58:03 -07:00
Stephen Birarda
15cc08da97 initial handling of ping replies in domain-server 2014-10-02 17:21:11 -07:00
Stephen Birarda
0d4ef4aaca ping connecting ICE peers from domain-server 2014-10-02 17:18:05 -07:00
Stephen Birarda
63877b0756 handle domain connection via ICE from NodeList 2014-10-02 16:51:12 -07:00
Stephen Birarda
c7aaf0ce4a handle ping out from node requiring ice connection to domain 2014-10-02 16:24:46 -07:00
Stephen Birarda
6425276eb0 have domain-server using full networking heartbeat with ice-server 2014-10-02 14:33:39 -07:00
Stephen Birarda
9baf983d07 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 10:47:54 -07:00
Stephen Birarda
4749fdb0ba allow calls to HTTPManager to skip the subHandler and ask for direct processing 2014-10-02 10:38:46 -07:00
Stephen Birarda
157fdf6afa cleanup debug for script path 2014-10-02 10:17:31 -07:00
Stephen Birarda
89907136fa one more debug line for script redirect 2014-10-02 10:15:12 -07:00
Stephen Birarda
b6e0b08a29 add debug to domain server if script not saved 2014-10-02 10:07:02 -07:00
Stephen Birarda
e88b3311ad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 09:20:08 -07:00
Stephen Birarda
d6572c3e2e handle automatic networking changes with data-server 2014-10-01 16:38:44 -07:00
Stephen Birarda
15156519b3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-01 16:19:16 -07:00
Stephen Birarda
3292808342 update domain network address updating for IP auto networking 2014-10-01 16:19:10 -07:00
Stephen Birarda
d5b0904d7a handle new automatic networking option in domain-server 2014-10-01 12:08:19 -07:00
Stephen Birarda
a0487e0a57 send public and local sockets to data-server in new format 2014-10-01 10:42:14 -07:00
Stephen Birarda
0174a985ee add a domain-server scripts folder that is ignored for clean symlink 2014-10-01 09:56:13 -07:00
Stephen Birarda
fed7dad2b6 use an auto_ptr to be able to reset the AccountManager 2014-09-30 14:36:32 -07:00
Stephen Birarda
3969c8bfe0 don't allow a username and password for domain auth, require access token 2014-09-30 12:23:04 -07:00
Stephen Birarda
68a70cc914 don't use dashes in settings JSON keys 2014-09-30 09:40:54 -07:00
Stephen Birarda
bd4a32551b fix for settings save without organization 2014-09-29 10:09:33 -07:00
Stephen Birarda
5e2870ac5f require a distinction between master config and user config 2014-09-29 09:30:08 -07:00
Stephen Birarda
ae542419d1 fix for static assignments from queue 2014-09-26 16:36:18 -07:00
Stephen Birarda
9e02a36d3d fix for domain-server allowed roles 2014-09-26 16:23:57 -07:00
Stephen Birarda
d389f13e1b fix for role lookup in domain-server 2014-09-26 16:21:12 -07:00
Stephen Birarda
e8c3fa3cf1 use ID from new domain settings, don't disable save button 2014-09-26 14:39:50 -07:00