Commit graph

11657 commits

Author SHA1 Message Date
James R e4cf8ebcf5 Merge branch 'what-is-a-standard' 2020-12-10 11:23:53 -08:00
James R 0df5d8ff58 Oops! 2020-12-10 03:06:41 -08:00
James R 2ab71571aa Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
James R e7883f3f8e That moment when you see HAVE_BLUA crawl back from the grave
This would mean MapChange hasn't been firing for demos ...since 2.2.5.
2020-12-10 00:36:14 -08:00
Zippy_Zolton 7082db485b CTF text 2, branch is finished 2020-12-08 16:09:51 -06:00
Zippy_Zolton 1b888c689c CTF text 1 2020-12-08 15:56:45 -06:00
Zippy_Zolton 45a4b728b3 zwip suggestion 2020-12-08 12:05:06 -06:00
Steel Titanium c2de684150 Fix double free occuring when unloading the intermission patches due to the same patch being cached twice 2020-12-07 17:54:08 -05:00
Zippy_Zolton 2721725962 Final lap text for circuit 2020-12-07 16:46:05 -06:00
Steel Titanium 11bbad9be8 Tab fix 2020-12-06 22:58:17 -05:00
Steel Titanium c3a560f51d Let's check for looping first 2020-12-06 22:30:50 -05:00
Steel Titanium 284205baac Fix SPC looping on libgme versions >= 0.6.3 2020-12-06 22:20:06 -05:00
Jaime Ita Passos 18ee97c583 Fix animated skincolors in OpenGL 2020-12-06 20:17:14 -03:00
GoldenTails 6546fc8ce7 Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides. 2020-12-06 12:01:31 -06:00
Tatsuru 3b85abdee7 Kill saloon doors without a tracer, add height check for non-blocking doors 2020-12-06 14:11:08 -03:00
GoldenTails 233990099d Make caret coloring support letters. 2020-12-06 04:28:12 -06:00
katsy 8f4d23197c space 2020-12-06 04:32:30 -05:00
katsy 2fcf613a31 brak barrier is scaled up by 2x in gameplay, the actual object's parameters should be halved 2020-12-06 00:13:10 -05:00
katsy fd4674971a Replace p_inter.c 2020-12-06 00:10:45 -05:00
katsy 768ee57057 Replace p_user.c 2020-12-06 00:10:28 -05:00
katsy a7fa2b2e49 Replace p_mobj.c 2020-12-06 00:09:40 -05:00
katsy 3dbb44e7b1 ensure the new flag is cleared properly 2020-12-05 23:17:01 -05:00
katsy 8541409329 add noclipheight on chaingrab 2020-12-05 23:13:47 -05:00
GoldenTails f6af04ecbb Fix weird spelling mistake 2020-12-05 05:00:59 -06:00
Steel Titanium 4c53eabc59 Reword the error to be more consistent with other errors 2020-12-03 21:14:27 -05:00
Steel Titanium 7d45a7c91a Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-skinsprites 2020-12-03 17:29:08 -05:00
Tatsuru fae845f935 Initialize in p_spec.c too + magic number replacement 2020-12-03 17:50:10 -03:00
Zippy_Zolton 29f56fb2d8 g 2020-12-03 02:05:10 -06:00
Zippy_Zolton c28bd8005e Fix fire objects disappearing in lava 2020-12-03 01:28:54 -06:00
GoldenTails b5526312e7 Fix missing stuff 2020-12-02 19:47:00 -06:00
Jaime Ita Passos 47b8c0648b Don't clip if the 3D floor is fog 2020-12-02 15:34:11 -03:00
Jaime Ita Passos 0ffb241c0a Fix 3D floor culling with polyobject segs 2020-12-02 15:31:11 -03:00
Tatsuru a67862665a Don't spawn the projectile if you're just gonna delete it 2020-12-02 12:05:40 -03:00
Nev3r 4d716cb170 Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway). 2020-12-01 19:44:58 +01:00
Nev3r c8ae28bbaf Follow GZDoom's convention for stringargs. 2020-12-01 18:35:24 +01:00
Zachary McAlpin 7fde15d066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-30 23:48:49 -06:00
James R d004515d6a Fix double define 2020-11-30 19:04:23 -08:00
Zippy_Zolton 69248cc684 thanks zap 2020-11-30 16:39:24 -06:00
Tatsuru 9770368ee9 Initialize junk line tag lists 2020-11-30 18:21:06 -03:00
Zippy_Zolton 20d1811983 oops 2020-11-30 12:05:45 -06:00
Zippy_Zolton da1a3029a9 overhaul 2020-11-30 12:04:35 -06:00
Zippy_Zolton 412f3fc42b P_GivePlayerRings 2020-11-29 17:39:54 -06:00
Zippy_Zolton f913d60a9f Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it 2020-11-29 17:16:57 -06:00
GoldenTails 119d2e9e37 Remove the rest of the Playing() checks for GameQuit hook 2020-11-29 16:53:29 -06:00
LJ Sonic eef3028110 Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
# Conflicts:
#	src/dehacked.c
#	src/dehacked.h
2020-11-29 21:54:15 +01:00
Zachary McAlpin 51d52f7327 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-29 13:59:10 -06:00
GoldenTails b389700de3 Always call GameQuit when quitting via the Quit menu option on the title screen. 2020-11-29 08:32:04 -06:00
GoldenTails 59d2646593 Send a quitting argument to the GameQuit Lua hook 2020-11-29 08:30:50 -06:00
Nev3r ecb333511b Merge branch 'fix-playercmd' into 'next'
Fix PlayerCmd not handling angle and aiming correctly

See merge request STJr/SRB2!1265
2020-11-29 05:30:01 -05:00
Nev3r 42ced125a1 Merge branch 'no-dd-make' into 'master'
Remove Direct Draw from Makefile

See merge request STJr/SRB2!1263
2020-11-29 05:29:21 -05:00