Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 05:20:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38448 commits 76 branches 59 tags 1.2 GiB
Commit graph

1177 commits

Author SHA1 Message Date
Stephen Birarda
6d99a822a3 use a case-insensitive search in allowed editors QStringList 2015-10-28 14:33:50 -07:00
Andrew Meadows
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Stephen Birarda
60f5a06308 turn on the asset-server by default 2015-10-12 16:44:51 -07:00
Stephen Birarda
7987595dcd set the bearer poll timeout for wlan scan in Qt 5.5 2015-10-08 11:32:10 -07:00
Stephen Birarda
e835b5ccf3 remove old gnutls code from domain-server 2015-10-05 15:30:26 -07:00
Stephen Birarda
030404157e cleanup Assignment grab from iterator 2015-09-21 11:54:41 -07:00
Stephen Birarda
e21c1cb67c make sure server/mixers are first in FIFO 2015-09-21 11:51:53 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
0037a1f4a7 Win build fix 2015-09-11 14:21:55 +02:00
Atlante45
18a696d88c Type cleanup 2015-09-11 14:21:54 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Stephen Birarda
e1c395f5ea resolve conflicts on merge with upstream/master 2015-09-08 14:56:23 -07:00
Rudi Chen
b703ce01fb Make sure libdl is linked after libcrypto. 
Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error
I was running into on Linux Mint 17.2.
 2015-09-06 21:42:02 -04:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Bennett Goble
6f4fc24fb6 NodeConnectionData QDataStream #include 2015-08-30 12:05:56 -04:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger 
call setup_memory_debugger from common macros rather than from everywhere
 2015-08-26 15:43:08 -07:00
Andrew Meadows
0835b79e33 Merge pull request #5646 from birarda/ds-cleanup 
de-bloat the domain-server by adding a gatekeeper
 2015-08-26 15:42:43 -07:00
Stephen Birarda
1a019187af Merge branch 'ds-cleanup' into asset-upload 2015-08-26 15:07:43 -07:00
Stephen Birarda
cd7d0f383b allow editors who can't be verified in the short term 2015-08-26 15:07:29 -07:00
Stephen Birarda
4039c2e3e0 fix for asset-server naming, deadlock in timeout/wait 2015-08-26 14:27:12 -07:00
Stephen Birarda
352f3543c3 resolve conflicts on merge with ds-cleanup 2015-08-26 13:33:50 -07:00
Stephen Birarda
c8545c8aeb remove an empty line 2015-08-26 12:37:47 -07:00
Stephen Birarda
dc1f726283 don't assign the asset-server in domain by default 2015-08-26 12:36:48 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Ryan Huffman
4e3d0758e5 Remove UNUSED_2 2015-08-25 15:07:07 -07:00
Stephen Birarda
c776f04ab2 don't allow in a user who should have edit but not verified 2015-08-25 14:36:22 -07:00
Stephen Birarda
9940f375ea repairs for CR comments 2015-08-25 10:02:43 -07:00
Stephen Birarda
17befac262 use fixed width for stats tables 2015-08-24 18:10:21 -07:00
Stephen Birarda
b8ac9aa5eb update jquery and bootstrap in DS 2015-08-24 18:02:26 -07:00
Stephen Birarda
d02e5b2450 fix a typo in comment in DomainGatekeeper 2015-08-24 15:10:27 -07:00
Stephen Birarda
a9c04e5116 don't allow verified connection without username 2015-08-24 15:01:39 -07:00
Stephen Birarda
c6f1567361 add a debug for refused connection in DomainGatekeeper 2015-08-24 14:58:25 -07:00
Stephen Birarda
fe591f61cc fix class rename in processConnectRequestPacket 2015-08-24 14:54:48 -07:00
Stephen Birarda
d57c1fc2d5 fix a typo in DomainGatekeeper comment 2015-08-24 14:50:18 -07:00
Stephen Birarda
7591a29c48 add back indentation to STATICALLY_ASSIGNED_NODES 2015-08-24 14:44:24 -07:00
Stephen Birarda
d2acf327dd fix NodeConnectionData discrepancy on request 2015-08-24 14:43:49 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
Andrew Meadows
0fb2390877 Merge pull request #5604 from birarda/master 
report non-skewed uptime from domain-server
 2015-08-21 09:16:21 -07:00
