From bf85cc25bd85e776a9ce2a1ba2f499b936185cdc Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Wed, 1 Jun 2016 18:51:38 +0100
Subject: [PATCH 1/4] OpenGL: Fix lower unpegged texture offset, fix lower
 unpegged + effect 1 so the texture actually skews

---
 src/hardware/hw_main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index bec9cdb1..18eecb77 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1719,12 +1719,12 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
 				if (!(gr_linedef->flags & ML_DONTPEGBOTTOM))
 					texturevpegbottom = 0;
 				else if (gr_linedef->flags & ML_EFFECT1)
-					texturevpegbottom = worldtop - worldlow;
+					texturevpegbottom = worldbottom - worldlow;
 				else
-					texturevpegbottom = gr_frontsector->ceilingheight - gr_backsector->floorheight;
+					texturevpegbottom = gr_frontsector->floorheight - gr_backsector->floorheight;
 #else
 				if (gr_linedef->flags & ML_DONTPEGBOTTOM)
-					texturevpegbottom = worldtop - worldlow;
+					texturevpegbottom = worldbottom - worldlow;
                 else
                     texturevpegbottom = 0;
 #endif
@@ -1752,9 +1752,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
 				else if (gr_linedef->flags & ML_DONTPEGBOTTOM)
 				{
 					// Skewed by bottom
-					wallVerts[0].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY;
-					wallVerts[2].t = wallVerts[3].t - (worldlowslope - worldlow) * grTex->scaleY;
-					wallVerts[1].t = wallVerts[2].t - (worldbottomslope - worldlowslope) * grTex->scaleY;
+					wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY;
+					//wallVerts[3].t = wallVerts[0].t - (worldlow - worldbottom) * grTex->scaleY; // no need, [3] is already this
+					wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * grTex->scaleY;
 				}
 				else
 				{

From dfe5246636772a51f6f10c829815abc184dba777 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 1 Jun 2016 14:00:14 -0400
Subject: [PATCH 2/4] appveyor: only for taggeed master builds

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index fd949dbb..85cee6a3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -75,6 +75,9 @@ deploy:
     folder: appveyor
     application:
     active_mode: false
+    on:
+      branch: master
+      appveyor_repo_tag: true
 
 
 on_finish:

From c863e311fe01f64f66e9850379491de2f2d19f7a Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Wed, 1 Jun 2016 19:22:54 +0100
Subject: [PATCH 3/4] OpenGL: Fix upper texture Effect 1 only skewing

---
 src/hardware/hw_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 18eecb77..c838e832 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1675,9 +1675,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
 				else
 				{
 					// Skewed by bottom
-					wallVerts[0].t = (texturevpegtop + worldhigh - worldtop) * grTex->scaleY;
-					wallVerts[2].t = wallVerts[3].t - (worldhighslope - worldhigh) * grTex->scaleY;
-					wallVerts[1].t = wallVerts[2].t - (worldhighslope - worldtopslope) * grTex->scaleY;
+					wallVerts[0].t = wallVerts[1].t = (texturevpegtop + worldtop - worldhigh) * grTex->scaleY;
+					wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * grTex->scaleY;
+					wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * grTex->scaleY;
 				}
 #endif
 			}

From a7640e4d6c133fa1451aab9856476db5f0b84ea5 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 1 Jun 2016 14:32:03 -0400
Subject: [PATCH 4/4] travis: compress the build cache

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 0102cc1b..e3408cf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -214,6 +214,7 @@ before_script:
   - mkdir build
   - cd build
   - export CFLAGS="-Wall -W $WFLAGS"
+  - export CCACHE_COMPRESS=true
   - cmake .. -DCMAKE_BUILD_TYPE=Release
 
 before_install: