Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2019-11-28 19:34:22 +01:00
63 changed files with 1570 additions and 777 deletions

View File

@@ -174,7 +174,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
class60.pcmPlayer1 = HealthBarUpdate.method1776(GameShell.taskHandler, 1, 2048);
ClientPacket.pcmStreamMixer = new PcmStreamMixer();
class60.pcmPlayer1.setStream(ClientPacket.pcmStreamMixer);
LoginScreenAnimation.decimator = new Decimator(22050, Messages.field1274);
LoginScreenAnimation.decimator = new Decimator(22050, Messages.PcmPlayer_sampleRate);
Login.Login_loadingText = "Prepared sound engine";
Login.Login_loadingPercent = 35;
Client.titleLoadingStage = 50;