lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,836 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

10836 Commits

Author SHA1 Message Date
SteelT 31364d2120 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 337ec7bf6c 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 b9a088b16f 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 c8a34745e9 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 994bf78fe2 Update Srb2win.rc 2020-07-08 00:48:01 +08:00
lachwright 129fd2e27b Update patch.pk3 hash 2020-07-08 00:42:31 +08:00
toaster 274f649a02 M_RATHON header text. 2020-07-07 17:30:20 +01:00
Louis-Antoine 0858c2f6ed Fix autoexec file trying to set netvars when joining from command-line 2020-07-07 16:19:25 +02:00
lachwright 706b3c509d Make A_FlickyCenter usable in SOC/Lua 2020-07-07 20:42:00 +08:00
James R d31c6ac5b5 Contact the master server admims 2020-07-06 19:15:40 -07:00
Steel Titanium 7d75c72263 Update the version number 2020-07-06 21:29:02 -04:00
Steel Titanium ded902678c Update md5 hash for player.dta and patch.pk3 2020-07-06 21:22:57 -04:00
LJ Sonic 2bdf7a45ca Merge branch 'fix-timeout' into 'next' 
Fix timeout

See merge request STJr/SRB2!1038
 2020-07-06 20:10:08 -04:00
Louis-Antoine 78f8a44c25 Fix timeout 2020-07-07 02:06:26 +02:00
Jaime Passos 3a4ce6aea3 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03:00
Jaime Passos 7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Steel Titanium 7d00255dc4 Merge branch 'master' into next 2020-07-06 12:13:00 -04:00
Nev3r 42d92eab2c Fix erroneous merge conflict resolution. 2020-07-06 11:54:55 +02:00
Nev3r fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Jaime Passos 4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos 5c5d907251 gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Jaime Passos a739cb0da9 Remove unused texture formats 2020-07-06 00:58:09 -03:00
Jaime Passos 3d50bef0e5 Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos ac04853f8c Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Jaime Passos abeedc4b65 Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Hannu Hanhi b4aa5cecc1 Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-05 13:27:51 +03:00
James R de8019f163 Merge branch 'hahaha-credits' into 'next' 
The credit

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

See merge request STJr/SRB2!1030
 2020-07-04 16:37:35 -04:00
James R a609e52d17 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 9f69396054 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 6c61baa818 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 96bccd5f9f Credit Oni for CODE 2020-07-04 12:59:56 -07:00
James R d9005203c7 Fuck you macro 2020-07-04 12:52:01 -07:00
James R e741a7b3c7 Actually save the cvar name in demos 2020-07-04 12:51:07 -07:00
LJ Sonic 17616967d3 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 77e39a0fd5 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 17daf2faa2 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
LJ Sonic cf4087a014 Merge branch 'jetjawsound' into 'next' 
Jet Jaw Sounds

See merge request STJr/SRB2!1018
 2020-07-04 07:09:43 -04:00
LJ Sonic 804ba6da9e 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 8d511ed565 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
lachwright f03addc5a7 Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic 98c657e703 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 5ee94c8ce7 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 527e682931 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
Lachlan e2bdb56f97 Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
Lachlan cdb247d08f Fix compiler warning 2020-07-04 05:25:34 +08:00
LJ Sonic 3679df07aa 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 07bbebd9b0 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 6e7446dea3 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
Lachlan e44d93f76b Fix skiddust positional scaling 2020-07-04 04:30:57 +08:00