Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 12:40:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 72 branches 59 tags 1.2 GiB
Commit graph

3342 commits

Author SHA1 Message Date
humbletim
dfb1619dc6 CR feedback; using namespace AssetUtils => inline AssetUtils:: 2018-01-18 21:49:53 -05:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request 2018-01-17 17:11:33 -05:00
Stephen Birarda
c90cdf52b4 remove unecessary parenting of Agent script engine 2018-01-17 11:02:56 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics 
Rename libraries/model -> libraries/graphics
 2018-01-16 18:12:25 -08:00
Clément Brisset
858221d4db
Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash 
Fix concurrent access crash in avatar mixer
 2018-01-16 11:07:59 -08:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Ken Cooke
7c5085bd24 Handle stereo changes while active, by restarting the codec on both ends 2018-01-11 16:10:50 -08:00
Ken Cooke
6a2e3cc272 Enable stereo codecs for AvatarAudioStream 2018-01-10 15:14:18 -08:00
Ken Cooke
660032d8fb Fix bug in how emitAudioPacket() determines mono/stereo. 
Compressed bytes were counted as if audio samples.
 2018-01-10 06:54:27 -08:00
Ken Cooke
c363a9281e Fix another bug in audio-mixer audio packet parsing. 
For SilentAudioFrame packets, numSamples was being read as channel flag.
 2018-01-09 16:54:14 -08:00
Ken Cooke
ad2a031060 Fix bug in audio-mixer audio packet parsing. 
Codec string was being read as channel flag.
 2018-01-09 16:44:48 -08:00
Atlante45
776a2e8373 Fix concurrent access crash in avatar mixer 2018-01-09 11:24:34 -08:00
humbletim
a863aec4a0 put existing AssetUtils functions in namespace per CR feedback 2018-01-03 04:01:43 -05:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
Stephen Birarda
e3cbfd92a0 Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back 2017-12-22 15:48:04 -08:00
Stephen Birarda
18993a8f72 fix for AvatarData retrieval from SortableAvatar in PriorityQueue 2017-12-21 15:11:34 -08:00
Thijs Wenker
1bfb62bd7f list assignment types in assignment-client help 2017-12-18 15:32:32 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Andrew Meadows
db6505493f fix avatar-mixer crash: don't use global callback 2017-12-11 14:04:39 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process 
Move asset server baking to a separate process
 2017-12-09 20:48:14 -08:00
Ryan Huffman
65649fc331 Remove _outputDir from BakeAssetTask 2017-12-08 17:56:33 -08:00
Ryan Huffman
5cf2ab5cbd Remove unnecessary logging on BakeAssetTask 2017-12-08 17:53:49 -08:00
Ryan Huffman
239877fc18 Remove _didFinish from BakeAssetTask 2017-12-08 17:47:57 -08:00
Ryan Huffman
50c47c785d Fix BakeAssetTask not handling case where oven process is not found 2017-12-08 17:45:42 -08:00
Ryan Huffman
94a58a2471 Remove baking dependency from assignment-client 2017-12-07 10:53:23 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Ryan Huffman
2eecb41337 Update metatype registration in assetBakeTask 2017-12-06 13:59:46 -08:00
Ryan Huffman
6b098bfc6a Fix aborted baking in oven cli 2017-12-06 13:51:31 -08:00
Ryan Huffman
cb9a30413d Rename removeTemporaryDis to removeTemporaryApplicationDirs 2017-12-06 12:50:20 -08:00
Ryan Huffman
f20aa2e680 Fix asset server baking not working on *nix 2017-12-06 11:49:34 -08:00
Ryan Huffman
bee666b522 Add error text reading to asset server baking 2017-12-06 11:49:34 -08:00
Ryan Huffman
de7e3e60cd Add temp dir removal to asset server 2017-12-06 11:49:34 -08:00
Ryan Huffman
7eb93f4777 Add oven as dep to assignment-client 2017-12-06 11:49:34 -08:00
Ryan Huffman
f3fc5769e8 Move asset baking on asset server to separate process 2017-12-06 11:49:19 -08:00
Andrew Meadows
eb120b1bc1 use correct timestamp of avatar's outgoin data 2017-11-30 11:03:27 -08:00
Andrew Meadows
e212ac67c1 enable custom avatar sort tuning 2017-11-28 11:30:06 -08:00
Andrew Meadows
e4436d264a simplify for-loop format 2017-11-28 09:14:05 -08:00
Andrew Meadows
deccc54965 remove cruft 2017-11-28 09:14:05 -08:00
Andrew Meadows
e068eb879c use PrioritySortUtil for outgoing avatar updates 2017-11-28 09:11:14 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain 
Adjustable master avatar volume
 2017-11-17 16:58:27 -08:00
