Commit graph

74027 commits

Author SHA1 Message Date
sabrina-shanman
1c9beed44f Fix ModelFormatRegistry Dependency inheritance being private 2018-12-04 09:30:05 -08:00
sabrina-shanman
3c38b43a65 Fix compilation error due to static variable definition in MIMETypeLibrary header file 2018-12-04 09:30:04 -08:00
sabrina-shanman
a63888cac8 Remove unused default constructor for GLTFSerializer 2018-12-04 09:30:04 -08:00
sabrina-shanman
a04c822ef0 Oops, ModelFormatRegistry needs to be defined as a Dependency before it can be used by DependencyManager 2018-12-04 09:30:04 -08:00
sabrina-shanman
da9f37bb39 Fix up HFMFormatRegistry to accept subclass factory unique pointers 2018-12-04 09:30:04 -08:00
sabrina-shanman
19459c15a5 Split MIMETypeLibrary file type detection into three separate functions 2018-12-04 09:30:04 -08:00
sabrina-shanman
660d8c4e92 Remove unused mapping parameter from MIME type detection 2018-12-04 09:30:04 -08:00
sabrina-shanman
0da4669370 Replace ReadWriteLockable with std::lock_guard in HFMFormatRegistry/ModelFormatRegistry 2018-12-04 09:30:04 -08:00
sabrina-shanman
6ec0e42ded Remove locks from MIMETypeLibrary 2018-12-04 09:30:04 -08:00
sabrina-shanman
bf1c5f2fa5 Make Serializer::Factory stored by HFMFormatRegistry unique_ptr 2018-12-04 09:30:03 -08:00
sabrina-shanman
30c4830bd8 Make Serializers use SimpleFormat 2018-12-04 09:30:03 -08:00
sabrina-shanman
2178baf1a8 Create SimpleFormat 2018-12-04 09:29:57 -08:00
sabrina-shanman
39d1a2be6f Simplify ModelLoader to utilize new model format registry 2018-11-30 16:50:53 -08:00
sabrina-shanman
243a1d6598 Add ModelFormatRegistry for handling model loading on the application side 2018-11-30 16:50:53 -08:00
sabrina-shanman
74015a1a5e Implement hfm::Format/hfm::Factory for model serializers 2018-11-30 16:50:53 -08:00
sabrina-shanman
d1ac501967 Create hfm::FormatRegistry, for more general model format definition 2018-11-30 16:50:45 -08:00
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 from danteruiz/fix-stylus-dimensions
fixing keyboard mallets dimensions
2018-11-28 14:19:53 -08:00
Seth Alves
0de011dd71
Merge pull request 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 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 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 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 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 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 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 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 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 from ElderOrb/FB17381
FB17381 - Reticle.setVisible isn't working
2018-11-20 09:53:52 -08:00
John Conklin II
04ccf9a257
Merge pull request 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