Ryan Huffman
c368c84f59
Make BakeAssetTask::abort thread-safe
2018-02-23 11:06:11 -08:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Stephen Birarda
a0f7d4dd34
use const auto & where possible as per CR comments
2018-02-22 18:08:08 -08:00
Stephen Birarda
d9d2b26519
delete baked content for unmapped files on AS startup
2018-02-22 16:55:35 -08:00
Simon Walton
619901caa0
Move up main #include for other AudioMixer*
...
Having #include first will make more robust for MOC compile problems.
Also fixes previous commit to use <> form and correct case.
See Case 12527.
2018-02-21 11:12:09 -08:00
Simon Walton
16ffcc7fe2
Add #include of Forward.h to AudioMixer.h
...
This makes the compile by Qt MOC less dependent on order of processing.
See Manuscript case 12527.
2018-02-21 09:48:15 -08:00
Atlante45
f6e9d2c6dd
Fix race condition in Asset Server
2018-02-15 18:16:30 -08:00
Atlante45
4482f9c83c
Queue all requests until the AS is fully setup
2018-02-15 11:27:21 -08:00
Ryan Huffman
0bbbff95cd
Fix replacement octree data not working
2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
1b7b4eee50
Fix entity data not being gzipped when adding id+version
2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup
...
Add asset server backups capabilities to the Domain Server
2018-02-13 17:40:11 -07:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
...
Misc bug fixes
2018-02-12 14:31:38 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
Atlante45
46449256ce
CR
2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257
Asset Server Backup
2018-02-09 11:32:42 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
...
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Atlante45
8ebb3e52d8
Misc bug fixes
2018-02-02 13:10:49 -08:00
Stephen Birarda
ffd10b79bf
refuse to handle positional audio streams with NaN position
2018-02-02 11:21:50 -08:00
David Rowe
280264d7ed
Add location.domainID as a synonym for location.domainId
...
And deprecate location.domainId.
2018-01-30 20:46:27 +13:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0
Remove some unneeded Qt dependencies
2018-01-28 22:18:24 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
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