Stephen Birarda
dd27e3db31 add diff traversal reset when resetting state 2017-11-17 09:44:35 -08:00
Stephen Birarda
eedb77dae9 add clearing of known state if client resets ES connection 2017-11-16 11:40:35 -08:00
Clément Brisset
2b39cb4500
Merge pull request #11832 from highfidelity/RC59 
Merge RC59 into master
 2017-11-16 11:19:54 -08:00
Atlante45
d8b1cb10df CR 2017-11-15 11:20:30 -08:00
Stephen Birarda
557ee458ec wait for node active socket before constructing packets 2017-11-14 17:08:01 -08:00
Ken Cooke
9810d1582d CR fixes 2017-11-14 14:36:37 -08:00
Stephen Birarda
05a38a78c5 don't send octree data without first query 2017-11-14 14:08:27 -08:00
Atlante45
462ec30cac Utilise Windows Job Object so child dies w/ parent 2017-11-14 11:41:43 -08:00
David Rowe
05275afb4f Resending full scene is not necessary after all 2017-11-05 15:48:02 +13:00
David Rowe
a76b7855b5 Record only explicitly filtered-in entities for flagging extras 2017-11-05 15:03:43 +13:00
David Rowe
4a5f52155c Pin node pointer 2017-11-05 14:33:30 +13:00
David Rowe
2d27a6cf4c Merge branch 'master' into 21580 2017-11-05 13:59:43 +13:00
Ken Cooke
68e9ec9b23 Use qCDebug instead of qDebug in audio-mixer 2017-11-02 16:36:45 -07:00
Zach Fox
48979a5ce8
Merge pull request #11730 from zfox23/pop_avatarEntityTests 
Commerce: Avatar Entity Tests
 2017-11-02 15:34:37 -07:00
Stephen Birarda
25c10d5de2
Merge pull request #11735 from highfidelity/stable 
Merge stable back into master
 2017-11-02 14:22:31 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
Zach Fox
8a6a744099 It's working 2017-11-01 10:46:13 -07:00
David Rowe
328fc29bc5 Fix serverScripts not being able to see entities in parent/child tree 2017-11-01 17:01:19 +13:00
Zach Fox
e9c144892a Fixes 2017-10-31 13:11:32 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
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
utkarshgautamnyu
463afd6be5 made updates to fix building 2017-09-28 11:12:26 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
utkarshgautamnyu
258c32f9aa Update AssetServer.cpp 2017-09-26 11:52:25 -07:00
utkarshgautamnyu
e81501a4d1 Update AssetServer.cpp 2017-09-26 11:08:48 -07:00
utkarshgautamnyu
0260749b6b Update AssetServer.cpp 2017-09-26 11:02:22 -07:00
utkarshgautamnyu
9e91ab7630 Update AssetServer.cpp 2017-09-25 20:19:53 -07:00
utkarshgautamnyu
91dad385a6 Refactored AssetServer.cpp 2017-09-25 15:12:04 -07:00
utkarshgautamnyu
cda5e94b33 Added JavaScript Baking 2017-09-22 20:57:18 -07:00
Atlante45
a4b9945226 Fix use after free in deleteMappings 2017-09-21 16:22:51 -07:00
Ryan Huffman
abbe263142 Fix FBXBaker not properly handling textures with the same name 2017-09-21 13:40:39 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
Atlante45
dd050e103f Don't redirect to the same hash. 2017-09-20 18:45:45 -07:00
Stephen Birarda
f6d3960160 fix call to maybeBake when looking at skybox 2017-09-20 15:58:52 -07:00
Stephen Birarda
29a9331f14 change include for QUrlQuery to be consistent 2017-09-20 12:55:50 -07:00
Stephen Birarda
d4e35edc84 add memory for unique_ptr in BakeAssetTask 2017-09-19 15:08:44 -07:00
Stephen Birarda
a8ac015bc4 address code review comments 2017-09-19 13:56:42 -07:00
Stephen Birarda
e1d79ee8f4 add abort to Baker and subclasses 2017-09-19 13:18:23 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Atlante45
9e11ae311e Fix error reporting 2017-09-13 09:54:55 -07:00
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
Atlante45
48e58febc6 Remove deprecated AutoBaker 2017-09-13 09:54:54 -07:00
Daniela
6941a10639 Add SensorToWorldScale factor to the bounding box dimensions in AvatarMixerSlave. 2017-09-12 21:10:19 +01:00
Daniela
5a918a3033 Add SensorToWorldScale factor to the bounding box dimensions. 2017-09-12 19:00:57 +01:00
Daniela
c88c70aa6f Add SensorToWorldScale factor to the bounding box dimensions. 2017-09-12 18:11:45 +01:00
Brad Hefta-Gaub
6a1fe81832 Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 
split packet construction from packet sending in OctreeSendThread
 2017-09-07 12:36:29 -07:00
