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

3497 commits

Author SHA1 Message Date
Andrew Meadows
f8e66b4e0d remove cruft 2014-04-09 13:05:26 -07:00
Andrew Meadows
635f832dfe rename shapeShape() to be collideShapes() 
Also add collideShapesCoarse()
 2014-04-09 13:04:17 -07:00
Andrew Meadows
7304049f83 update boiler plate to abide by new standard 2014-04-09 12:55:29 -07:00
Stephen Birarda
29f8ed3c09 manually fix Plane include guard since regex did not catch 2014-04-09 12:03:57 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Andrew Meadows
4b306401af use slot to change AvatarData::_sessionUUID 2014-04-09 11:32:52 -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
a65f8faea9 fix Plane header that was not caught 2014-04-09 09:36:13 -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
Andrew Meadows
229d6cefa2 merge upstream/master into andrew/scripting 2014-04-09 08:17:33 -07:00
Andrew Meadows
b8232b5dfd AvatarData now stores sessionUUID 2014-04-09 08:11:15 -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
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub
c865df8b82 Merge pull request #2613 from Atlante45/more_upload_work 
More upload work
 2014-04-08 08:16:07 -10:00
Atlante45
22cab29d25 Code review 2014-04-08 11:06:48 -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
Atlante45
ee5ebae89e Code review 2014-04-08 10:22:50 -07:00
Andrzej Kapolka
d4706bba8a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 10:21:13 -07:00
Atlante45
174f37f531 Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub
2988239aed Merge pull request #2615 from ey6es/master 
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
 2014-04-08 07:20:00 -10:00
Andrzej Kapolka
a157c67901 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 09:56:07 -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
Andrzej Kapolka
fa05a48270 Provide a means of supplying the joint mappings in the FST file so that agent 
scripts can address joints by name.  Closes #2526.
 2014-04-07 17:55:36 -07:00
Atlante45
46f0e78039 Erased deprecated code 2014-04-07 17:28:03 -07:00
Atlante45
d213cd7840 More work on Undo/Redo 2014-04-07 17:10:15 -07:00
Atlante45
3be2319081 Removed all the temporaryDir junk 2014-04-07 16:18:23 -07:00
Andrzej Kapolka
2a58a863fd Fix for rotation placement. 2014-04-07 15:48:34 -07:00
Andrzej Kapolka
15e9d45dc3 Switched from storing Euler angles to using quaternions along with a 
quaternion editor.  Also, use a default step of 0.01 for floats/doubles.
 2014-04-07 15:41:42 -07:00
Andrew Meadows
79670563d4 AvatarData stores its sessionID 2014-04-07 14:42:49 -07:00
Atlante45
262c6d3206 Fixed double JSON callback when http error occurs 2014-04-07 14:35:13 -07:00
Andrew Meadows
23c6873d99 Add Uuid object to ScriptEngine 2014-04-07 14:12:29 -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
1c822542c1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 15:29:13 -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
Andrzej Kapolka
550a8fdb99 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 13:00:51 -07:00
Andrzej Kapolka
a0c7e4d3cc Working on model rendering modes. 2014-04-04 11:45:03 -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
Andrew Meadows
5e2b8bb2c3 connect SIGNAL to SIGNAL to avoid forwarding slot 2014-04-04 10:43:06 -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
ZappoMan
b56e0ff3d4 tweaks to audioring buffer 2014-04-04 07:04:48 -07:00
Andrzej Kapolka
1bf19111dc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-03 23:57:30 -07:00
Andrzej Kapolka
dfaa98cc34 Blend when setting. 2014-04-03 23:51:49 -07:00
Andrzej Kapolka
d706e23012 Basic voxelization. 2014-04-03 23:47:31 -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
Andrzej Kapolka
22710af111 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-04-03 11:37:27 -07:00
Atlante45
df718c430a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-03 11:20:24 -07:00
ZappoMan
3808cfa83d latest work 2014-04-03 08:55:48 -07:00
ZappoMan
42efb0db65 glue in processSpatialAudio() 2014-04-02 18:18:17 -07:00
Stephen Birarda
1c4d44ba4a attempt to complete handshake every 100ms instead of every 1s 2014-04-02 18:08:44 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -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
Andrew Meadows
715f2c53d5 merge upstream/master into avatar-interaction 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:28:22 -07:00
Atlante45
52df77b4b5 Final work on models metadata support 2014-04-02 16:25:35 -07:00
Andrzej Kapolka
3a44a846ed More set/blend bits. 2014-04-02 15:48:53 -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
Andrew Meadows
97ba5250a5 Only simulate() Avatar Models when necessary 
Also: rebuild collision shapes when Model scale changes
 2014-04-02 12:01:18 -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
