Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 16:59:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12309 commits 75 branches 59 tags 1.2 GiB
Commit graph

1339 commits

Author SHA1 Message Date
Andrew Meadows
4942e93daa replace .f with .0f as per coding standard 2014-04-10 07:53:11 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
3fe5af1505 update boilerplate and include guards for other new files 2014-04-09 15:08:56 -07:00
Stephen Birarda
5a79079c09 fix boilerplates in new DTLS files 2014-04-09 15:03:56 -07:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
Andrew Meadows
635f832dfe rename shapeShape() to be collideShapes() 
Also add collideShapesCoarse()
 2014-04-09 13:04:17 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
ced5e72d39 add date to capsule shape 2014-04-09 10:46:36 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
11c235a29e fixes to source files for code remove in regex replace 2014-04-09 10:16:56 -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
f3cbd120ce header comment tweaks prior to regex match 2014-04-08 17:19:23 -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
e417e7670b cleanup DomainServer debug during config parsing 2014-04-08 14:07:31 -07:00
Atlante45
8ad7c3b239 Moved ModelUploader to interface + New error messages 2014-04-08 14:03:27 -07:00
Stephen Birarda
c2ff438182 add a CL + JSON settings reader 2014-04-08 13:37:07 -07:00
Atlante45
eaca699a6d Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work 2014-04-08 10:35:23 -07:00
Atlante45
e1a1ff3988 Code review 2014-04-08 10:32:49 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Brad Hefta-Gaub
881383a5f2 Merge pull request #2609 from AndrewMeadows/avatar-interaction 
More details in JS collision events
 2014-04-08 06:52:04 -10:00
Atlante45
3be2319081 Removed all the temporaryDir junk 2014-04-07 16:18:23 -07:00
Atlante45
262c6d3206 Fixed double JSON callback when http error occurs 2014-04-07 14:35:13 -07:00
Atlante45
e85703d25b Added feedback and a better success check 2014-04-07 13:48:28 -07:00
Atlante45
cec99caa47 Added upload progress tracking to AccountManager via JSON 2014-04-07 13:45:30 -07:00
Stephen Birarda
02e2135a2e allow setting of expected DTLS cert hostname from AC 2014-04-07 12:52:26 -07:00
Stephen Birarda
86a0b715f3 verify DTLS certificate to ensure trust before handshaking 2014-04-07 11:36:32 -07:00
Stephen Birarda
0f92e02da7 add the hifi root CA trusted cert to source 2014-04-07 11:19:06 -07:00
Andrew Meadows
84d7e39d72 merge upstream/master into avatar-interaction 2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
Stephen Birarda
69504b0a9d proper cleanup of CA credentials on DTLSClientSession side 2014-04-07 09:47:51 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
Stephen Birarda
5adcf68752 sort nodes on DS page by their uptime 2014-04-07 09:08:51 -07:00
Stephen Birarda
45d796e8f3 allow re-handshake in NodeList after domain refresh 2014-04-04 15:56:02 -07:00
Andrzej Kapolka
1f3a5d09d9 Merge pull request #2593 from Atlante45/display_models_metadata 
Display models metadata
 2014-04-04 15:18:18 -07:00
Stephen Birarda
c015fdd212 leverage a DummyDTLSSession to not require cleanup of DTLSSession for cookies 2014-04-04 11:42:14 -07:00
Stephen Birarda
b40dd6a31a say bye and de-init DTLS session from DomainServer 2014-04-04 11:17:50 -07:00
Stephen Birarda
fd8e32190e perform cleanup of GnuTLS structures across targets 2014-04-04 11:08:53 -07:00
Stephen Birarda
e2224e0f0c cleanup node silence timing and use for DTLS timeouts 2014-04-04 10:56:04 -07:00
Stephen Birarda
c840904642 output a message when handshake has completed with a client 2014-04-04 10:44:15 -07:00
Stephen Birarda
efd176f93c complete check in and heartbeat via DTLS 2014-04-04 09:56:57 -07:00
Stephen Birarda
7b6ce77690 add processing of DTLS datagrams to domain-server 2014-04-04 09:20:40 -07:00
Atlante45
ba4ccc22ef Changed FstReader name to ModelUploader 2014-04-03 16:19:33 -07:00
Atlante45
3bb6d9b3b3 Added call back to model upload. 2014-04-03 16:07:25 -07:00
Atlante45
d15e12da77 Changed FstReader categories to place models in the right dirs 2014-04-03 12:25:50 -07:00
Stephen Birarda
1c4d44ba4a attempt to complete handshake every 100ms instead of every 1s 2014-04-02 18:08:44 -07:00
Stephen Birarda
62de84315e detect handshake completion in DS and client 2014-04-02 17:56:04 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -07:00
Atlante45
52df77b4b5 Final work on models metadata support 2014-04-02 16:25:35 -07:00
Atlante45
b73598ae8a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 11:40:41 -07:00
Stephen Birarda
dc3a4d4957 remove some unneeded parenthesis 2014-04-02 09:07:34 -07:00
Stephen Birarda
fd1ed13de0 fix static x509CACredentials method 2014-04-01 16:53:17 -07:00
Stephen Birarda
632dc6b8e4 set GnuTLS credentials for DTLSClientSession 2014-04-01 16:51:05 -07:00
Stephen Birarda
b5b4edc999 add notion of server and client DTLSSessions 2014-04-01 16:47:45 -07:00
Stephen Birarda
ce6f845681 remove some gnutls handshake debugging 2014-04-01 14:47:30 -07:00
Stephen Birarda
94b29782eb re-scaffold some client side DTLS in DTLSSession 2014-04-01 14:19:07 -07:00
Stephen Birarda
0be2eb57bf repairs to NodeList and LimitedNodeList 2014-04-01 13:56:33 -07:00
Stephen Birarda
45c6ae44a6 use a LimitedNodeList in domain-server 2014-04-01 13:33:30 -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
Atlante45
bdd5c291b0 Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-01 12:03:45 -07:00
Atlante45
03958f2fa0 work on metadata in the model browser + real time updates 2014-04-01 12:02:47 -07:00
Atlante45
77f5a50738 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-31 17:19:45 -07:00
Atlante45
f027aac76b Fix to model upload in account manager 2014-03-31 17:19:04 -07:00
Stephen Birarda
135d97d0a7 add a pretty important missing line for symmetric socket activation 2014-03-31 15:59:54 -07:00
Stephen Birarda
62da4d622d don't require an MD5 hash in non-verified packets 2014-03-31 15:36:32 -07:00
Stephen Birarda
6c08e2a407 add option for domain-server to enforce DTLS 2014-03-31 15:06:58 -07:00
Stephen Birarda
da30d21f6e complete inital DTLS setup in domain-server 2014-03-31 14:02:11 -07:00
Stephen Birarda
61711c7aaa Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-28 13:30:06 -07:00
Stephen Birarda
eb35b63651 use a shared pointer for more elegant cleanup at assignment conclusion 2014-03-28 10:48:44 -07:00
Stephen Birarda
7b840f760c Merge pull request #2538 from AndrewMeadows/enforce-standard 
making some type casts abide by coding standard
 2014-03-28 09:19:16 -07:00