Stephen Birarda
bd36ba19b3 fix dereference of end iterator 2017-09-07 12:07:58 -07:00
Stephen Birarda
e4de869db6 fix iterator find from merge 2017-09-07 12:07:58 -07:00
Stephen Birarda
e25b4700d9 re-set defaults in texture baking when AssetServer done 2017-09-07 12:07:57 -07:00
Stephen Birarda
26b74db864 enable compression in image library from Asset Server 2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
Clément Brisset
7d4f17506e Merge branch 'feat/auto-bake' into feat/bake-meta-errors 2017-09-01 17:33:25 -07:00
Stephen Birarda
55d44a8c8f Merge pull request #11285 from Atlante45/feat/baking-enabled 
Wire "Use baked" checkbox
 2017-09-01 16:25:49 -07:00
Ryan Huffman
eb2e87a798 Change it++ to ++it 2017-09-01 13:02:25 -07:00
Ryan Huffman
5ee33085a5 Add handling of failedLastBake error in getAssetStatus 2017-09-01 10:37:28 -07:00
Ryan Huffman
7a68788c8c Fix warning for non-const default in AssetServer 2017-08-31 16:22:46 -07:00
Atlante45
cdfae714b5 Remove baking tasks for hash once done 2017-08-31 15:51:47 -07:00
Ryan Huffman
25f64e1aa9 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 15:17:40 -07:00
Ryan Huffman
d2c7235fed Fix update to count width in GetAllMappings 2017-08-31 14:41:29 -07:00
Atlante45
a9cfc01df3 Set Baking Enabled API 2017-08-31 13:11:27 -07:00
Atlante45
aad0be2693 Set baking enabled mappings 2017-08-31 13:10:07 -07:00
Atlante45
764e5d2e4c Move constant to central location 2017-08-31 13:08:18 -07:00
Atlante45
da2bede6fe Hide .baked items from the Asset Browser 2017-08-31 13:08:18 -07:00
Atlante45
3aee6db1e8 Log baker errors 2017-08-31 13:08:18 -07:00
Ryan Huffman
0cd8a5cd41 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 12:09:21 -07:00
Ryan Huffman
9ce0f03aa2 Fix mapping comparision in getAssetStatus being done against path 2017-08-31 11:58:03 -07:00
Ryan Huffman
d68338f0b0 Add error handling to asset server baking 2017-08-30 16:53:31 -07:00
Stephen Birarda
f2997c0997 refuse to perform mapping operations in /.baked/ 2017-08-30 14:30:08 -07:00
Ryan Huffman
f89459525e Merge pull request #11257 from birarda/feat/delete-baked-with-original 
add deletion of baked content when original removed
 2017-08-29 13:18:58 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server 
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
 2017-08-28 15:54:40 -07:00
