From 6c7b21d7eee91c54b635efe680e27843f828fc0b Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <timfelgentreff@gmail.com>
Date: Tue, 15 Mar 2016 23:45:01 +0100
Subject: [PATCH 1/4] Fix loop length
---
src/video/png.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/video/png.cpp b/src/video/png.cpp
index 07ee7c874..643b8c681 100644
--- a/src/video/png.cpp
+++ b/src/video/png.cpp
@@ -353,7 +353,7 @@ void SaveScreenshotPNG(const char *name)
// switch back to framebuffer
glBindFramebuffer(GL_FRAMEBUFFER_EXT, fullscreenFramebuffer);
}
- for (int i = 0; i < Video.Height; ++i) {
+ for (int i = 0; i < Video.ViewportHeight; ++i) {
png_write_row(png_ptr, &pixels[(Video.ViewportHeight - 1 - i) * Video.ViewportWidth * 3]);
}
delete []pixels;
From a58f8dc0b9215c0761ab47ea26f9f5d6265327fd Mon Sep 17 00:00:00 2001
From: Sam Klein <srukle@users.noreply.github.com>
Date: Mon, 28 Mar 2016 20:48:42 -0500
Subject: [PATCH 2/4] correct small spelling mistake
---
doc/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/index.html b/doc/index.html
index c1c949040..cc0cca10d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -57,7 +57,7 @@
<ul>
<li>Wargus - Warcraft II - <a href="https://launchpad.net/wargus">https://launchpad.net/wargus</a>
<li>Doom Wars - <a href="http://stratagus.com/games/doom-wars">http://stratagus.com/games/doom-wars</a>
- <li>Wyrmsun - <a href="ttps://github.com/andrettin/wyrmsun">ttps://github.com/andrettin/wyrmsun</a><br>
+ <li>Wyrmsun - <a href="https://github.com/andrettin/wyrmsun">ttps://github.com/andrettin/wyrmsun</a><br>
(uses modified engine version : <a href="https://github.com/Andrettin/Wyrmgus">https://github.com/Andrettin/Wyrmgus</a>)</li>
<li>War1gus - Warcraft I - <a href="https://launchpad.net/war1gus">https://launchpad.net/war1gus</a>
<li>Stargus - Starcraft I - <a href="https://launchpad.net/stargus">https://launchpad.net/stargus</a>
From 5551213dc2cf76406fe57ea982960a8421469497 Mon Sep 17 00:00:00 2001
From: Sam Klein <srukle@users.noreply.github.com>
Date: Mon, 28 Mar 2016 21:15:43 -0500
Subject: [PATCH 3/4] Update index.html
---
doc/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/index.html b/doc/index.html
index cc0cca10d..f8cb1e021 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -57,7 +57,7 @@
<ul>
<li>Wargus - Warcraft II - <a href="https://launchpad.net/wargus">https://launchpad.net/wargus</a>
<li>Doom Wars - <a href="http://stratagus.com/games/doom-wars">http://stratagus.com/games/doom-wars</a>
- <li>Wyrmsun - <a href="https://github.com/andrettin/wyrmsun">ttps://github.com/andrettin/wyrmsun</a><br>
+ <li>Wyrmsun - <a href="https://github.com/andrettin/wyrmsun">https://github.com/andrettin/wyrmsun</a><br>
(uses modified engine version : <a href="https://github.com/Andrettin/Wyrmgus">https://github.com/Andrettin/Wyrmgus</a>)</li>
<li>War1gus - Warcraft I - <a href="https://launchpad.net/war1gus">https://launchpad.net/war1gus</a>
<li>Stargus - Starcraft I - <a href="https://launchpad.net/stargus">https://launchpad.net/stargus</a>
From 1d15c6dafde97bc44f8ccbcc3d7e746f761c2a50 Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <timfelgentreff@gmail.com>
Date: Mon, 23 May 2016 13:04:59 +0200
Subject: [PATCH 4/4] Don't build for XP any longer
---
appveyor.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 61142b355..05221d698 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2015
+# os: Visual Studio 2015
shallow_clone: true
configuration:
- Release
@@ -9,7 +9,7 @@ before_build:
- 7z x dependencies.zip
- appveyor DownloadFile https://github.com/jimpark/unsis/releases/download/2.50.0/nsis-2.50.0-Unicode-setup.exe
- nsis-2.50.0-Unicode-setup.exe /S /D=C:\Program Files (x86)\NSIS
- - cmake -G "Visual Studio 14 2015" -T v140_xp -DCMAKE_PREFIX_PATH="%cd%\\dependencies" -DENABLE_NSIS=ON -DENABLE_STDIO_REDIRECT=ON ..
+ - cmake -G "Visual Studio 14 2015" -DCMAKE_PREFIX_PATH="%cd%\\dependencies" -DENABLE_NSIS=ON -DENABLE_STDIO_REDIRECT=ON ..
- cd ..
after_build:
- 7z a compiled-binaries.zip %cd%\build\stratagus.exe %cd%\build\dependencies\bin\*.dll