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

3389 commits

Author SHA1 Message Date
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
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
Andrzej Kapolka
005ae79928 Various fixes and what-not, got the basic spanner clipping working. 2014-03-31 18:21:28 -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
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
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
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
ZappoMan
c6c4b58699 adds reset of octree element population statistics 2014-03-27 02:31:39 -07:00
Philip Rosedale
56492e3ac8 Merge pull request #2536 from ey6es/master 
Provide a simple means of tracking download progress, increase speed at which we adjust avatar LOD.
 2014-03-26 23:23:27 -07:00
Andrzej Kapolka
f339a3c0d7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 18:30:23 -07:00
Andrzej Kapolka
7f3977578e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 18:30:06 -07:00
Stephen Birarda
206096465b Merge branch 'master' of https://github.com/highfidelity/hifi into flock-bots 2014-03-26 17:46:48 -07:00
Stephen Birarda
7eab276122 suppress debug in ScriptEngine, fix spatialization from FS head changes 2014-03-26 17:19: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
3c958a2181 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 16:56:33 -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
Andrzej Kapolka
48385ccc32 Fixed Xcode compile error. 2014-03-26 13:17:41 -07:00
Atlante45
f95c43393c Fixed uninitialized member 2014-03-26 13:10:56 -07:00
Andrzej Kapolka
97b895be16 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 12:43:33 -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
Philip Rosedale
9d8089a7d1 Merge pull request #2514 from birarda/kill-node-button 
add a button on DS admin page to kill all nodes
 2014-03-26 11:50:02 -07:00
Stephen Birarda
4ac487f832 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 11:44:51 -07:00
Stephen Birarda
cb617c9e17 add a button on DS admin page to kill all nodes 2014-03-26 11:37:30 -07:00
Stephen Birarda
e03e82a29b ifdef to handle getsockopt format requirements on windows 2014-03-26 11:02:34 -07:00
Stephen Birarda
c4b8ff8952 cast setsocktopt and getsockopt calls to fix windows build 2014-03-26 10:53:43 -07:00
Stephen Birarda
e2b230445f add a method to Agent for last read frame loudness 2014-03-26 10:28:59 -07:00
Andrzej Kapolka
e66cfa8422 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-25 20:41:40 -07:00
Andrzej Kapolka
5934a7fbea Working on voxelizing spanners. 2014-03-25 20:41:19 -07:00
Stephen Birarda
ed9c805539 attempt to set send buffer size to 1MB 2014-03-25 17:29:35 -07:00
Stephen Birarda
46077a7fb0 output old size when notifying for send buffer size change 2014-03-25 17:24:17 -07:00
Stephen Birarda
db757e9e7b increase NodeList send buffer size by default to 128KB 2014-03-25 17:18:45 -07:00
Atlante45
9f95ca8e7c Display warning popup when something went wrong with the fst upload 2014-03-25 17:18:18 -07:00
Stephen Birarda
34634af975 add mutex header to NodeData 2014-03-25 16:05:51 -07:00
Andrew Meadows
fff7a36b54 merge upstream/master into physics project 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/renderer/Model.h
 2014-03-25 15:55:26 -07:00
