Brad Hefta-Gaub
|
a005f9e9ab
|
Merge pull request #14546 from danteruiz/fix-reload-scripts
fix realod all scripts functionality broken by PR14478
|
2018-12-09 17:30:36 -08:00 |
|
Brad Hefta-Gaub
|
0425ae1231
|
Merge pull request #14239 from ElderOrb/FB19219
FB19219 - Make avatarapp to handle wearables update via drag&drop
|
2018-12-09 17:20:13 -08:00 |
|
Jamil Akram
|
4e7a777fda
|
Merge pull request #14486 from amantley/jointNameMapping
FST File Joint Name Mapping From FBX Joint Names to Hifi Skeleton Joint Names
|
2018-12-07 17:07:37 -08:00 |
|
John Conklin II
|
69876bdec2
|
Merge pull request #14548 from SamGondelman/mirrorFix
Case 19473 (#2): Fix Mirror tonemapping
|
2018-12-07 16:11:59 -08:00 |
|
John Conklin II
|
0a80c16686
|
Merge pull request #14419 from SamGondelman/splash
Case 19740: Improve startup times by pre-compiling shaders with splash screen
|
2018-12-07 16:10:52 -08:00 |
|
Jeff Clinton
|
998ec20854
|
Merge pull request #14539 from Atlante45/fix/script-loading
Fix ESS scripts getting stuck on load
|
2018-12-07 12:07:44 -08:00 |
|
Stephen Birarda
|
e3e400c86f
|
Merge pull request #14549 from birarda/bug/no-initial-send
fix for initial send of non-instanced trait
|
2018-12-07 12:02:08 -08:00 |
|
Brad Hefta-Gaub
|
9428f1de33
|
Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst
Don't fetch avatars' .fst files from within the AvatarData class
|
2018-12-07 12:01:58 -08:00 |
|
Dante Ruiz
|
177a94b9a9
|
fix realod all scripts functionality
|
2018-12-07 11:48:03 -08:00 |
|
birarda
|
51fd742722
|
fix for initial send of non-instanced trait
|
2018-12-07 11:17:44 -08:00 |
|
SamGondelman
|
8431b3b0c1
|
correct order of mixes
|
2018-12-07 10:39:10 -08:00 |
|
Alexander Ivash
|
600d09e533
|
relax 'isWearable()' condition to match latest changes in 'master'
|
2018-12-07 11:23:17 +03:00 |
|
Alexander Ivash
|
72a91668a5
|
FB19219 Make avatarapp to handle wearables update via drag&drop
|
2018-12-07 11:23:17 +03:00 |
|
amantley
|
f8ae0227c3
|
added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp
|
2018-12-06 20:16:03 -08:00 |
|
Stephen Birarda
|
fb3cdabd87
|
Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock
fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer
|
2018-12-06 17:28:45 -08:00 |
|
amantley
|
ca0133a2a6
|
put the lean joint back in
|
2018-12-06 16:24:06 -08:00 |
|
Sam Gondelman
|
b690faeb12
|
Merge branch 'master' into NOverlays
|
2018-12-06 11:29:06 -08:00 |
|
Jeff Clinton
|
43f84a9577
|
Merge pull request #14426 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
|
2018-12-06 11:18:39 -08:00 |
|
Adam Smith
|
08d6e35d4d
|
Merge pull request #14372 from SamGondelman/decals
Case 19798: 3D projected Material Entities and materialRepeat option
|
2018-12-06 11:13:46 -08:00 |
|
Simon Walton
|
e03104cad5
|
Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst
Remove the code that was fixed in the conflicting PR - it's
now fixed in the new location.
|
2018-12-05 17:58:38 -08:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Simon Walton
|
f3236e0843
|
Remove FST joint members from AvatarData
|
2018-12-04 10:45:32 -08:00 |
|
Sam Gateau
|
d2ff4d4674
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-12-03 20:52:43 -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 |
|
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 |
|
Angus Antley
|
a73f74d63c
|
Merge remote-tracking branch 'upstream/master' into jointNameMapping
|
2018-11-30 21:29:29 -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 |
|
Clement
|
c53c52c7a0
|
Fix various Agent bugs
|
2018-11-29 17:42:04 -08:00 |
|
Ken Cooke
|
88d935a28e
|
Fix the audio injector "pitch" property
|
2018-11-29 08:12:14 -08:00 |
|
Sam Gateau
|
9353745054
|
MErge with master
|
2018-11-28 21:40:24 -08:00 |
|
Clement
|
181f2b4263
|
Fix Agent crash on shutdown
|
2018-11-28 18:40:52 -08:00 |
|
Ken Cooke
|
11252a8f56
|
Fix UBSAN warning (left-shift of negative integer) when peak limiter is called with implausibly large (or NaN) audio values
|
2018-11-28 16:48:34 -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 |
|
Sam Gondelman
|
860d920368
|
more typos
|
2018-11-28 09:55:10 -08:00 |
|
Sam Gondelman
|
ecd936705b
|
typo
|
2018-11-28 09:54:20 -08:00 |
|
Seth Alves
|
fac27553d7
|
suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.
|
2018-11-27 17:02:48 -08:00 |
|
Sam Gondelman
|
4d621ba61c
|
Merge branch 'master' into splash
|
2018-11-27 16:01:07 -08:00 |
|