Commit graph

74011 commits

Author SHA1 Message Date
sabrina-shanman
142e787a9c Create MIMETypeLibrary for general MIME type detection 2018-11-30 10:28:43 -08:00
sabrina-shanman
2919097f29 Complain about empty HFMModel when EITHER meshes or joints are empty 2018-11-28 15:58:02 -08:00
sabrina-shanman
b809eed01f Merge branch 'master' into hfm_mimetype 2018-11-28 15:06:04 -08:00
Jeff Clinton
f98f070c8b
Merge pull request #14445 from danteruiz/fix-stylus-dimensions
fixing keyboard mallets dimensions
2018-11-28 14:19:53 -08:00
Seth Alves
0de011dd71
Merge pull request #14478 from danteruiz/ScriptEngine-Crashes
Fix script engine crashes when reloading scripts.
2018-11-28 12:04:52 -08:00
Shannon Romano
ff934a8f87
Merge pull request #14394 from sabrina-shanman/hfm_serializer
(case 20005) Create HFMSerializer interface for model loaders
2018-11-28 11:10:27 -08:00
Zach Fox
022fea107f
Merge pull request #14476 from zfox23/payIn1
Pay-In API Frontend, Part One
2018-11-28 10:32:01 -08:00
Zach Fox
a4175b0428 Error handling in checkout 2018-11-27 14:17:28 -08:00
Jeff Clinton
fd87aad3c2
Merge pull request #14465 from sethalves/fix-up-disable-qml
make cmake -DDISABLE_QML=1 work again
2018-11-27 14:16:25 -08:00
sabrina-shanman
df1083970f Fix assert in ModelLoader.h 2018-11-27 14:07:03 -08:00
Seth Alves
8f21ade0c7 make cmake -DDISABLE_QML=1 work again 2018-11-27 12:41:40 -08:00
Shannon Romano
d6c7027fea
Merge pull request #14437 from sethalves/fix-asan-shared-lib-problem
fix linux + clang build when memory debugging is enabled
2018-11-27 12:25:13 -08:00
Sam Gateau
87730884ab
Merge pull request #14340 from Nex-Pro/patch-5
Change to English spelling of 'declination'
2018-11-27 10:53:28 -08:00
Zach Fox
67dfccafec Show item name when sending item 2018-11-27 10:19:14 -08:00
sabrina-shanman
fd83ae231b Fix case for ModelLoader import 2018-11-27 09:49:55 -08:00
Dante Ruiz
c4a9ca3445 fix interface crashing when reloading scripts 2018-11-27 09:32:37 -08:00
sabrina-shanman
d1f8bfe48b Move definition of supported file types into ModelLoader 2018-11-26 17:51:11 -08:00
sabrina-shanman
98853b5d1d Move FBXSerializer import by AnimationCache to source file 2018-11-26 16:30:18 -08:00
sabrina-shanman
b3d5f2fa65 Add MIME type-based Serializer selection 2018-11-26 16:30:18 -08:00
sabrina-shanman
2387641cbb Store the MIME type in HTTPResourceRequest::onRequestFinished() 2018-11-26 16:09:41 -08:00
sabrina-shanman
fc0a31fa0d Define ModelLoader instance in ModelCache 2018-11-26 16:09:41 -08:00
sabrina-shanman
f900a81e7a Add ModelLoader 2018-11-26 16:09:41 -08:00
Zach Fox
a9fd443f28 'improve' UI slightly 2018-11-26 16:03:07 -08:00
Zach Fox
31f7d747c8 Bugfixes; enable purchase asset from marketplace screen raise 2018-11-26 15:48:49 -08:00
Antonina Savinova
d547a29f94
Merge pull request #14438 from birarda/bug/update-wireshark-dissectors
update wireshark dissector with correct control packet types
2018-11-26 13:55:14 -08:00
Shannon Romano
422045861a
Merge pull request #14471 from jherico/fix/macbuild
Make vcpkg build default to home directory on mac
2018-11-26 13:30:06 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
Brad Davis
43b9aa29bc Make vcpkg build default to home directory on mac 2018-11-26 12:37:11 -08:00
John Conklin II
7e2f1ca64a
Merge pull request #14436 from birarda/bug/no-naks-after-timeout
ensure packets are always added to loss list after estimated timeout
2018-11-21 15:48:14 -08:00
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
Seth Alves
87878cbdee use -shared-libasan with clang whem memory debugging is enabled 2018-11-20 10:40:32 -08:00
John Conklin II
87cac67c75
Merge pull request #14280 from ElderOrb/FB17381
FB17381 - Reticle.setVisible isn't working
2018-11-20 09:53:52 -08:00
John Conklin II
04ccf9a257
Merge pull request #14435 from dback2/draggableNumberDelay2
Entity list - prevent draggable number updates while dragging
2018-11-20 09:16:14 -08:00
Dante Ruiz
db607e564f fixing keyboard mallets dimensions 2018-11-20 09:13:07 -08:00
John Conklin II
9b886ff725
Merge pull request #14391 from SimonWalton-HiFi/upload-to-ds-chunked
Upload content to domain server in multiple chunks
2018-11-19 17:53:44 -08:00
birarda
23857ea8c2 ensure packets are added to loss list after timeout 2018-11-19 17:40:55 -08:00
birarda
e52c7d9c85 update the control packet types after removals 2018-11-19 17:32:18 -08:00
David Back
dff4e34e7b CR changes 2018-11-19 16:59:33 -08:00
Jeff Clinton
30051f75da
Merge pull request #14434 from sethalves/fix-throw-from-worker
catch QString exceptions that ModelCache can throw
2018-11-19 16:36:52 -08:00
David Back
249ebb2389 remove unneeded 2018-11-19 16:21:52 -08:00
Ryan Huffman
b7fe3d47be
Merge pull request #14433 from huffman/fix/entity-properties-styling
Fix several entity tool window styling issues
2018-11-19 16:17:50 -08:00
David Back
ff6d43d0e4 block updates during dragging 2018-11-19 16:15:11 -08:00
Seth Alves
26a50e1820 don't log urls! 2018-11-19 15:38:12 -08:00
Simon Walton
2a7e22bf31 Identify initial chunk of an upload so as to be more resilient 2018-11-19 15:26:08 -08:00
Seth Alves
cd177a4457 catch QString exceptions that ModelCache can throw 2018-11-19 15:25:14 -08:00
John Conklin II
378742f896
Merge pull request #14431 from Atlante45/fix/throttle
Turn off throttling behavior when not throttling
2018-11-19 14:48:05 -08:00
Ryan Huffman
007396346c Fix grid tool styling 2018-11-19 14:07:24 -08:00
Simon Walton
987f5317a9
Merge pull request #14428 from birarda/bug/traits-in-budget
consider avatar traits bytes in budget and omit if over
2018-11-19 12:58:48 -09:00
Ryan Huffman
c87748830f
Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity
MS19903: don't trigger virtual keyboard scroll on non input focus.
2018-11-19 13:52:22 -08:00
Ryan Huffman
7694aa8e66 Fix draggable number going into edit too often 2018-11-19 13:51:25 -08:00