Stephen Birarda
c8b3ae0c40 add a mutex to NodeData and leverage in AvatarMixer threads 2014-03-25 15:49:47 -07:00
Andrew Meadows
06fbd49ffa Adding StreamUtils for common debug output 2014-03-25 15:29:22 -07:00
Andrew Meadows
5934a17475 fix sphere-capsule collisions at the capsule caps 2014-03-25 15:27:28 -07:00
Stephen Birarda
d5be3f1c9f output socket errors if they occur 2014-03-25 15:01:24 -07:00
Stephen Birarda
56869a769d remove some extraneous domain-server check in debugging 2014-03-25 14:53:32 -07:00
Stephen Birarda
38ad75fc9e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-debug 2014-03-25 14:52:28 -07:00
Stephen Birarda
f0f3cf7282 remove seed to random number generator that is no longer needed 2014-03-25 14:36:02 -07:00
Stephen Birarda
7190ce9a88 remove loadRandomIdentifier for STUN requests, use UUID 2014-03-25 14:33:53 -07:00
Stephen Birarda
41e2ce2b19 remove DS check in debug 2014-03-25 14:29:59 -07:00
Stephen Birarda
f8c479f9c5 seed random number generator in ScriptEngine for Math.random use in JS 2014-03-25 14:28:26 -07:00
Andrzej Kapolka
249e9f0e33 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-25 14:19:38 -07:00
Stephen Birarda
4e77afb4b2 block and wait for bytes to be written during broadcastAvatarData loop 2014-03-25 13:38:02 -07:00
Stephen Birarda
68d55152b9 flush after each call to writeDatagram 2014-03-25 13:28:53 -07:00
Stephen Birarda
08bfc15b70 output more descriptive socket error 2014-03-25 13:20:45 -07:00
Stephen Birarda
6a8637230f add socket error debugging 2014-03-25 13:17:37 -07:00
Stephen Birarda
ce169dd87d add code return debug to DS check in packet 2014-03-25 13:06:44 -07:00
Stephen Birarda
08ed708ee6 add domain IP and packet size debugging 2014-03-25 13:05:58 -07:00
Stephen Birarda
f0b87bebc2 cleanup debug and inactive node pinging 2014-03-25 13:02:09 -07:00
Stephen Birarda
bc1b7045cb output count of unreplied domain-server check ins 2014-03-25 12:30:06 -07:00
Andrzej Kapolka
a5dd5ebe0b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-25 10:52:03 -07:00
AndrewMeadows
5551396a7b Merge pull request #2480 from ZappoMan/scripting_improvements 
Scripting improvements
 2014-03-25 10:49:14 -07:00
Andrew Meadows
c0177e80a7 use glm::isnan() everywhere for portable code 2014-03-25 09:56:15 -07:00
Andrew Meadows
17d878bc94 sanitiy checking when unpacking AvatarData update 2014-03-25 09:55:43 -07:00
ZappoMan
c34b64e296 add load script from URL support 2014-03-25 00:17:19 -07:00
ZappoMan
a613da8032 add Script.include() 2014-03-24 21:25:59 -07:00
AndrewMeadows
961815fe42 Merge pull request #2472 from birarda/domain-json-stats 
add minimal packet rate stats to all nodes, a little extra to avatar-mixer
 2014-03-24 16:57:20 -07:00
Stephen Birarda
a90cd7ed31 cast numerator to float before divide 2014-03-24 16:54:14 -07:00
Stephen Birarda
b01b2a3311 use explicit float casts where appropriate 2014-03-24 16:35:36 -07:00
Stephen Birarda
ba338cb7bc at minimum send packet rate stats for ThreadedAssignment subclasses 2014-03-24 16:06:25 -07:00
Stephen Birarda
8dbe4dfdde collect packet rate stats in NodeList 2014-03-24 15:06:53 -07:00
Andrzej Kapolka
f1fd8175d2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-24 14:53:00 -07:00
Andrzej Kapolka
210af25396 When rendering avatar shadows, check bounds against shadow frustum. Closes 2014-03-24 14:52:02 -07:00
Philip Rosedale
c7fab009bd Merge pull request #2461 from birarda/domain-json-stats 
tweaks to domain-server stats, add info for audio
 2014-03-24 14:21:46 -07:00
Stephen Birarda
f8279c1f5b handle query params in HTTPManager, display stats table from DS 2014-03-24 14:14:26 -07:00
Philip Rosedale
cf891f419b Merge pull request #2449 from ZappoMan/js_prefs 
New User Experience Work: added "Settings" and "AudioDevice" to JS
 2014-03-24 13:24:51 -07:00
Stephen Birarda
5f93e44ff7 abstract stats packet sending to NodeList 2014-03-24 12:33:00 -07:00
Andrzej Kapolka
91c10a4f3a Delta streaming for variants. 2014-03-24 11:56:58 -07:00
Stephen Birarda
8f403609e7 hook JSON stats sending from domain-server 2014-03-24 11:56:16 -07:00
Stephen Birarda
949f7b2fc1 add a json stats packet type 2014-03-24 11:21:39 -07:00
ZappoMan
7ef1fe3a74 add support for listing all audio devices and default device in JS 2014-03-24 09:15:03 -07:00
ZappoMan
bde2146b1b whitespace cleanup 2014-03-23 18:14:36 -07:00
ZappoMan
9c7ffffbae fix some windows issues 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
 2014-03-23 18:10:22 -07:00