Stephen Birarda
6992bd6f48 add deletion of baked content when original removed 2017-08-28 15:38:31 -07:00
Stephen Birarda
79231cdee0 fix switched signature for completed bake handling 2017-08-25 17:10:09 -07:00
Stephen Birarda
cc7dd2162b fixes for OS X build 2017-08-25 17:03:52 -07:00
Atlante45
0755b77615 Fix for mac build 2017-08-25 16:32:32 -07:00
Atlante45
065721d23f Merge branch 'feat/auto-bake' of https://github.com/huffman/hifi into feat/auto-bake 2017-08-25 16:22:14 -07:00
Ryan Huffman
7d08a5788f Move outputFiles from FBXBaker to Baker 2017-08-25 16:21:00 -07:00
Atlante45
700b11e28b Fix bad conditional 2017-08-25 16:17:37 -07:00
Atlante45
a36ddf7b6d Fix failed connection 2017-08-25 16:13:29 -07:00
Atlante45
eaa2b9fda8 Fix packet version conflict 2017-08-25 15:36:33 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
7d103d24f4 Integrate my and Huffman's work 2017-08-25 15:21:08 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
859ec57ded Move Baking Status 2017-08-25 10:54:33 -07:00
Atlante45
fd3156b57c Move BakingStatus 2017-08-25 10:54:33 -07:00
Atlante45
fac6015bb0 Asset baking status first pass 2017-08-25 10:54:30 -07:00
Atlante45
cefd16ad95 Fix asset server debug messages logging category 2017-08-25 10:52:49 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Andrew Meadows
d6b914283c use sane running average window 2017-08-24 13:56:34 -07:00
Andrew Meadows
45f194f6bc use SKIP_TIME again instead of 0.0 2017-08-23 14:05:05 -07:00
Andrew Meadows
4be119b729 make SKIP_TIME work as intended 2017-08-23 14:04:30 -07:00
Andrew Meadows
8ad41227ce use more correct method name 2017-08-18 13:35:13 -07:00
Andrew Meadows
65cf7b4f61 add OctreeSendThread::traverseAndBuildPacket() 
cleanup and split data packing from bandwidth management
 2017-08-18 11:32:05 -07:00
Andrew Meadows
075b8574fb using 0.0 for time stats is unambiguous 2017-08-18 11:31:03 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Liv
1ae4a5c019 remove class from function call 2017-08-15 15:30:43 -07:00
Stephen Birarda
96672becc6 read redirected path info in MappingRequest 2017-08-15 15:19:20 -07:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Liv
49eab847fd Refactor handleOctreeFileReplacement, style changes, align with handler for other file types 2017-08-15 13:58:02 -07:00
Stephen Birarda
03e952ec38 fix extension check for get mapping redirect 2017-08-14 14:09:35 -07:00
Stephen Birarda
db3524a48f add re-direct of get mapping for baked assets 2017-08-11 14:26:27 -07:00
Stephen Birarda
bef093b8e5 add handling for completed bake 2017-08-11 13:40:30 -07:00
Stephen Birarda
8d0ed51035 clear entity tree in Agent if ES disappears 2017-08-10 11:02:56 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Brad Davis
1ecca9fd29 Merge branch 'master' into zzmp-audio/peak-values 2017-08-06 17:21:00 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
Ken Cooke
6ea4ed80cd Suppress initial PacketType::SilentAudioFrame on audio gate startup 2017-08-03 09:19:08 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Burt Sloane
d2975c79c9 add midi to 3 CMakeLists.txt for linking 2017-07-26 08:41:26 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
Liv
76cc833747 move domain management into a separate API 2017-07-21 17:44:53 -07:00
Liv
5ea7fbc62a Add node check on permissions for deletion 2017-07-21 10:27:30 -07:00
Liv
26558da794 Fix stupid typo that was giving connection refused - now working 2017-07-20 18:07:08 -07:00
Liv
4ba9b08125 first attempt at url handling in octree server 2017-07-20 14:00:51 -07:00
Liv
bdb12c38cf Move API call to Entities scripting and out of Users 2017-07-20 11:41:57 -07:00
Andrew Meadows
a069620013 Merge pull request #10970 from Atlante45/feat/ac-shutdown-info 
AC shutdown info + PPID watcher on Unix
 2017-07-19 08:34:45 -07:00
Atlante45
91d65469a0 Use timer instead of dedicated thread to tick avatar 2017-07-17 15:52:52 -07:00
Atlante45
366ce69e66 Add info on how the child AC finished 2017-07-14 11:39:32 -07:00
Brad Hefta-Gaub
b063c2f45d Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission 
Cleanup OctreeSendThread::packetDistributor()
 2017-07-13 09:58:28 -07:00
Clément Brisset
d346b1c68f Merge pull request #10924 from Atlante45/fix/debug-asserts 
Misc servers debug asserts fixes
 2017-07-12 15:05:15 -07:00
