Commit graph

162 commits

Author SHA1 Message Date
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
2682c7438a Merge appveyor.yml 2020-08-09 20:49:04 -04:00
Steel Titanium
b53e6e834d Update version number 2020-07-10 17:29:03 -04:00
Alam Ed Arias
ac69b100b0 Merge branch 'master' into next 2020-07-10 09:48:27 -04:00
Alam Ed Arias
107a1bae73 let stop uploading 2 artifacts 2020-07-10 09:47:24 -04:00
Steel Titanium
d53d65b798 Update the version number 2020-07-06 21:29:02 -04:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
James R
bd52a32eb6 Disable 64-bit Appveyor builds 2020-05-11 18:55:20 -07:00
James R
3e2c7f42a1 Name the archive like the EXE
(cherry picked from commit 4304fe91e65845e3887935de046876b6313af9c9)
2020-05-11 18:45:46 -07:00
James R
72c4eedd4f Windows is dumb so no colon
srb2win-jameds-appveyor-exename-b1d931d47.exe

(cherry picked from commit 70cf119a8402607116b2f8fbb79028a2de0e8d96)
2020-05-11 18:45:46 -07:00
James R
ae7eb4bd57 Check if this actually is a PR before using those variables
(cherry picked from commit e082553f6d3a90baf97e056ab6790ce136f502d0)
2020-05-11 18:45:45 -07:00
James R
9b6410e86f I promise I know what I'm doing
(cherry picked from commit 6337932190d68d6f825f4f5dd47a6f3655c88f16)
2020-05-11 18:45:45 -07:00
James R
6265bd53fb Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-b1d931d47.exe
(cherry picked from commit ef2febe1e01bc7c93f30d2063bfd754b1a79dd3a)
2020-05-11 18:45:45 -07:00
James R
959674c533 Well I'm an idiot
(cherry picked from commit b1d931d471bcf2ec9a40f6e7e52518807c5fd14b)
2020-05-11 18:45:45 -07:00
James R
98d6708b29 Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-a6d49eaaa.exe

(cherry picked from commit d3315ae03c57296bfb5a7f9f5959492bdb7de24c)
2020-05-11 18:45:44 -07:00
James R
15193cb2b3 Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-a6d49eaaa70be5f88c26623c7b4a2fa5a770341e.exe

(cherry picked from commit c3f42859882e6a1a789668d9b78d1310dd5e7312)
2020-05-11 18:45:44 -07:00
James R
069e3589c2 Use GCC 8.1 for x86_64
(cherry picked from commit 658b8dcfa95935bbaef92c15476ad57ecc96950f)
2020-05-11 18:45:43 -07:00
James R
32ef2ec1b6 Remove Direct Draw from AppVeyor config
(cherry picked from commit 945f50c2736ee64734dcc94f36ff7dff4085c8e2)
2020-05-11 18:45:42 -07:00
Alam Ed Arias
06448c15cf Appveyor: other way around, the Mingw32 is at 9.1
(cherry picked from commit 0c2b3002944b28cd823326fb5febc71fad120ca0)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
85ae5251fc Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
(cherry picked from commit 33c0b825a7cdfd6538f388748dba334191fbb9ee)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
2a116ac847 Tested to be compile with Mingw64 9.1.0
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
2020-05-11 18:43:24 -07:00
James R
ffd88746da Update version names, SUBVERSION, MODVERSION 2020-05-11 14:41:36 -07:00
Monster Iestyn
f218920395 Update version number to 2.2.3 in all the usual files, also updated MODVERSION 2020-05-10 16:02:23 +01:00
Wolfy
146164f1b7 Make the deployer use the new version format 2020-04-18 23:18:39 -05:00
Wolfy
30f5e928dd Prep stuff
pending asset hash changes
2020-04-12 20:48:11 -05:00
Steel Titanium
c7778af7d6 Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
Monster Iestyn
0a4a879b96 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
596ff92e69 Name the archive like the EXE 2020-01-23 21:06:48 -08:00
James R
f3ffc2f82b Windows is dumb so no colon
srb2win-jameds-appveyor-exename-0a41f77a2.exe
2020-01-23 20:35:53 -08:00
James R
98297f3de2 Check if this actually is a PR before using those variables 2020-01-23 20:34:26 -08:00
James R
56abe74c18 I promise I know what I'm doing 2020-01-23 20:13:57 -08:00
James R
745f4b6492 Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-0a41f77a2.exe
2020-01-23 19:58:26 -08:00
James R
0a41f77a22 Well I'm an idiot 2020-01-23 18:55:25 -08:00
James R
a5d62ef3bb Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-003f3769d.exe
2020-01-23 18:10:31 -08:00
James R
12da266baa Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-003f3769dfc531eae0071c07e45803c17fd53460.exe
2020-01-23 18:01:59 -08:00
James R
9f68fa0798 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
22c6440523 Use GCC 8.1 for x86_64 2020-01-02 15:45:13 -08:00
James R
3762b638c7 Remove Direct Draw from AppVeyor config 2020-01-02 14:58:09 -08:00
Alam Ed Arias
37a264c30e Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer 2019-12-19 10:24:04 -05:00
Steel Titanium
ab50f1255d appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
mazmazz
126dbc4a82 Deployer fixes for 2.2.0 2019-12-07 13:56:05 -05:00
Monster Iestyn
a20079e410 Update version to 2.1.25 2019-08-16 20:14:01 +01:00
Alam Ed Arias
cb5b7a5555 Appveyor: other way around, the Mingw32 is at 9.1 2019-08-08 23:05:24 -04:00
Alam Ed Arias
4d1c2b4de0 Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3 2019-08-08 23:02:03 -04:00
Alam Ed Arias
5c0912bab1 Tested to be compile with Mingw64 9.1.0 2019-08-08 21:25:46 -04:00
Monster Iestyn
474b70aa69 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
TehRealSalt
4f13f8b98e Change version num to v2, disable 1.0.x demo compatiblity 2019-05-29 22:29:06 -04:00
Sal
1c1435aea7 Merge branch 'version-prep' into 'master'
Version prep

See merge request KartKrew/Kart!148

(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)

2e221946 Final v1 colors
359d06f1 Modify the first shade of Byzantium
3a707c09 Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
889ead78 Fix wheel animations
2d9ae1ab Dumbass typo
e954f0b4 Missed a spot
5316e63a Merge branch 'next-colors' into 'v1'
55db2268 Merge branch 'anim-fix' into 'v1'
26159aae Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
2019-05-06 22:05:56 -04:00
TehRealSalt
4f84bd9ba3 Update version number 2019-05-02 10:29:35 -04:00