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

500 commits

Author SHA1 Message Date
Stephen Birarda
f02e1aaf47 cleanup the alive half of connection secrets when node dies 2014-02-06 11:37:52 -08:00
Stephen Birarda
3dca04aacb have the domain-server generate connection secrets, closes #1837 2014-02-06 11:30:53 -08:00
Stephen Birarda
6f638fa62c have domain-server create a UUID for unidentified nodes, closes #1840 2014-02-06 10:34:34 -08:00
Stephen Birarda
703b654728 make sure UUID key changes in static assignment hash, closes #1770 2014-01-30 17:39:37 -08:00
Stephen Birarda
f853e34ab1 fix unix complaint for no postfix for enum 2014-01-30 15:49:05 -08:00
Stephen Birarda
984fb1a5df fix config parsing from command line and json 2014-01-30 15:22:03 -08:00
Stephen Birarda
55049eeb6b fix assignment packing and unpacking from DS to AC 2014-01-30 14:54:52 -08:00
Stephen Birarda
356222ba15 removal of persistence in DS for static assignments 2014-01-30 14:33:36 -08:00
Stephen Birarda
d6431a3e7a remove an extra gs 2014-01-29 15:09:46 -08:00
Stephen Birarda
dbecb96a58 remove assignmentQueueMutex now that DS concurrency is gone 2014-01-29 15:08:50 -08:00
Stephen Birarda
7d27830064 domain-server patches while looking for payload/pool errors 2014-01-29 14:23:39 -08:00
Stephen Birarda
423e1598f0 use NodeSet in place of QSet<NodeType_t> where possible 2014-01-28 13:41:39 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
ffefc529f3 ensure UUID pulled from packet header is exactly 16 bytes 2014-01-28 11:53:09 -08:00
Stephen Birarda
75e2fa491a some type fixes for marshalling/un-marshalling of data 2014-01-28 11:26:36 -08:00
Stephen Birarda
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Stephen Birarda
9d71671a52 add extra debugging to packet mismatch 2014-01-24 09:10:27 -08:00
Stephen Birarda
349c790cc7 NodeData cleanup thanks to separation from rendered avatars 2014-01-23 15:41:40 -08:00
Lucas Crisman
1423f91717 Allow domain-server to read configuration from file 2014-01-21 15:48:44 -03:00
Stephen Birarda
5fdf310a45 hook OctreeServer up to embedded-webserver 2014-01-17 14:21:15 -08:00
Stephen Birarda
ffb628edfb remove the DomainServer singleton instance from DS 2014-01-17 12:18:41 -08:00
Stephen Birarda
1900d3a13b remove the old civetweb upload handler 2014-01-17 12:16:56 -08:00
Stephen Birarda
0f8cbb9aec add back script upload ability hooked to HttpManager 2014-01-17 12:16:19 -08:00
Stephen Birarda
ce393fdf27 uppercase the names of the HTTP classes 2014-01-17 11:53:47 -08:00
Stephen Birarda
40cdba203d handle programmatic DS requests except for script creation 2014-01-17 11:29:20 -08:00
Stephen Birarda
036dba9c2f setup the HTTPManager to serve files in the document root 2014-01-17 08:53:55 -08:00
Stephen Birarda
d236d6335d add initial rev of embedded webserver based on QTcpSocket 2014-01-16 17:05:02 -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
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -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
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
ed0ed96029 properly emit signal on silent node removal 2014-01-14 10:28:41 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
f9f29c68b2 more windows build fixes 2014-01-11 01:11:49 -08:00
Brad Hefta-Gaub
bd67531ffd warnings 2014-01-11 00:13:46 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Brad Hefta-Gaub
5725a92cfe get rid of arpa/inet.h and netdb.h 2014-01-10 18:13:23 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Leonardo Murillo
57bf31e1a6 Wrong spacing 2013-12-19 11:25:51 -06:00
Leonardo Murillo
c3b222cfc2 Print assignment request details to log 2013-12-19 11:23:55 -06:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
Stephen Birarda
e99b126134 remove quickExit option from AS, fix cleanup in DS 2013-12-05 17:35:26 -08:00
Stephen Birarda
5e429250d3 merge with upstream/master 2013-12-05 11:41:28 -08:00
Stephen Birarda
a376ebbca2 make DomainServer a proper QCoreApplication instance, closes #1313 2013-12-05 10:00:20 -08:00
ZappoMan
50833cf04c add --particleServerConfig to domain server 2013-12-04 21:37:31 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
Stephen Birarda
330eff72ce repair usage of DS as STUN server 2013-12-02 17:18:07 -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
Stephen Birarda
d01feedb5a decrement number of instances on addressable instance of deployable assignment 2013-10-31 17:45:55 -07:00
Stephen Birarda
21fe7e6fe0 don't delete last scripted assignment before it is sent out 2013-10-31 10:10:49 -07:00
Stephen Birarda
e0e13fe2ed create a copy of document root string 2013-10-31 09:17:17 -07:00
Stephen Birarda
6014c833ed fix a broken build in the domain-server 2013-10-30 18:11:36 -07:00
Stephen Birarda
5814f9ea81 add debug to see document root on DS relaunch 2013-10-30 18:02:13 -07:00
Stephen Birarda
67050f5cd2 fix Assignment ctor from data to properly parse payload 2013-10-25 10:34:58 -07:00
Stephen Birarda
9339538a74 fixes for admin interface with multiple nodes of same type 2013-10-24 16:37:41 -07:00
Stephen Birarda
d3ac055add change DS json to use unique UUIDs for keys 2013-10-24 16:27:05 -07:00
Stephen Birarda
d85ed014ba switch to bootstrap 3, complete initial index page 2013-10-23 14:43:59 -07:00
Stephen Birarda
1eba133a6d use char array of static length for pool 2013-10-22 13:35:26 -07:00
Stephen Birarda
85b5d8564f pull pool from voxel server configs passed to DS 2013-10-22 12:14:40 -07:00
Stephen Birarda
b4a2214d26 add notion of pool back to assignment 2013-10-22 11:43:06 -07:00
Stephen Birarda
7ca0a26c18 rename method to add assignments back to queue 2013-10-18 10:44:39 -07:00
Stephen Birarda
0d69349ba9 fix prefixed constants 2013-10-18 10:39:23 -07:00
Stephen Birarda
f6c9c57585 cleanup checking of request method, clarify that node is being deleted 2013-10-18 10:33:22 -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
b6f3253b95 add local node information to assignments JSON 2013-10-17 16:07:24 -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
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
Stephen Birarda
747175311f handle stun response in assigned clients 2013-10-16 16:37:24 -07:00
Stephen Birarda
224b0d9671 domain server accepts custom public address from node 2013-10-16 16:27:13 -07:00
Stephen Birarda
1ed2b3d8fe add both fulfilled and queued assignments to DS json 2013-10-15 15:38:43 -07:00
Stephen Birarda
4cb657fa24 remove dependency on cJSON and use Qt instead 2013-10-15 15:29:51 -07:00
Stephen Birarda
41e1ec180c add a JSON endpoint for current assignments 2013-10-15 13:45:40 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
a771a5de07 fix for restart hold behavior in domain-server 2013-10-02 10:53:54 -07:00
Stephen Birarda
e5c5bb7552 completion of fix for requesting AC on DS restart 2013-10-01 16:15:07 -07:00
Stephen Birarda
dc3756d81c check if there are static assignments to queue while serving request 2013-10-01 16:11:10 -07:00
Stephen Birarda
74ec83d8ed add an extra debug to track down HQ issue 2013-10-01 16:03:53 -07:00
Stephen Birarda
63d41d85de remove a bad comment 2013-10-01 16:00:10 -07:00
Stephen Birarda
b548567744 add a debug line to track down HQ issue 2013-10-01 15:59:10 -07:00
Stephen Birarda
f3acb53835 use uint64_t for timing const in DS 2013-10-01 15:49:48 -07:00
Stephen Birarda
94f7b98a5c handle mutli-VS config in DS when creating static file 2013-09-30 14:27:54 -07:00
Stephen Birarda
fb27e37607 have AC making create request use its own UUID 2013-09-30 14:09:46 -07:00
Stephen Birarda
3449ddc9a0 remove an added ga 2013-09-30 14:03:17 -07:00
Stephen Birarda
e2d68f5538 have DS clear config file is new config is passed 2013-09-30 14:03:02 -07:00
Stephen Birarda
32314ad540 have VS send UUID with check in for static assignment behavior 2013-09-30 13:34:22 -07:00
Stephen Birarda
e63dfadcde allow repeated check ins from existing node 2013-09-30 13:24:55 -07:00
Stephen Birarda
0e5c5886b6 touchups to DS with static assignment file 2013-09-30 13:11:46 -07:00
Stephen Birarda
a8d55644e9 Assignment as LinkedData, add back to queue on node death 2013-09-30 11:04:42 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
Stephen Birarda
db1dacbbf4 some refactoring for DS, add create assignments to file 2013-09-26 15:56:41 -07:00
Stephen Birarda
70c5d3e349 decouple DS from main, move to C++11 2013-09-26 15:03:43 -07:00