Merge branch '220-1.10.25.2'

MeteorLite · Mar 24, 2024 · 7fe218f · 7fe218f
2 parents a792950 + 46c1d4e
commit 7fe218f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/cache/pom.xml b/cache/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.25.1</version>
+		<version>1.10.25.2</version>
 	</parent>
 
 	<artifactId>cache</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.10.25.1</version>
+	<version>1.10.25.2</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -65,7 +65,7 @@
 		<url>https://github.com/runelite/runelite</url>
 		<connection>scm:git:git://github.com/runelite/runelite</connection>
 		<developerConnection>scm:git:[email protected]:runelite/runelite</developerConnection>
-		<tag>runelite-parent-1.10.25.1</tag>
+		<tag>runelite-parent-1.10.25.2</tag>
 	</scm>
 
 	<developers>

diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.25.1</version>
+		<version>1.10.25.2</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>

diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.25.1</version>
+		<version>1.10.25.2</version>
 	</parent>
 
 	<artifactId>client</artifactId>

diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/priority_render.cl b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/priority_render.cl
@@ -236,8 +236,8 @@ float4 hillskew_vertexf(read_only image3d_t tileHeightImage, float4 v, int hills
     int sx = (int)(floor(fx));
     int sz = (int)(floor(fz));
     float it;
-    float h1 = mix(tile_height(tileHeightImage, plane, sx, sz), tile_height(tileHeightImage, plane, sx + 1, sz), fract(fx, &it));
-    float h2 = mix(tile_height(tileHeightImage, plane, sx, sz + 1), tile_height(tileHeightImage, plane, sx + 1, sz + 1), fract(fx, &it));
+    float h1 = mix((float)tile_height(tileHeightImage, plane, sx, sz), (float)tile_height(tileHeightImage, plane, sx + 1, sz), fract(fx, &it));
+    float h2 = mix((float)tile_height(tileHeightImage, plane, sx, sz + 1), (float)tile_height(tileHeightImage, plane, sx + 1, sz + 1), fract(fx, &it));
     float h3 = mix(h1, h2, fract(fz, &it));
     return (float4)(v.x, v.y + h3 - y, v.z, v.w);
   } else {

diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>net.runelite</groupId>
         <artifactId>runelite-parent</artifactId>
-        <version>1.10.25.1</version>
+        <version>1.10.25.2</version>
     </parent>
 
     <artifactId>jshell</artifactId>

diff --git a/runelite-maven-plugin/pom.xml b/runelite-maven-plugin/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.25.1</version>
+		<version>1.10.25.2</version>
 	</parent>
 
 	<artifactId>runelite-maven-plugin</artifactId>