Ken Cooke
cf6c1ae4a5 Replace tabs with spaces 2017-07-12 12:30:02 -07:00
Atlante45
b3d73fd0df Add comments to DebugDraw instanciation 2017-07-12 10:39:15 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Andrew Meadows
1fe7718b9f restore wasted byte count when unable to fit stats 2017-07-11 15:02:45 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Andrew Meadows
badbe98097 minor cleanup and constency for packet stats 2017-07-11 14:21:49 -07:00
Andrew Meadows
3226d33830 use cached OctreeSendThread::_nodeUuid 2017-07-11 14:02:16 -07:00
Andrew Meadows
15879b2832 + OctreeSendThread::traverseTreeAndSendContents() 
this abstracts a portion of OctreeSendThread::packetDistributor()
which will make it easier to split apart the tree traversal
from the sending of packets

also cleaned up some of the packet stats tracking
 2017-07-11 13:53:08 -07:00
Andrew Meadows
9d111d1f92 remove unused OctreeSendThread::_nodeMissingCount 2017-07-11 13:42:35 -07:00
Andrew Meadows
a5cd11cea7 remove more crufty comments 2017-07-11 10:11:24 -07:00
Andrew Meadows
ca3f0ceecb remove crufty comments 2017-07-11 10:02:18 -07:00
Andrew Meadows
076ae28bed one less strand of spaghetti when counting packets 2017-07-11 09:52:39 -07:00
Andrew Meadows
b74aad32ed minor cleanup in OctreeSendThread::packetDistributor() 2017-07-10 18:27:40 -07:00
Atlante45
c32f4ab0d3 CR 2017-07-10 14:24:53 -07:00
Stephen Birarda
98ccfa80a2 don't add node missing from a replicated kill packet 2017-07-10 11:14:13 -07:00
Atlante45
7160fca4f7 Fix bad read access on shutdown 2017-07-07 17:14:08 -07:00
Atlante45
aa306c3450 Fix debug asserts on shutdown 2017-07-07 17:01:07 -07:00
Stephen Birarda
420e9233b6 Revert "fix for invisible avatars after radius ignore" 2017-07-07 16:50:28 -07:00
Stephen Birarda
f07ce6d294 Merge pull request #10835 from birarda/bug/invisible-avatars 
fix for invisible avatars after radius ignore
 2017-07-07 16:06:44 -07:00
Atlante45
0778fbaea9 Fix Debug Mode Assert 2017-07-07 15:58:39 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
Atlante45
1d07ab70f0 Fix warnings 2017-07-06 10:56:09 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Atlante45
95abbd0ad4 Prevent Interface from trying to send packets bigger than an MTU 2017-07-05 17:08:04 -07:00
Seth Alves
70a7b302fc Merge pull request #10860 from jherico/deadlock_guards 
Don't use blocking connections on the main thread
 2017-07-03 09:05:56 -07:00
Clément Brisset
8744b8e58d Merge pull request #10859 from Atlante45/fix/ac-cleanup 
Fix AC cleanup
 2017-06-30 16:42:15 -07:00
Stephen Birarda
f6fe3f91fd Merge pull request #10829 from birarda/bug/sequence-skips 
fix avatar mixer sending empty avatar identities
 2017-06-30 15:28:29 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
Atlante45
76e39a3ebd Make code windows specific 2017-06-29 10:54:44 -07:00
Atlante45
a66e1148ba Preliminary work on AC auto cleanup 2017-06-28 19:20:18 -07:00
Thijs Wenker
e781f97ddc Merge pull request #10846 from sethalves/fix-server-scripts-more 
make ResourceManager be owned by DependencyManager
 2017-06-28 17:05:30 -07:00
Thijs Wenker
93679f7c3b move the ResourceManager init back to where it was, to prevent problems 2017-06-29 00:52:51 +02:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Stephen Birarda
86eb5b14ca disable the user activity logger in DS/AC/ac-client 2017-06-28 13:19:58 -07:00
Ken Cooke
a7a049434d CR fix: comments instead of ref code 2017-06-28 11:32:41 -07:00
Stephen Birarda
9e822de196 remove local collection of radius ignored nodes 2017-06-27 17:41:07 -07:00
Stephen Birarda
e6cf7cf106 flag last broadcast for identity in right place 2017-06-27 14:25:53 -07:00
Ken Cooke
a00cd42566 fast compute of HRTF gain 2017-06-27 14:01:28 -07:00
Ken Cooke
ad970c9f5c fast compute of HRTF azimuth 2017-06-27 13:45:18 -07:00
Stephen Birarda
af79555e4b make sure nodeData exists before using it 2017-06-27 12:05:35 -07:00
Stephen Birarda
089a2bb362 do not manage identity data without identity data received 2017-06-27 11:58:03 -07:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 from huffman/feat/pal-replicated 
Disable silence + ban buttons for replicated users
 2017-06-26 12:50:23 -07:00
