Commit graph

140 commits

Author SHA1 Message Date
LJ Sonic
59b2764758 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into movie
# Conflicts:
#	.gitlab-ci.yml
#	src/Makefile.d/win32.mk
#	src/Sourcefile
#	src/lua_maplib.c
#	src/r_main.c
2024-01-04 16:25:17 +01:00
spherallic
a4a3b5b094 2.2.13 2023-09-09 01:16:28 +02:00
Krabs
49ee744ba1 Update version number 2023-09-06 12:50:32 -04:00
katsy
7634a96031 delete ASM code, remove NASM 2023-07-27 23:58:53 -05:00
spherallic
2c689bae52 2.2.11 2023-05-16 18:20:15 +02:00
spherallic
098fcaa4b0 2.2.10 2022-03-06 20:22:22 +01:00
James R
db919accd2 Appveyor: suppress real time file names 2021-06-29 20:01:14 -07:00
James R
44b82dea58 Appveyor: remove redundant CFLAGS
Also changed -Wno-error=implicit-fallthrough to
-Wno-implicit-fallthrough. For some reason Appveyor's
version of GCC is triggering these warnings despite the
comments, so just shut it up.
2021-06-29 19:55:14 -07:00
James R
faee657572 Appveyor: update for new Makefile 2021-06-29 19:51:15 -07:00
James R
f79e0ee540 Appveyor: remove 64-bit target 2021-06-29 19:51:15 -07:00
James R
ee72312dea Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-05-07 13:32:19 -07:00
Tatsuru
3159d5a6e4 2.2.9 prep 2021-05-06 21:58:21 -03:00
James R
8840bef2cb Appveyor: update to correct executable directory this time 2021-05-04 17:05:54 -07:00
James R
53d1cbe826 Appveyor: update executable directory 2021-05-04 16:50:50 -07:00
James R
fdc1de357b Update appveyor.yml version 2020-10-02 18:05:12 -07:00
Steel Titanium
307125e84e Update version number 2020-07-10 17:29:03 -04:00
Alam Ed Arias
b442b5a916 Merge branch 'master' into next 2020-07-10 09:48:27 -04:00
Alam Ed Arias
cbd44cdeb1 let stop uploading 2 artifacts 2020-07-10 09:47:24 -04:00
Steel Titanium
7d75c72263 Update the version number 2020-07-06 21:29:02 -04:00
James R
c52c8e0282 Update version names, SUBVERSION, MODVERSION 2020-05-11 14:41:36 -07:00
Monster Iestyn
baee6a1d57 Update version number to 2.2.3 in all the usual files, also updated MODVERSION 2020-05-10 16:02:23 +01:00
Steel Titanium
1c1163bd0f Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
Monster Iestyn
f1bdaa2fda Updated version number to 2.2.1, increment MODVERSION.
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
2020-02-05 19:55:40 +00:00
James R
4304fe91e6 Name the archive like the EXE 2020-01-23 21:06:48 -08:00
James R
70cf119a84 Windows is dumb so no colon
srb2win-jameds-appveyor-exename-b1d931d47.exe
2020-01-23 20:35:53 -08:00
James R
e082553f6d Check if this actually is a PR before using those variables 2020-01-23 20:34:26 -08:00
James R
6337932190 I promise I know what I'm doing 2020-01-23 20:13:57 -08:00
James R
ef2febe1e0 Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-b1d931d47.exe
2020-01-23 19:58:26 -08:00
James R
b1d931d471 Well I'm an idiot 2020-01-23 18:55:25 -08:00
James R
d3315ae03c Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-a6d49eaaa.exe
2020-01-23 18:10:31 -08:00
James R
c3f4285988 Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-a6d49eaaa70be5f88c26623c7b4a2fa5a770341e.exe
2020-01-23 18:01:59 -08:00
James R
fa690e2133 Merge branch 'appveyor-gcc-8.1' into 'master'
Use GCC 8.1 for AppVeyor 64-bit builds

See merge request STJr/SRB2!624
2020-01-05 17:12:06 -05:00
James R
658b8dcfa9 Use GCC 8.1 for x86_64 2020-01-02 15:45:13 -08:00
James R
945f50c273 Remove Direct Draw from AppVeyor config 2020-01-02 14:58:09 -08:00
Alam Ed Arias
a66fd274a1 Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer 2019-12-19 10:24:04 -05:00
Steel Titanium
9ab00049dc appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
mazmazz
0d41a55071 Deployer fixes for 2.2.0 2019-12-07 13:56:05 -05:00
Monster Iestyn
e52a314ddb Update version to 2.1.25 2019-08-16 20:14:01 +01:00
Alam Ed Arias
0c2b300294 Appveyor: other way around, the Mingw32 is at 9.1 2019-08-08 23:05:24 -04:00
Alam Ed Arias
33c0b825a7 Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3 2019-08-08 23:02:03 -04:00
Alam Ed Arias
5a79a446df Tested to be compile with Mingw64 9.1.0 2019-08-08 21:25:46 -04:00
Monster Iestyn
6f6d912fa6 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
mazmazz
528c6f771a Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer) 2019-01-01 11:51:17 -05:00
mazmazz
f00cfb7b3f Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
mazmazz
e1300d5173 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz
941e29780c Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz
e7165444b4 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz
0fc07ebaae Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -05:00
mazmazz
2aa7ee70fe Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz
34534428fd Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -05:00