Commit graph

74040 commits

Author SHA1 Message Date
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
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
Shannon Romano
08bbe27522
Merge pull request #14489 from ctrlaltdavid/M17990-a
Remove unused avatar attachment constant
2018-11-30 09:37:40 -08:00
Jeff Clinton
04f09d70e3
Merge pull request #14464 from ctrlaltdavid/M17406
Fix fax grab to near grab transition and haptic pulses
2018-11-30 09:18:51 -08:00
Sam Gateau
1dcddb9541
Merge pull request #14440 from NissimHadar/19942-MacInstall
19942 Mac installation procedure
2018-11-29 14:38:07 -08:00
David Rowe
dc05cdee5a Merge branch 'master' into M17406
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabEntity.js
2018-11-30 09:44:09 +13:00
Jeff Clinton
be0a1ed2f8
Merge pull request #14498 from kencooke/audio-options-pitch-bugfix
Fix the audio injector "pitch" property
2018-11-29 10:07:07 -08:00
Seth Alves
87e4c17194
Merge pull request #14429 from danteruiz/disable-highlighting
Remove entity highlighting
2018-11-29 09:04:56 -08:00
Ken Cooke
88d935a28e Fix the audio injector "pitch" property 2018-11-29 08:12:14 -08:00
Shannon Romano
f4535e6784
Merge pull request #14493 from kencooke/audio-asan-warnings2
Fix UBSAN warning
2018-11-28 18:09:36 -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
Jeff Clinton
f98f070c8b
Merge pull request #14445 from danteruiz/fix-stylus-dimensions
fixing keyboard mallets dimensions
2018-11-28 14:19:53 -08:00
David Rowe
1683179fe5 Remove unused constant 2018-11-29 09:14:10 +13: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
Dante Ruiz
8be775c2b7 don't save joint information for avatar entities 2018-11-28 10:54:39 -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
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
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
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
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -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
Dante Ruiz
9cc896c4a8 fixing keyboard mallets dimensions 2018-11-27 10:34:34 -08:00
Zach Fox
67dfccafec Show item name when sending item 2018-11-27 10:19:14 -08:00
Dante Ruiz
c4a9ca3445 fix interface crashing when reloading scripts 2018-11-27 09:32:37 -08:00
NissimHadar
e587820de3 Should be v1.0 2018-11-26 16:18:43 -08:00
NissimHadar
ebc7875f5e Updated README.md 2018-11-26 16:03:40 -08:00
Zach Fox
a9fd443f28 'improve' UI slightly 2018-11-26 16:03:07 -08:00
NissimHadar
2ade0078f4 Updated README.md 2018-11-26 16:02:22 -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
David Rowe
c96cd422e1 Fix near parent grab tear away calc for avatar scale 2018-11-24 11:58:40 +13:00
David Rowe
f2abf8e398 Debounce haptic pulses at start of near parent grab 2018-11-24 11:43:05 +13:00
David Rowe
29c268df5a Remove extraneous grab entity haptic pulses 2018-11-24 11:38:54 +13:00
David Rowe
f1dad3c465 Add hystersis between near parent grabbing and tearing away 2018-11-24 08:35:02 +13:00
David Rowe
1362e7f361 Fix near parent grab entity tear away distance calc 2018-11-24 08:26:54 +13: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