Stephen Birarda
aac15e52bb add explicit cast to double for uptime 2015-08-20 10:19:34 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Stephen Birarda
74d6e5ba89 make sure LNL goes down before domain-server 2015-08-20 10:01:12 -07:00
Stephen Birarda
b386a95d08 fix sort for node uptime 2015-08-19 18:31:42 -07:00
Stephen Birarda
2738f65c10 have domain-server report non-skewed uptime 2015-08-19 18:23:11 -07:00
Seth Alves
2056f588e3 if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux 2015-08-19 18:03:16 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version 
DO NOT MERGE - Node versioning
 2015-08-19 13:32:48 -07:00
Ryan Huffman
da7c9198c5 Remove superfluous log message 2015-08-19 10:01:40 -07:00
Ryan Huffman
63d0205d1e Move domain settings retrieval to UDT 2015-08-18 23:11:33 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Seth Alves
4a456488a1 remove the option to persist entities as anything other than json.gz files 2015-08-17 14:01:25 -07:00
Leonardo Murillo
b345d75e4d More cleanup and showing version in ds web gui 2015-08-13 16:44:28 -06:00
Leonardo Murillo
7c4813f1cf Another versioning checkpoint + cleanup 2015-08-13 16:35:55 -06:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Bennett Goble
d5691b1196 Add QDataStream include to DomainServerWebSessionData.cpp 
Fixes compilation error with Qt 5.5.0, QDataStream >> QSet
 2015-08-08 17:17:29 -04:00
Stephen Birarda
eec382ade8 Merge pull request #5513 from bwent/domain-server-authentication 
Add connection token UUId to sign with username when connecting to domain-server
 2015-08-07 10:05:00 -07:00
bwent
ffccc9ca96 clean up formatting, make connectionUUID const in NodeList 2015-08-06 10:11:22 -07:00
bwent
73ea958640 add check if user is local user 2015-08-06 09:01:25 -07:00
bwent
a8f9f9d746 clean-up formatting 2015-08-05 17:43:03 -07:00
bwent
45e3eafce3 Remove ERR_get_error call 2015-08-05 16:00:25 -07:00
bwent
ab2b54a6b2 Add connection token to sign with username when connecting to domain-server 2015-08-05 15:33:59 -07:00
bwent
8868148c94 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-05 14:07:25 -07:00
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
bwent
fc385d9bc1 debugging 2015-08-05 10:29:30 -07:00
bwent
b9364a47a1 Debug null QUuid being stored in conenctionTokenHash 2015-08-04 15:31:26 -07:00
bwent
54dd5da64c To debug RSA padding error 2015-08-04 12:02:23 -07:00
bwent
af293ec6dd Fix DomainServerConnectionTOken packet writing/resetting 2015-08-04 12:02:23 -07:00
bwent
244cc016ab Generate session token UUIDs to be signed with username 2015-08-04 12:02:23 -07:00
Seth Alves
adcd91e3ff Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options. 2015-08-04 07:23:24 -07:00
Stephen Birarda
b68c7fd92a first adjustment in NLPacket after type is known 2015-07-23 16:59:08 -07:00
Stephen Birarda
9556fecbe2 initial changes to make _nodeSocket a udt::Socket 2015-07-20 17:10:22 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Atlante45
d505527e5a Remove setExtendedheader call 2015-07-17 15:38:36 -07:00
Stephen Birarda
8ff8a17f02 remove TODO added for DS, check sockets 2015-07-17 14:17:48 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Stephen Birarda
2a2eb39066 repairs for DS path query and response 2015-07-16 17:08:06 -07:00
Stephen Birarda
487969ef7a pack reason size as quint16 2015-07-16 16:45:16 -07:00
Stephen Birarda
f31675c4c6 fix ice-server packets 2015-07-16 14:21:37 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
ccc2649d26 fix packing of domain list header 2015-07-14 21:14:15 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
Stephen Birarda
a5ca1f7125 fix variable setup in Packet constructor 2015-07-14 19:15:18 -07:00
Atlante45
3abde577e2 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 16:58:26 -07:00
Stephen Birarda
15ca129005 fix for registration of methods with typedef 2015-07-14 16:46:17 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Ryan Huffman
d8bec3983f Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	domain-server/src/DomainServer.cpp
 2015-07-14 16:13:54 -07:00
Stephen Birarda
6d6b9b8117 pass sending node to processListRequestPacket 2015-07-14 16:11:48 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Ryan Huffman
4d9b28688d Update reinterpret_cast call that should be dynamic_cast 2015-07-14 14:49:51 -07:00