Stephen Birarda
8b1b2d8d99 send a symmetric ping packet if appropriate when pinging nodes 2014-03-28 09:11:20 -07:00
Stephen Birarda
f80b415497 handle activation and setting of symmetric socket 2014-03-28 09:07:30 -07:00
Stephen Birarda
18a293c020 add a symmetric socket to the Node class 2014-03-28 08:58:49 -07:00
Stephen Birarda
1c47b8a3e1 Revert "hack the NodeList to take the socket on which pinged as active socket" 
This reverts commit 5c7ac6d3a1.
 2014-03-27 21:29:01 -07:00
Stephen Birarda
5c7ac6d3a1 hack the NodeList to take the socket on which pinged as active socket 2014-03-27 17:41:55 -07:00
ZappoMan
bda96ef935 added back use of nodeWithUUID() instead of sharedpointer 2014-03-27 13:35:22 -07:00
Atlante45
d9c48d63fe Made _zipDir a children of _dataMultiPart so it gets deleted at the right time. 2014-03-27 11:18:32 -07:00
Atlante45
88e7b8e68f Fixed "memory leak" in Account Manager. 2014-03-27 11:16:52 -07:00
Andrew Meadows
c383b69b61 merge upstream/master into enforce-standard 
Conflicts:
	interface/src/avatar/Hand.cpp
 2014-03-27 10:53:54 -07:00
Atlante45
11f40258b3 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-27 10:12:34 -07:00
ZappoMan
55b9dd1aee remove non-locking version of nodeWithUUID() 2014-03-27 02:32:19 -07:00
Andrzej Kapolka
f339a3c0d7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 18:30:23 -07:00
Stephen Birarda
87cbe9a1f4 Merge pull request #2524 from AndrewMeadows/shapes 
avatar responds to hand-vs-head collisions again
 2014-03-26 17:10:43 -07:00
Andrew Meadows
4c64c11144 making some type casts abide by coding standard 2014-03-26 16:58:47 -07:00
Andrzej Kapolka
52c8a865f1 Provide a means of tracking resource download progress. Until we have a 
user-friendly progress meter/throbber, put the download progress in the
extended stats.
 2014-03-26 15:53:19 -07:00
Atlante45
d32797b54c Added bunch of feedback 2014-03-26 15:13:52 -07:00
Atlante45
fa2a60448b Fixed double free crash 2014-03-26 15:09:44 -07:00
Atlante45
718b8f7eb9 Changed back to upload either head or skeleton 2014-03-26 15:07:19 -07:00
Brad Hefta-Gaub
d90ebfd29a Merge pull request #2504 from Atlante45/upload_feedback 
Display warning popup when something went wrong with the fst upload
 2014-03-26 13:31:49 -07:00
Atlante45
f95c43393c Fixed uninitialized member 2014-03-26 13:10:56 -07:00
Philip Rosedale
b3b9a2f337 Merge pull request #2516 from birarda/master 
actually change NodeList send buffer size
 2014-03-26 12:12:26 -07:00
Stephen Birarda
6e161e7c61 actually attempt to change send buffer size 2014-03-26 12:05:55 -07:00
Philip Rosedale
020f4b020e Merge pull request #2503 from birarda/master 
increase NodeList send buffer size to 1MB
 2014-03-26 12:00:43 -07:00
Stephen Birarda
cb617c9e17 add a button on DS admin page to kill all nodes 2014-03-26 11:37:30 -07:00