Commit graph

10521 commits

Author SHA1 Message Date
Steel Titanium
b53e6e834d Update version number 2020-07-10 17:29:03 -04:00
Nev3r
455f8bdbe4 Merge branch 'ogl-model-spr-uv-fix' into 'next'
Fix models that use sprite textures

See merge request STJr/SRB2!1049
2020-07-10 17:17:52 -04:00
Nev3r
cca142f2af Merge branch 'bruhcorezone2' into 'next'
Bruh Core Zone 2

See merge request STJr/SRB2!1047
2020-07-10 17:16:53 -04:00
Hannu Hanhi
2ae0980d62 Adjust model uvs to power of two texture if sprite texture is used 2020-07-10 23:05:21 +03:00
toaster
1d0453c5d4 Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup. 2020-07-10 20:30:16 +01: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
Lachlan Wright
ed1371e91c Merge branch 'restore-supergold' into 'next'
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3

See merge request STJr/SRB2!1042
2020-07-09 12:37:31 -04:00
Lachlan Wright
c908461206 Merge branch 'custom-color-fixes' into 'next'
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades

Closes #179 and #182

See merge request STJr/SRB2!1043
2020-07-09 12:37:16 -04:00
Lachlan Wright
3dfb3ed6be Merge branch 'fix-apng-delay-consvar' into 'next'
Whose idea was it to make the aPNG speed 1/2x by default?!

See merge request STJr/SRB2!1044
2020-07-09 12:36:56 -04:00
GoldenTails
54901c3c15 Whose idea was it to make the aPNG speed 1/2x by default?! 2020-07-08 18:14:11 -05:00
lachwright
c5d74a1859 Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades 2020-07-09 05:56:11 +08:00
lachwright
a8a112393f Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3 2020-07-09 00:00:21 +08:00
SteelT
5242d77c12 Merge branch '225-prep' into 'next'
2.2.5 preparation

See merge request STJr/SRB2!1039
2020-07-07 14:55:06 -04:00
Lachlan Wright
a050f04cd0 Merge branch 'remove-tricks' into 'next'
Remove Software tricks

See merge request STJr/SRB2!1036
2020-07-07 13:47:33 -04:00
Lachlan Wright
56e5b7f9ca Merge branch 'fix-autoexec-netvars' into 'next'
Fix autoexec file trying to set netvars when joining from command-line

See merge request STJr/SRB2!1040
2020-07-07 13:47:13 -04:00
Lachlan Wright
2daec090f0 Merge branch 'm_rathon' into 'next'
M_RATHON header text

See merge request STJr/SRB2!1041
2020-07-07 13:46:53 -04:00
lachwright
01a5d8e927 Update Srb2win.rc 2020-07-08 00:48:01 +08:00
lachwright
ec907cf732 Update patch.pk3 hash 2020-07-08 00:42:31 +08:00
toaster
0f1280025d M_RATHON header text. 2020-07-07 17:30:20 +01:00
Louis-Antoine
b063f57be2 Fix autoexec file trying to set netvars when joining from command-line 2020-07-07 16:19:25 +02:00
lachwright
804aa8a8bc Make A_FlickyCenter usable in SOC/Lua 2020-07-07 20:42:00 +08:00
James R
cc62645209 Contact the master server admims 2020-07-06 19:15:40 -07:00
Steel Titanium
d53d65b798 Update the version number 2020-07-06 21:29:02 -04:00
Steel Titanium
edd4f5e698 Update md5 hash for player.dta and patch.pk3 2020-07-06 21:22:57 -04:00
LJ Sonic
88790a8d39 Merge branch 'fix-timeout' into 'next'
Fix timeout

See merge request STJr/SRB2!1038
2020-07-06 20:10:08 -04:00
Louis-Antoine
e3ef4d966a Fix timeout 2020-07-07 02:06:26 +02:00
Steel Titanium
29d6b5c758 Merge branch 'master' into next 2020-07-06 12:13:00 -04:00
Jaime Passos
9788afa820 Remove Software tricks 2020-07-06 01:26:56 -03:00
James R
dfd5cbf41f Merge branch 'hahaha-credits' into 'next'
The credit

See merge request STJr/SRB2!1033
2020-07-04 18:00:49 -04:00
LJ Sonic
83f53943a6 Merge branch 'knuxtweaks' into 'next'
Knuckles tweaks

See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
James R
948df3a746 Merge branch 'macos-steam' into 'master'
Allow macOS builds to be launched through Steam

See merge request STJr/SRB2!996
2020-07-04 16:32:16 -04:00
LJ Sonic
c3e1ee68d5 Merge branch 'fix-gif-delay' into 'next'
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with

See merge request STJr/SRB2!1023
2020-07-04 16:28:59 -04:00
LJ Sonic
b558c523a2 Merge branch 'fix-oldbrak-missiles2' into 'next'
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
James R
fb8e1f52e0 Credit Oni for CODE 2020-07-04 12:59:56 -07:00
LJ Sonic
6ce388908b Merge branch 'levelflat_name' into 'next'
Use levelflat->name instead of flatname

See merge request STJr/SRB2!1024
2020-07-04 08:46:04 -04:00
LJ Sonic
6b288c7c81 Merge branch 'make-linedef-422-smarter' into 'next'
Make Linedef type 422 smarter

See merge request STJr/SRB2!1014
2020-07-04 08:35:42 -04:00
lachwright
d989d57bd0 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
LJ Sonic
325867ea59 Merge branch 'jetjawsound' into 'next'
Jet Jaw Sounds

See merge request STJr/SRB2!1018
2020-07-04 07:09:43 -04:00
LJ Sonic
645d613cf0 Merge branch 'more-platform-fixes' into 'next'
More platform fixes

See merge request STJr/SRB2!999
2020-07-04 07:07:17 -04:00
LJ Sonic
ac070380c1 Merge branch 'cez3debris' into 'next'
New Debris for CEZ3

See merge request STJr/SRB2!1012
2020-07-04 07:00:20 -04:00
lachwright
6a7565686b Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic
5c61f059e8 Merge branch 'sf_nosupersprites' into 'next'
Add SF_NOSUPERSPRITES

See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
LJ Sonic
79857ea9e8 Merge branch 'patch-1' into 'next'
Rename "Legacy" control scheme

See merge request STJr/SRB2!1029
2020-07-04 06:50:15 -04:00
lachwright
10b09f49c3 Add sightcheck boolean to P_RadiusAttack
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
Lachlan
44dfcc7b3d Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
Lachlan
ab3f5e8aff Fix compiler warning 2020-07-04 05:25:34 +08:00
LJ Sonic
85f5698c9b Merge branch 'dragonbomber-height' into 'next'
Fix Dragonbomber z positioning

See merge request STJr/SRB2!1004
2020-07-03 17:05:10 -04:00
LJ Sonic
e4b5d85f31 Merge branch 'shift-when-hiding-in-1p-menu' into 'next'
Tweak display of hidden items in "1 Player" menu

See merge request STJr/SRB2!1013
2020-07-03 17:04:42 -04:00
LJ Sonic
080a5acd0f Merge branch 'ff_horizontalflip' into 'next'
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)

See merge request STJr/SRB2!987
2020-07-03 16:56:32 -04:00