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
Sam Gateau
d2ff4d4674
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-12-03 20:52:43 -08:00
Anthony Thibault
7f2e427584
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
...
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
2018-12-03 18:56:45 -08:00
Simon Walton
eb097af796
Remove all .fst downloads from AvatarData and its derived classes
2018-12-03 17:42:39 -08:00
Seth Alves
541d0ab4d6
work around menu-item name hash collision for Home
2018-12-03 17:33:04 -08:00
Simon Walton
9315c546d3
Initial version - move updateJoints() to derived class
2018-12-03 16:26:47 -08:00
Zach Fox
ab184c5c2b
Authorized Script to Coupon
2018-12-03 15:16:06 -08:00
birarda
c959dd7024
release avatar entity and traits locks sooner to avoid deadlock
2018-12-03 14:57:38 -08:00
amantley
f7fcf503c2
removed joint lean from fbxSerializer. it was unused
2018-12-03 14:50:57 -08:00
Clément Brisset
56ac34f9d1
Merge pull request #14506 from Atlante45/fix/misc-agent
...
Fix various AC bugs
2018-12-03 14:18:12 -08:00
Clément Brisset
62f21822ce
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash
...
Fix Agent crash on shutdown
2018-12-03 14:17:35 -08:00
Zach Fox
5b8c9d7cc1
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-12-03 12:11:55 -08:00
Thijs Wenker
f38f39c84d
ignore shortcuts in TEXTAREA elements
2018-12-03 19:42:57 +01:00
Zach Fox
2776839dff
Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval
...
Fix MS20117: Prevent HTML link from appearing in Wallet notification
2018-12-03 10:27:32 -08:00
David Back
a05e831333
Merge branch 'master' into draggableNumberFixes76-master
2018-12-03 09:42:58 -08:00
NissimHadar
f153d4fcae
Do not create empty recursive test scripts.
2018-12-02 20:13:58 -08:00
Anthony Thibault
c0bf832e39
Head and Hand offsets for Vive Trackers now function as expected
...
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now. This gives you the ability to adjust
the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
2018-12-02 16:18:36 -08:00
NissimHadar
f01b31e092
Merge branch 'master' of github.com:highfidelity/hifi into 20116_nitpick_v1.2
2018-12-01 20:24:28 -08:00
NissimHadar
a4689edee1
Added messages for completion of HTML creation.
2018-12-01 19:03:59 -08:00
NissimHadar
508a658752
Filenames are sorted in memory.
2018-12-01 18:41:44 -08:00
luiscuenca
ad42f6a590
Add method to check entities joint hierarchy
2018-12-01 12:32:29 -07:00
Angus Antley
a73f74d63c
Merge remote-tracking branch 'upstream/master' into jointNameMapping
2018-11-30 21:29:29 -08:00
Shannon Romano
3c43f44119
Merge pull request #14462 from huffman/fix/key-light-angle
...
Swap key light directions in Create
2018-11-30 19:28:53 -08:00
Shannon Romano
0d2b0903d8
Merge pull request #14469 from huffman/fix/draggable-input-tabbable
...
Fix draggable inputs not being tabbable
2018-11-30 19:28:11 -08:00
NissimHadar
6491ea23eb
Removed unneeded sort order and renamed folder.
2018-11-30 18:54:33 -08:00
Shannon Romano
5afff69b78
Merge pull request #14505 from huffman/fix/create-empty-rgb-field
...
Fix empty rgb field in Create going black
2018-11-30 18:19:44 -08:00
Clément Brisset
0dac8580ee
Merge pull request #14492 from Atlante45/fix/audio-mixer-crash-master
...
Fix audio mixer crash
2018-11-30 17:03:36 -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
Zach Fox
0d66d230c5
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-11-30 16:45:03 -08:00
Zach Fox
051b7cfbb8
Fix MS20117: Prevent HTML link from appearing in Wallet notification
2018-11-30 16:12:21 -08:00
NissimHadar
5f9f1ab092
All QDir iterators now sort in lexicographical order.
2018-11-30 14:43:53 -08:00
Shannon Romano
f3c0118602
Merge pull request #14454 from NissimHadar/19991-MacAppData
...
case 19991 - implement AppData for Mac
2018-11-30 11:38:21 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix
...
Fix QML achoring warnings on Layouts
2018-11-30 10:50:30 -08:00
sabrina-shanman
142e787a9c
Create MIMETypeLibrary for general MIME type detection
2018-11-30 10:28:43 -08:00
Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits
...
suppress 'No instance available' messages during shutdown. try a dif…
2018-11-30 10:10:43 -08:00
amantley
88a9a96346
removed the code that turns off inactive hands in MyAvatar.cpp
2018-11-30 10:08:05 -08:00
Shannon Romano
0bf5be57f8
Merge pull request #14488 from danteruiz/limit-avatar-entity-data
...
don't save joint information for avatar entities in avatarbookmarks.json
2018-11-30 09:49:01 -08:00
Shannon Romano
41ce976869
Merge pull request #14481 from danteruiz/master-mallets
...
fixing keyboard mallets dimensions (Master)
2018-11-30 09:46:32 -08:00
Shannon Romano
dacf43d70c
Merge pull request #14483 from danteruiz/keyboard-toggle-option
...
Keyboard menu option in general settings
2018-11-30 09:43:10 -08:00
Shannon Romano
1b24d051f7
Merge pull request #14432 from ctrlaltdavid/M17988
...
Fix memory accumulating while Interface is minimized
2018-11-30 09:39:14 -08:00
