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

This commit is contained in:
Owain van Brakel
2019-08-23 02:31:44 +02:00
30 changed files with 416 additions and 123 deletions

View File

@@ -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;

View File

@@ -52,7 +52,7 @@ in vec4 vUv[];
in float vFogAmount[];
out vec4 Color;
out float fHsl;
centroid out float fHsl;
out vec4 fUv;
out float fogAmount;

View File

@@ -961,3 +961,7 @@ R 49 92 51 92
// Iorwerth dungeon
#030A0A
R 49 193 51 194
// Braindeath Island
#8AD2DF
R 33 79 33 80