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

81 commits

Author SHA1 Message Date
Philip Rosedale
5e77f5643d Merge pull request #1630 from birarda/nodelist-set 
change node types of interest to a QSet
 2014-01-23 11:42:37 -08:00
Stephen Birarda
b5a72ef669 more nodelist repairs for concurrency issues 2014-01-23 11:11:22 -08:00
Stephen Birarda
ec04d5450b Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set 2014-01-22 16:16:47 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Stephen Birarda
fad7bde0e1 add mutex locking to NodeHash 2014-01-17 16:02:57 -08:00
Stephen Birarda
3355b71d6b switch back to returning iterator from killNodeAtHashIterator 2014-01-17 15:13:56 -08:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Stephen Birarda
0c22aa241f leverage invokeMethod to make sure killNodeWithUUID is called on right thread 2014-01-15 16:10:51 -08:00
Brad Hefta-Gaub
ff6e9c0416 added back unistd.h for non-windows 2014-01-15 14:59:14 -08:00
Brad Hefta-Gaub
bd6e30070d Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
 2014-01-15 13:18:25 -08:00
Stephen Birarda
0b52b8266e don't return an iterator from killNodeAtHashIterator 2014-01-15 12:44:46 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Stephen Birarda
77ee27e5d7 resolve conflicts on merge with upstream master 2014-01-14 16:12:42 -08:00
Stephen Birarda
bdc31a3b48 replace the DomainChangeListener class with a signal/slot combo 2014-01-14 11:38:05 -08:00
Stephen Birarda
66f50c38e3 repair iterator push on silent node removal 2014-01-14 10:48:47 -08:00
Stephen Birarda
ed0ed96029 properly emit signal on silent node removal 2014-01-14 10:28:41 -08:00
Stephen Birarda
677303b5c0 properly hook SharedNodePointer for signals/slots 2014-01-13 17:17:53 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
731209d8cb remove unused PerfStats class more missing header changes 2014-01-10 19:47:23 -08:00
Brad Hefta-Gaub
f6d775e3e1 remove timeval and unistd.h 2014-01-10 17:27:23 -08:00
ZappoMan
bfbaf265dd first cut at added clockSkew support to nodes and PING/PING_REPLY 2013-12-19 13:14:14 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Stephen Birarda
606eaa579a switch node pinging to QTimer in QCoreApplication instance 2013-12-03 10:57:31 -08:00
Stephen Birarda
1e279cf99c hook AudioMixer to new event-driven assignment setup 2013-12-02 16:34:38 -08:00
Stephen Birarda
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
Stephen Birarda
771021995b add helper to ping with inactive socket 2013-11-05 12:34:56 -08:00
Stephen Birarda
32680bbaad continued STUN requests for keepalive, propagate socket changes 2013-10-18 15:05:16 -07:00
Stephen Birarda
d85c0bb88a add a DELETE method to civetweb to delete assignment by UUID 2013-10-18 10:25:35 -07:00
Stephen Birarda
b4ef3dbd8a add ping/reply to assignment-client servers 2013-10-17 16:56:52 -07:00
Stephen Birarda
87d6c0085f add a fallback if STUN to outside server isn't possible 2013-10-17 15:11:02 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
Stephen Birarda
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
Stephen Birarda
f581d4d976 handle STUN request and response in NodeList 2013-10-16 16:01:23 -07:00
Stephen Birarda
13ac5472ea fix an idiotic bug with silent node kill thread 2013-10-11 10:23:59 -07:00
Stephen Birarda
6fe0b0b124 don’t have AvatarMixer ask DS for agents 2013-10-09 10:40:19 -07:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Stephen Birarda
23e7278be5 re-use the check in packet sent to the domain-server, allow reset 2013-09-19 12:58:48 -07:00
Stephen Birarda
7b498edcbc remove attached public and local sockets, fully allow custom port 2013-09-18 17:03:14 -07:00
Stephen Birarda
9fa695b71c allow setting of custom port via domainHostname setting 2013-09-18 13:50:14 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
Stephen Birarda
7220643fe9 default AC to point to DS on localhost and default port 2013-09-18 12:04:09 -07:00
Stephen Birarda
001432ec55 have domain-server reject audio and avatar mixers with bad UUID 2013-09-17 16:40:30 -07:00
Stephen Birarda
d830351ed6 make the assignment targets subclasses of Assignment for access to UUID 2013-09-17 14:54:58 -07:00
stojce
a362fdc2ed name the current domain server 2013-09-10 21:51:50 +02:00
Stephen Birarda
4905032090 allow forking of multiple assignment-clients from the main target 2013-09-09 09:44:43 -07:00