Brad Davis
9c99b9d4c5 Merge pull request #10783 from sethalves/fix-linux-asan 
Fix linux asan
 2017-06-23 22:43:24 -07:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
Brad Davis
fe7d4b1d23 Remove dependency between codec plugins and UI 2017-06-23 12:25:18 -07:00
Seth Alves
5e2aeb96d3 Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan 2017-06-23 10:18:33 -07:00
Clément Brisset
3ea7b82d61 Merge pull request #10796 from birarda/bug/audio-codec-replication 
check for codec changes for replicated agents
 2017-06-22 16:51:40 -07:00
Stephen Birarda
ec30d9ad5c always re-process codec for replicated agent 2017-06-22 16:18:46 -07:00
Atlante45
71d2540a23 Prevent replication flat loops 2017-06-22 15:22:32 -07:00
Stephen Birarda
8b7eaaa23a activate the public socket always for upstream/downstream servers 2017-06-22 13:33:57 -07:00
Stephen Birarda
015284c0e6 do not attempt to replicate audio stream stats 2017-06-22 13:33:57 -07:00
Stephen Birarda
a6d34010b2 use reliable packet lists for replicated identity 2017-06-22 13:33:57 -07:00
Stephen Birarda
2de6185855 remove avatar mixer destructor 2017-06-22 13:33:57 -07:00
Stephen Birarda
d05996c13d fix upstream filter check, audio interest set 2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee send upstream nodes down to avatar/audio 2017-06-22 13:33:57 -07:00
Seth Alves
4c5090e8ac Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan 2017-06-22 13:11:17 -07:00
Stephen Birarda
42cceb02a4 push sequence number when managing identity data for agent 2017-06-22 11:10:43 -07:00
Seth Alves
7ff576ef18 add memory-debugging macro to some cmake files 2017-06-22 10:07:39 -07:00
Stephen Birarda
c516dd06e4 Merge pull request #10714 from highfidelity/replicants 
add broadcasting/replication to downstream avatar mixers and audio mixers
 2017-06-21 17:55:07 -07:00
Stephen Birarda
aeb3f443f8 address code review comments 2017-06-21 16:14:14 -07:00
Brad Hefta-Gaub
f7d42c782d Merge pull request #10764 from thoys/feat/ac-location-jsapi 
Expose location scripting interface to Agent (AC script)
 2017-06-21 10:22:48 -07:00
Ryan Huffman
8ce1474d9a Add isReplicated to avatar identity data 2017-06-21 09:48:34 -07:00
Thijs Wenker
47643e1efe Expose location API to Agent scripts (side-effect, agents now can teleport) 2017-06-21 06:31:36 +02:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Stephen Birarda
2933a20a0c some cleanup for audio/avatar replicated packet checking 2017-06-19 10:45:33 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Stephen Birarda
c332244f4f fix race for isUpstream and node hole punch 2017-06-15 17:34:20 -07:00
Stephen Birarda
e6ef153148 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants 2017-06-15 15:43:13 -07:00
Stephen Birarda
d7724b90af address code review comments 2017-06-15 15:01:03 -07:00
seefo
6d480600d8 Fixed a bug where custom port wasn't used in AC when passed through CLI 2017-06-15 14:59:36 -07:00
Stephen Birarda
6cf4ff1daf remove debug and fix peek of session ID 2017-06-15 13:44:44 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist 
avatar whitelist
 2017-06-15 08:45:16 -07:00
Stephen Birarda
747cca9beb don't manage display name or send empty to downstream 2017-06-14 17:17:32 -07:00
Stephen Birarda
1ed0b693da Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Stephen Birarda
806ebd3401 add return to queueReplicatedAudioPacket if no type match 2017-06-14 16:13:20 -07:00
Stephen Birarda
4c2fa4be64 fix indentation in AvatarMixerSlave/AvatarMixerSlavePool 2017-06-14 15:53:24 -07:00
Stephen Birarda
afc9978841 add a comment for hop over sequence in AudioMixerClientData 2017-06-14 15:20:47 -07:00
Stephen Birarda
9407a65f80 peek the nodeID to keep message in right place 2017-06-14 15:12:23 -07:00
Stephen Birarda
ca196f6141 Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream 2017-06-14 15:03:26 -07:00