ZappoMan
dc7e2dbe1b more debugging 2014-04-01 20:14:38 -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
ZappoMan
5b7ab1e49a more debugging 2014-04-01 14:59:52 -07:00
ZappoMan
bef5677e91 more debugging 2014-04-01 14:51:19 -07:00
Stephen Birarda
ce6f845681 remove some gnutls handshake debugging 2014-04-01 14:47:30 -07:00
ZappoMan
5325453c89 more debugging 2014-04-01 14:39:59 -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
Andrzej Kapolka
afb5711879 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-01 10:40:38 -07:00
ZappoMan
7cd39d3ef0 add forceNodeShutdown() to handle forced shutdown of nodes in case of server shutdown 2014-03-31 20:53:34 -07:00
Andrzej Kapolka
5aa9b981be Hopefully, a fix for the Windows build. 2014-03-31 18:43:38 -07:00
Andrzej Kapolka
929f08dec2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-31 18:22:43 -07:00
ZappoMan
b5c538b051 added some debugging 2014-03-31 18:22:06 -07:00
Andrzej Kapolka
005ae79928 Various fixes and what-not, got the basic spanner clipping working. 2014-03-31 18:21:28 -07:00
ZappoMan
4bf7faba7b workaround for assert failures when bad view frustum input 2014-03-31 17:55:40 -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
ZappoMan
81fc0bea4d revert small tweaks 2014-03-31 15:50:40 -07:00
Stephen Birarda
62da4d622d don't require an MD5 hash in non-verified packets 2014-03-31 15:36:32 -07:00
ZappoMan
989e087701 revert tweaks 2014-03-31 15:09:18 -07:00
ZappoMan
6fd1a6f4e4 revert tweaks 2014-03-31 15:07:34 -07:00
ZappoMan
5ef437da39 revert tweaks 2014-03-31 15:07:13 -07:00
Stephen Birarda
6c08e2a407 add option for domain-server to enforce DTLS 2014-03-31 15:06:58 -07:00
ZappoMan
d2cf898e22 revert tweaks 2014-03-31 15:06:17 -07:00
ZappoMan
faa062f8ab use single instance of SharedAssignmentPointer for assignment client so we actually get reference counting 2014-03-31 14:08:19 -07:00
Stephen Birarda
da30d21f6e complete inital DTLS setup in domain-server 2014-03-31 14:02:11 -07:00
ZappoMan
d4193a2170 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-03-31 10:00:36 -07:00
Philip Rosedale
356df8ab31 Merge pull request #2566 from birarda/master 
add a symmetric ping type to handle open servers with clients on symmetric nats
 2014-03-31 07:20:13 -07:00
Andrzej Kapolka
10588cff9f "Clear spanners" clears the voxelized attributes, too. 2014-03-30 15:51:39 -07:00
Andrzej Kapolka
40b1d2f284 Fix for voxelization on removal. 2014-03-29 22:39:49 -07:00
Andrzej Kapolka
7580951b92 More progress on voxelizing spanners. 2014-03-28 20:19:28 -07:00
Andrzej Kapolka
176d8f746e Finally at the point of actually getting spanners to turn into voxels. 2014-03-28 15:19:40 -07:00
Stephen Birarda
61711c7aaa Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-28 13:30:06 -07:00
Andrzej Kapolka
cba57f20dd Working on spanner attributes. 2014-03-28 11:38:02 -07:00
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07:00
Andrzej Kapolka
fd5f378e1c Better color/normal merging. 2014-03-28 11:16:55 -07:00
ZappoMan
7c8295dd94 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-03-28 11:06:02 -07:00
ZappoMan
ce6af9ecb8 added debug destructor to persist thread 2014-03-28 11:04:27 -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
3c8aa90ae0 Merge pull request #2559 from AndrewMeadows/avatar-interaction-2 
split lean input from lean perturbations
 2014-03-28 09:25:36 -07:00
Stephen Birarda
be5888e692 Merge pull request #2549 from AndrewMeadows/avatar-interaction 
name changes to get rid of "tweaked" angles in Head code
 2014-03-28 09:19:45 -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
Andrzej Kapolka
d3fe6f21ef Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-27 17:03:24 -07:00
Andrew Meadows
796d20168e splitting lean input from lean perturbations 2014-03-27 15:30:30 -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
7949be0319 PitchTweak and friends become DeltaPitch 2014-03-27 11:14:26 -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
Andrew Meadows
b6f2150d2e HeadData::_yaw and friends change to _baseYaw 2014-03-27 10:37:07 -07:00