Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 09:18:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12225 commits 25 branches 0 tags 1.1 GiB
Commit graph

3529 commits

Author SHA1 Message Date
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
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
Philip Rosedale
03381c3df8 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 15:34:28 -07:00
Philip Rosedale
f0d4efbd57 Merge pull request #2409 from birarda/audio-scaling 
add N loudest throttling for audio-scaling
 2014-03-20 15:32:28 -07:00
Atlante45
65603b0631 Fixed typo 2014-03-20 15:30:28 -07:00
Andrzej Kapolka
20e9572f60 Working on specialized delta streaming. 2014-03-20 14:20:05 -07:00
Andrzej Kapolka
8515e9e04b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 14:15:31 -07:00
Stephen Birarda
99c27cf748 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-scaling 2014-03-20 14:03:02 -07:00
Atlante45
bf85f8d5e5 Changed model_type to model_categorie in FstReader 2014-03-20 14:00:27 -07:00
Atlante45
a908c23f61 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload 2014-03-20 13:58:44 -07:00
Andrzej Kapolka
93846460ff Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 13:12:28 -07:00
Stephen Birarda
a8ef64e0ce calculate a cutoff loudness for mixer recovery 2014-03-20 12:52:17 -07:00
Atlante45
947dde3715 Modified models uploader to diferrenciate heads and skeletons 2014-03-20 12:44:37 -07:00
Atlante45
4604f5333d Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 12:15:55 -07:00
Andrzej Kapolka
20ae5c15f7 Added a "flat" mode for environments that makes them follow you around on the 
X/Z axes.  The default environment is flat.  Closes #2378.
 2014-03-20 12:09:20 -07:00
Andrzej Kapolka
a761a4862b Merge pull request #2398 from AndrewMeadows/emergency-fixes 
explicitly send neck angles in avatar data
 2014-03-20 11:19:13 -07:00
AndrewMeadows
144f86b540 Merge pull request #2370 from Atlante45/model_browsing 
Model browsing
 2014-03-20 11:15:35 -07:00
Andrew Meadows
6440dd1b5f explicitly send neck angles in avatar data 2014-03-20 11:05:14 -07:00
Philip Rosedale
3ab0288c4f testing numbered joint movement 2014-03-20 08:54:12 -07:00
Philip Rosedale
774b99d868 merge fix 2014-03-19 17:14:03 -07:00
Philip Rosedale
22048aaba5 Merge pull request #2392 from birarda/audio-scaling 
allow Agents to send microphone audio using Sound objects
 2014-03-19 17:00:46 -07:00
Philip Rosedale
527c0f5a73 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-19 16:27:39 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling 
Voxel Server Performance Improvements
 2014-03-19 16:24:47 -07:00
Stephen Birarda
8c4fad443f allow Agents to microphone audio from Sound objects 2014-03-19 16:14:58 -07:00
ZappoMan
f3968679d3 cleanup isInView() to use inFrustum() directly 2014-03-19 15:44:18 -07:00
Tony Hagale
7f2a92d759 #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:28:12 -05:00
Tony Hagale
5f94e44cde #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:26:45 -05:00
ZappoMan
3d0207b926 optimize OctreeElement::calculateShouldRender() 2014-03-19 13:54:06 -07:00
ZappoMan
adaa01c13e optimize isLeaf() to just check the child mask instead of counting children 2014-03-19 13:15:28 -07:00
ZappoMan
f3bd8925d9 optimized OctreeElement::furthestDistanceToCamera() 2014-03-19 12:48:11 -07:00
ZappoMan
252bc3b3ee optimized ViewFrustum::getFurthestPointFromCamera() 2014-03-19 11:51:47 -07:00
Atlante45
d239aecbfb Added names to signals argument 2014-03-19 10:17:28 -07:00
Philip Rosedale
c26ed77931 merge fix 2014-03-19 09:16:52 -07:00
Philip Rosedale
a1e07374d4 Merge pull request #2369 from ey6es/master 
Perform blending in worker threads and only do it when we have new data.  Removed some unused code and fixed a couple warnings.
 2014-03-19 08:59:20 -07:00
ZappoMan
584adfda08 cleanup headers 2014-03-19 00:32:38 -07:00
Philip Rosedale
9c8a4828f2 remove unused variable, function 2014-03-18 22:41:09 -07:00
Philip Rosedale
cad11978be Merge pull request #2368 from birarda/master 
suppress constant packet version mismatch debug
 2014-03-18 22:39:20 -07:00
Andrzej Kapolka
250f648f6f Merge pull request #2371 from AndrewMeadows/master 
fix bad startPosition in datagram unpack
 2014-03-18 17:50:39 -07:00
Andrzej Kapolka
f9fd0d432f Fix for reading aggregate avatar packets. 2014-03-18 17:48:57 -07:00
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -07:00
Andrew Meadows
6340024daa fix bad startPosition in datagram unpack 
The startPosition was wrong (too far back) and the bytesRead return
value was too big and the unpacking of the second chunk of the
datagram would start in the middle of the chunk.
 2014-03-18 17:42:58 -07:00
Atlante45
93f66b074a Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 17:37:07 -07:00
Andrzej Kapolka
6d0269d537 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 17:20:44 -07:00
Stephen Birarda
f86b793c96 only output version mismatch once per sender per packet 2014-03-18 17:14:57 -07:00
Andrzej Kapolka
f8c14a5717 Remove unused variable, reorder includes. 2014-03-18 17:06:01 -07:00
Stephen Birarda
281f2c6614 return false in packetVersionAndHashMatch on version mismatch 2014-03-18 17:04:27 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually 
received new data.  Closes #2075.  Closes #2348.
 2014-03-18 16:38:05 -07:00
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup 
Don't send redundant avatar hand/head data, and cleanup.
 2014-03-18 13:57:30 -07:00
Atlante45
6f50ea0faa Improved FileDownloader 2014-03-18 13:55:14 -07:00
Andrzej Kapolka
5c7d8e7c70 Merge pull request #2351 from AndrewMeadows/warnings 
removal of more compilation warnings
 2014-03-18 13:54:17 -07:00
Stephen Birarda
f80a077637 fix memory overrun from silent sample writing 2014-03-18 13:33:29 -07:00
Andrzej Kapolka
24b2da1c0d Working on delta streaming. 2014-03-18 13:14:21 -07:00
Stephen Birarda
9fbb4f1428 spacing fix and silent sample read fix 2014-03-18 13:04:28 -07:00
Stephen Birarda
e7acd0bad3 don't use QDataStream in parseData since we don't really need it 2014-03-18 12:58:29 -07:00
Andrew Meadows
4a1a7898ea Merge branch 'cleanup' into 'shapes' 2014-03-18 12:53:45 -07:00
Andrew Meadows
02c58447df merge upstream/master into "shapes" project 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	libraries/avatars/src/HandData.h
	libraries/shared/src/SharedUtil.h
 2014-03-18 12:41:20 -07:00
Andrew Meadows
a2fea49f58 bump version of PacketTypeAvatarData from 1 to 2 2014-03-18 12:36:48 -07:00
Andrzej Kapolka
a4cc15a2cd Collection streaming (untested). 2014-03-18 11:46:12 -07:00
Stephen Birarda
7ed982a073 cleanup writing of silent frame to ring buffer 2014-03-18 11:12:36 -07:00
Andrew Meadows
9079c3ecd8 explicit casts to remove warnings 2014-03-18 10:41:14 -07:00
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00