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

547 commits

Author SHA1 Message Date
ZappoMan
50f7db8fe1 quiet some debugging 2014-04-18 15:02:10 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
 2014-04-18 14:28:54 -07:00
Stephen Birarda
6adfb91e93 rename AvatarHash to AvatarList 2014-04-18 09:40:35 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
75f35c5858 optionally add an AvatarHashMap instance to the ScriptEngine 2014-04-17 17:55:16 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Andrzej Kapolka
6251b6b819 Merge fix. 2014-04-17 13:55:16 -07:00
Andrzej Kapolka
599b472cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	assignment-client/src/Agent.cpp
 2014-04-17 13:51:32 -07:00
Stephen Birarda
a137dd0362 grab URL for script from payload if it exists 2014-04-17 10:18:42 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Andrzej Kapolka
38c0e99cbe More work on animation loading. 2014-04-14 18:12:32 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
16bb28a4fa make GnuTLS a system include to suppress warnings 2014-04-10 10:04:02 -07:00
Stephen Birarda
58298984d3 link GnuTLS to the assignment-client, fix timeval in SharedUtil 2014-04-10 09:48:47 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Stephen Birarda
3d071e85d5 link GnuTLS to the assignment-client 2014-04-09 17:37:23 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Stephen Birarda
02e2135a2e allow setting of expected DTLS cert hostname from AC 2014-04-07 12:52:26 -07:00
Stephen Birarda
69504b0a9d proper cleanup of CA credentials on DTLSClientSession side 2014-04-07 09:47:51 -07:00
Stephen Birarda
fd8e32190e perform cleanup of GnuTLS structures across targets 2014-04-04 11:08:53 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -07:00
Andrzej Kapolka
40844d2000 Working on ability to set a region of the metavoxel data directly. 2014-04-02 12:40:01 -07:00
ZappoMan
dc7e2dbe1b more debugging 2014-04-01 20:14:38 -07:00
ZappoMan
97b2e68988 more debugging 2014-04-01 14:05:05 -07:00
ZappoMan
b7695ba050 more debugging 2014-04-01 13:55:25 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Stephen Birarda
caf2473df8 add a DTLSSession object to handle GnuTLS DTLS sessions 2014-04-01 13:08:00 -07:00
ZappoMan
124619f8d9 more debugging 2014-04-01 12:51:34 -07:00
ZappoMan
6cb44a4d0c more debugging 2014-04-01 12:33:59 -07:00
ZappoMan
916a5d2da0 more debugging 2014-04-01 12:24:03 -07:00
ZappoMan
f504569655 more debugging 2014-04-01 11:49:49 -07:00
ZappoMan
58a52cf5e1 more debugging 2014-04-01 11:45:29 -07:00
ZappoMan
30ff4a1d19 more debugging 2014-04-01 11:32:35 -07:00
ZappoMan
1aa05c4de5 more debugging 2014-04-01 11:26:55 -07:00
ZappoMan
9e445098f1 more debugging 2014-04-01 11:22:44 -07:00
ZappoMan
193e237285 tweaks 2014-04-01 10:58:20 -07:00
ZappoMan
9d757434ab testing tweak 2014-04-01 10:47:25 -07:00
ZappoMan
ce8a599b16 tweak 2014-04-01 10:38:21 -07:00
ZappoMan
64c7a6a440 testing, remove create sending thread and processing of query 2014-04-01 10:25:32 -07:00
ZappoMan
ff17c6a071 quiet some debugging 2014-04-01 10:08:46 -07:00
ZappoMan
21e0bc119b moved OctreeServer::stopTrackingThread() to destructor instead of setIsShuttingDown() 2014-04-01 09:50:10 -07:00