Andrzej Kapolka
5b4478328c More delta streaming work. 2014-03-22 23:43:42 -07:00
Stephen Birarda
af4fb26031 floats are important 2014-03-21 18:44:59 -07:00
Stephen Birarda
abd6c8a747 fix trailing average on ring buffer, remove unused constant 2014-03-21 18:28:12 -07:00
Andrzej Kapolka
b8414dfb19 More work on delta streaming. 2014-03-21 18:20:26 -07:00
Stephen Birarda
949aefac62 Merge pull request #2439 from birarda/master 
check for an audio cutoff change only every TRAILING_AVERAGE_FRAMES
 2014-03-21 16:21:26 -07:00
Stephen Birarda
bad209bf09 use a trailing average for a quieter loudness 2014-03-21 15:53:00 -07:00
Stephen Birarda
4bde0e6844 Merge pull request #2436 from ZappoMan/vscrashfix 
fixes to voxel server crashes on client shutdown
 2014-03-21 15:24:45 -07:00
Andrzej Kapolka
1b980eebf2 More work on delta streaming. 2014-03-21 14:49:40 -07:00
Brad Hefta-Gaub
5abe044c30 Merge pull request #2412 from AndrewMeadows/emergency-fixes 
datalength sanity checking for AvatarData packet
 2014-03-21 14:48:07 -07:00
ZappoMan
2c8c43094f CR feedback 2014-03-21 14:46:46 -07:00
Brad Hefta-Gaub
c06caa4a4e Merge pull request #2422 from PhilipRosedale/master 
Bots can see voxels and move joints, fix drag bug in editVoxels
 2014-03-21 14:31:55 -07:00
ZappoMan
3cb3cb81c4 fixes to voxel server crashes on client shutdown 2014-03-21 14:15:02 -07:00
Stephen Birarda
1580896ec4 don't use a trailing average for loudness 2014-03-21 11:42:02 -07:00
Philip Rosedale
6e41d93e0a Merge pull request #2429 from birarda/audio-scaling 
use epsilon value to drop average loudness to zero
 2014-03-21 11:30:36 -07:00
Stephen Birarda
5a6456c29f use an epsilon value to drop average loudness to zero 2014-03-21 11:29:16 -07:00
Andrzej Kapolka
924e5517f4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-21 11:12:10 -07:00
Stephen Birarda
acedc555d5 Merge pull request #2424 from birarda/audio-scaling 
move and remove some debugging for audio mixer
 2014-03-21 10:26:41 -07:00
Stephen Birarda
c1cbc79807 move debug for no reply domain checkins to ThreadedAssignment 2014-03-21 10:26:09 -07:00
Stephen Birarda
6f37bb54f8 suppress useless audio debug 2014-03-21 10:19:17 -07:00
Andrzej Kapolka
9c2f6ab2e5 Working on delta streaming for collections. 2014-03-20 18:28:43 -07:00
Philip Rosedale
f72061801c Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 17:21:31 -07:00
Philip Rosedale
b49058ea77 Merge pull request #2402 from Atlante45/inspect_js 
Inspect js
 2014-03-20 17:21:21 -07:00
Philip Rosedale
31ddbf4ae4 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 17:18:31 -07:00
Philip Rosedale
57fb0c9d0f Merge pull request #2413 from birarda/audio-scaling 
more audio scaling tweaks
 2014-03-20 17:12:28 -07:00
Stephen Birarda
5ae63c5b0f use a trailing average for sleep time, move loudness to RB 2014-03-20 17:10:24 -07:00
Andrew Meadows
1214794f05 QMap is not used by AvatarData 2014-03-20 17:03:28 -07:00
Philip Rosedale
dcf0ccf7b1 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 16:53:55 -07:00
Andrew Meadows
22aa9b075d datalength sanity checking for AvatarData packet 2014-03-20 16:52:40 -07:00
Philip Rosedale
5d361a1bd0 Merge pull request #2403 from Atlante45/fix_models_upload 
Fix models upload
 2014-03-20 16:20:38 -07:00
Atlante45
746d109025 Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 16:10:33 -07:00