Commit graph

3029 commits

Author SHA1 Message Date
Ken Cooke
cfba6ae819 Implement master avatar gain in the audio-mixer 2017-10-31 11:18:03 -07:00
Zach Fox
19420a0ff2 Move static cert verify to properties 2017-10-30 17:01:55 -07:00
Ken Cooke
6ba2a83bbe Send and receive Avatar MASTER Gain packets, signaled using null nodeID.
Packet protocol change is not needed (existing audio-mixer will ignore).
2017-10-29 10:47:56 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Stephen Birarda
60fbbe4bc0 disable baking of JS files 2017-10-25 14:29:28 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
ZappoMan
275fff4609 more CR feedback 2017-10-24 14:02:47 -07:00
Zach Fox
c64c2e17c8 First pass at consolidation 2017-10-24 12:01:05 -07:00
ZappoMan
a1885926b5 some cleanup 2017-10-24 11:46:42 -07:00
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Zach Fox
3e139283ba Remove unnecessary newlines 2017-10-23 17:31:21 -07:00
Zach Fox
97d44e62c8 Fix bugs 2017-10-23 16:52:32 -07:00
Zach Fox
53081b51a6 Clean up as much as possible 2017-10-23 16:00:39 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
ZappoMan
a7e21d7e76 add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod() 2017-10-22 14:30:58 -07:00
ZappoMan
fb7f6df694 CR feedback 2017-10-22 11:40:41 -07:00
ZappoMan
934c9479af implement support for Entities.callEntityServerMethod() 2017-10-21 20:27:35 -07:00
Zach Fox
74180bc4cd Implement static cert verification correctly 2017-10-19 16:39:13 -07:00
Zach Fox
952160874c Stringmatch Domain ID instead of placename for DVV 2017-10-18 11:21:03 -07:00
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Zach Fox
e1b0e5a2dd Move some include files around 2017-10-16 16:00:32 -07:00
Zach Fox
a4b8bf0be6 Bugfixes and CR 2017-10-16 15:33:10 -07:00
Zach Fox
960f1fbfe4 Still broken, but safer 2017-10-16 13:28:14 -07:00
Zach Fox
febc725520 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57 2017-10-16 09:53:15 -07:00
Clément Brisset
725dc1851e Merge pull request #11412 from mnafees/21495
CR for Job #21495 - Add limit to file size imported into asset server
2017-10-13 13:45:42 -07:00
Zach Fox
1400c66506 Be a bit more thorough 2017-10-12 16:58:48 -07:00
Zach Fox
d75c0a00bb Closer than ever 2017-10-12 16:29:05 -07:00
Stephen Birarda
8a331e29a2 Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker
Feat/JS-Baker
2017-10-12 16:16:02 -05:00
Zach Fox
6a47884fcf Cleanup and fix 2017-10-12 13:41:19 -07:00
Zach Fox
abe1cd1b51 Minor cleanup 2017-10-12 11:53:47 -07:00
Mohammed Nafees
52e29c07cc Fix warning resulting in build error 2017-10-11 19:59:04 -04:00
Mohammed Nafees
19b00e1364 Add option to limit assets filesize in settings 2017-10-11 19:59:04 -04:00
Zach Fox
d8b84e6875 Minor cleanup 2017-10-11 13:26:32 -07:00
Zach Fox
1aaf1a19cd Quick fix for printing 2017-10-11 13:22:59 -07:00
Zach Fox
f05c709693 Remove static certificate verification for now 2017-10-11 12:06:11 -07:00
Zach Fox
8d887caa5d Make min and max dynamic verification times server settings 2017-10-09 11:37:02 -07:00
Seth Alves
4d2f16efc3 allow project to be built with clang on Linux 2017-10-08 18:01:41 -07:00
Zach Fox
c70ee6055f Don't clear cert ID if static properties change; updates to DDV 2017-10-06 17:12:40 -07:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -07:00
Zach Fox
e5e6d84e07 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-06 09:47:21 -07:00
Ryan Huffman
a6d148475b Add removal of temporary baked files in AssetServer 2017-10-05 09:08:42 -07:00
Zach Fox
f974672e7b Working way better than I expected 2017-10-04 15:19:06 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
Andrew Meadows
ad9a239b45 remove unused cruft 2017-09-29 11:34:36 -07:00
Andrew Meadows
86cbea73c8 less magic 2017-09-29 11:34:36 -07:00
Andrew Meadows
01304de8c2 indent switch statement, use const ref 2017-09-29 11:34:36 -07:00
Andrew Meadows
5dcd6bc496 namechange: apparentAngle --> angularDiameter 2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
SamGondelman
3ae41b9b75 cleanup client and stats string 2017-09-29 11:34:35 -07:00
SamGondelman
f7af581c71 track traversal time, rename entity server stat 2017-09-29 11:34:35 -07:00
Andrew Meadows
a56c076149 fix bad resolution during rebase 2017-09-29 11:34:35 -07:00
Andrew Meadows
99265a5758 remove extra parens 2017-09-29 11:34:35 -07:00
Andrew Meadows
25d250898b remove old debug info 2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173 fix Differential scan logic for LOD culling 2017-09-29 11:34:35 -07:00
SamGondelman
f2de03bc38 small fixes and LOD cull children instead of parent 2017-09-29 11:34:35 -07:00
Andrew Meadows
624d0c12a2 minor cleanup 2017-09-29 11:34:35 -07:00
SamGondelman
cbd20f89dd separate elementBag logic from EntityTreeSendThread 2017-09-29 11:34:35 -07:00
SamGondelman
bf1065b56e track encode stats 2017-09-29 11:34:35 -07:00
Andrew Meadows
a0f95ca5bd swap order of evaluation for minor theoretical speedup 2017-09-29 11:34:35 -07:00
Andrew Meadows
3433c5c414 remove redundant boolean logic 2017-09-29 11:34:35 -07:00
SamGondelman
defed80be7 edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes 2017-09-29 11:34:34 -07:00
SamGondelman
7938e301e7 full scene traversal and json filters 2017-09-29 11:34:34 -07:00
SamGondelman
0ad5f47bfd trying to fix entity editing bugs, needs testing 2017-09-29 11:34:34 -07:00
SamGondelman
6c066605cd add state to entity tree send thread 2017-09-29 11:34:34 -07:00
Andrew Meadows
6edba6d545 erase in _entitiesInQueue when pop _sendQueue 2017-09-29 11:34:34 -07:00
Andrew Meadows
535d84abc7 cleanup and speed up repeat traversals 2017-09-29 11:34:34 -07:00
Andrew Meadows
b788273f47 fix repeat First traversals mid-First-traversal 2017-09-29 11:34:34 -07:00
Andrew Meadows
d54fa205fb namechange entitiesToSend --> entitiesInQueue 2017-09-29 11:34:34 -07:00
SamGondelman
b85a5507e0 time budget and raw pointer key for entitiesToSend 2017-09-29 11:34:34 -07:00
Andrew Meadows
b6818c4369 first-pass sending entities from _sendQueue 2017-09-29 11:34:34 -07:00
Andrew Meadows
1562fb153e cherrypick traverseTreeAndBuildNextPacketPayload() 2017-09-29 11:34:34 -07:00
Sam Gondelman
a32cc7f555 typo 2017-09-29 11:34:34 -07:00
SamGondelman
971f1e7924 put lodLevelOffset back 2017-09-29 11:34:34 -07:00
SamGondelman
1930c8f215 only resort if view changed 2017-09-29 11:34:34 -07:00
SamGondelman
18f88a5a64 keep track of readded entities in a set to avoid rechecking them, compute priority early 2017-09-29 11:34:34 -07:00
SamGondelman
9fb7eb4ba6 resort _sendQueue when previous view didn't finish 2017-09-29 11:34:34 -07:00
Andrew Meadows
4f50b5755f remove crufty argument 2017-09-29 11:34:34 -07:00
SamGondelman
bb5368eb55 use correct rootSizeScale 2017-09-29 11:34:33 -07:00
SamGondelman
b0f30acce2 use cube instead of entityBounds 2017-09-29 11:34:33 -07:00
SamGondelman
4c8f683479 entity too small checks 2017-09-29 11:34:33 -07:00
Andrew Meadows
e114fa1b82 fix debug traversal repeat logic 2017-09-29 11:34:33 -07:00
Andrew Meadows
3e50d01734 more correct handling of LOD 2017-09-29 11:34:33 -07:00
Andrew Meadows
0758b60afc abstract DiffTraversal out of EntityTreeSendThread 2017-09-29 11:34:33 -07:00
Andrew Meadows
5fba4cb68c fix warning about truncation from double to float 2017-09-29 11:34:33 -07:00
Andrew Meadows
b537d3b1ee more helpful comments 2017-09-29 11:34:33 -07:00
Andrew Meadows
3eb9cd4251 add TODO comments 2017-09-29 11:34:33 -07:00
Andrew Meadows
abf968aab6 split EntityPriorityQueue stuff into separate file 2017-09-29 11:34:33 -07:00
Andrew Meadows
64cd209835 debug traverse again every two seconds 2017-09-29 11:34:33 -07:00
Andrew Meadows
a4564f89d7 traversals work and cull checks of unchanged content 2017-09-29 11:34:33 -07:00
Andrew Meadows
91908ca3da moved TreePathTraversal logic into EntityTreeSendThread 2017-09-29 11:34:33 -07:00
Andrew Meadows
bf27412091 cleanup 2017-09-29 11:34:33 -07:00
Andrew Meadows
64fa3ec88f repeated and differential view traversals work 2017-09-29 11:34:33 -07:00
Andrew Meadows
648b8ff054 fix repeated and differential traversals 2017-09-29 11:34:33 -07:00
Andrew Meadows
929d52276e minor cleanup 2017-09-29 11:34:33 -07:00
Andrew Meadows
7edd99ca0b add basics for send queue and tree traversal 2017-09-29 11:34:32 -07:00
Andrew Meadows
3ae5c215ba stub EntityTreeSendThread::traverseTreeAndSendContents() 2017-09-29 11:34:32 -07:00
utkarshgautamnyu
0bfb199fa0 Update BakeAssetTask.cpp 2017-09-28 11:24:45 -07:00
utkarshgautamnyu
32e319fedc Update AssetServer.cpp 2017-09-28 11:23:20 -07:00