Merge remote-tracking branch 'runelite/master' into 1308-merge

2019-08-13 03:26:53 +02:00
parent fbcd682071 f8c09e0577
commit 83717e76ed
20 changed files with 168 additions and 142 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl
@@ -31,7 +31,7 @@ uniform float smoothBanding;
 uniform vec4 fogColor;

 in vec4 Color;
-in float fHsl;
+centroid in float fHsl;
 in vec4 fUv;
 in float fogAmount;

--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_agility.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_agility.json
@@ -82,7 +82,7 @@
      "level": 75,
      "icon": 23962,
      "name": "Prifddinas Agility Course",
-      "xp": 1220
+      "xp": 1337
    },
    {
      "level": 80,