Adam Smith
653974ca30
Merge pull request #14293 from SamGondelman/branching
...
Case 19473: Reduce branching in our shaders
2018-12-05 16:42:42 -08:00
Zach Fox
235b27a198
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308
Secret to Coupon ID
2018-12-05 16:34:53 -08:00
Clement
7723261cb9
Remove deferred script loading logic
2018-12-05 14:08:30 -08:00
SamGondelman
287878ff98
merge with master
2018-12-05 10:35:08 -08:00
Dante Ruiz
3123bb37e4
fix audio switching issue
2018-12-05 10:34:47 -08:00
Antonina Savinova
2dcfea5f7c
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak
...
Fix minor avatar-mixer memory leaks
2018-12-05 10:29:29 -08:00
SamGondelman
58396b845f
move back to plugin thread
...
(cherry picked from commit 98d3f6a9d1191031cda1ff040e69093ef6824f1c)
2018-12-04 17:38:48 -08:00
SamGondelman
0c64d1227a
fix vive crash
2018-12-04 16:41:03 -08:00
amantley
edab74caa4
mapped the model joint names to hifi compliant joint names in FBX serializer
2018-12-04 16:20:46 -08:00
Brad Hefta-Gaub
77e1c98264
Merge pull request #14528 from sethalves/fix-delete-home
...
work around menu-item name hash collision for Home
2018-12-04 15:04:25 -08:00
John Conklin II
725cf6c526
Merge pull request #14518 from hyperlogic/bug-fix/puck-offsets
...
Head and Hand offsets for Vive Trackers now function as expected
2018-12-04 14:25:02 -08:00
Adam Smith
763e6d1a95
Merge pull request #14444 from SamGondelman/actionData
...
Case 19861: Fix: Shouldn't be able to write actionData from script
2018-12-04 11:25:00 -08:00
Adam Smith
864e9ca8ae
Merge pull request #14443 from SamGondelman/hud
...
Case 19660: Fix HUD crash
2018-12-04 11:10:43 -08:00
John Conklin II
e4b68f1d38
Merge pull request #14455 from samcake/one
...
case 20041: Package all the graphics related objects and functions in Application in the Graphics Engine
2018-12-04 10:46:45 -08:00
Simon Walton
f3236e0843
Remove FST joint members from AvatarData
2018-12-04 10:45:32 -08:00
sabrina-shanman
ed1684967f
Remove straggler HFMSimpleFormat.cpp
2018-12-04 10:08:14 -08:00
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
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
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
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
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
