Commit graph

11860 commits

Author SHA1 Message Date
James R
ff6eecb64d Merge branch 'metal-sigfpe' into 'next'
Fix a division by zero in BCZ2 Metal Sonic's routine

See merge request STJr/SRB2!1283
2020-12-10 15:35:03 -05:00
James R
1cc3ed77ff Merge branch 'fixargstr' into 'next'
Fixargstr

See merge request STJr/SRB2!1280
2020-12-10 15:31:05 -05:00
James R
9796b60cb0 Merge branch 'my-junk' into 'next'
Initialize dummy linedef tag lists

See merge request STJr/SRB2!1279
2020-12-10 15:29:10 -05:00
James R
63a2ee1378 Merge branch 'super-giverings' into 'next'
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50

See merge request STJr/SRB2!1278
2020-12-10 15:27:01 -05:00
James R
477ae9d1af Merge branch 'gamequit-argument' into 'next'
Send a `quitting` argument to the GameQuit Lua hook.

See merge request STJr/SRB2!1276
2020-12-10 15:25:52 -05:00
James R
bd560130d5 Merge branch 'holy-zip' into 'next'
Disallow pk3s with extra bytes

See merge request STJr/SRB2!1275
2020-12-10 15:21:20 -05:00
James R
79df0c5366 Merge branch 'CR_BRUH' into 'next'
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game

See merge request STJr/SRB2!1274
2020-12-10 15:20:11 -05:00
James R
1d39ba59ad Merge branch 'dumb-stuff' into 'next'
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags

See merge request STJr/SRB2!1273
2020-12-10 15:17:28 -05:00
James R
a8f61b9f7b Merge branch 'mario1up' into 'next'
Fix normal one-up sound playing in Mario mode

See merge request STJr/SRB2!1272
2020-12-10 15:15:08 -05:00
James R
ed9d5960ef Merge branch 'lastlineshit' into 'next'
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
2020-12-10 15:14:16 -05:00
James R
35c212f8ef Merge branch 'exposed!!!' into 'next'
Expose player.skin and player.availabilities to Lua as Read-only

See merge request STJr/SRB2!1269
2020-12-10 15:09:55 -05:00
James R
167715d8e0 Merge branch 'expose-selectheading' into 'next'
Expose mapheader_t's selectheading option to Lua

See merge request STJr/SRB2!1268
2020-12-10 15:07:23 -05:00
James R
df56fcca37 Merge branch 'crunchyroll' into 'next'
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice

See merge request STJr/SRB2!1267
2020-12-10 15:07:01 -05:00
James R
f1b060f695 Merge branch 'blua-urite' into 'next'
Fix crash when trying to use bitwise NOT on true/false/nil

See merge request STJr/SRB2!1262
2020-12-10 15:03:39 -05:00
James R
fc27bbc6e4 Merge branch 'no-spin-jump' into 'next'
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
2020-12-10 15:02:29 -05:00
James R
34f09b2845 Merge branch 'marathon-mode-tokens' into 'next'
Fix emeralds,  tokens, etc not resetting when restarting marathon mode in first level

See merge request STJr/SRB2!1252
2020-12-10 14:57:23 -05:00
James R
6793020c0c Merge branch 'fixmul' into next 2020-12-10 11:53:03 -08:00
James R
5ce1c63969 Merge branch 'fixmul' into next 2020-12-10 11:51:18 -08:00
Louis-Antoine
d7a4e24e70 Add a shorthand alias for FRACUNIT 2020-12-10 11:49:29 -08:00
Louis-Antoine
0a4c8555a8 Add shorthand aliases for fixed-point functions 2020-12-10 11:48:40 -08:00
James R
a6d045cc18 Merge branch 'reload-bans' into 'next'
Fix reloadbans clearing ban.txt and clearbans not actually saving the changes

See merge request STJr/SRB2!1215
2020-12-10 14:28:13 -05:00
James R
7d93995aae Merge branch 'what-is-a-standard' 2020-12-10 11:23:53 -08:00
James R
6f5b5c7d7f Oops! 2020-12-10 03:06:41 -08:00
James R
2e649de64f Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
James R
c302d5b5d4 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
629b6d3bab CTF text 2, branch is finished 2020-12-08 16:09:51 -06:00
Zippy_Zolton
783c5490c2 CTF text 1 2020-12-08 15:56:45 -06:00
Zippy_Zolton
b8007b37f4 zwip suggestion 2020-12-08 12:05:06 -06:00
Steel Titanium
4be19a6268 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
a198009fda Final lap text for circuit 2020-12-07 16:46:05 -06:00
Steel Titanium
95efd5e7e0 Tab fix 2020-12-06 22:58:17 -05:00
Steel Titanium
215631bd03 Let's check for looping first 2020-12-06 22:30:50 -05:00
Steel Titanium
0c4ce37b61 Fix SPC looping on libgme versions >= 0.6.3 2020-12-06 22:20:06 -05:00
Jaime Ita Passos
f928709fa5 Fix animated skincolors in OpenGL 2020-12-06 20:17:14 -03:00
Jaime Ita Passos
3f36a51f5b Move a few mobj spawn defaults to its own function 2020-12-06 17:46:35 -03:00
Jaime Ita Passos
8cbaf9a5eb Fix archived mobjs having no default blend mode and sprite scales 2020-12-06 17:29:20 -03:00
GoldenTails
01c9ae2377 Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides. 2020-12-06 12:01:31 -06:00
Tatsuru
0e92f1818c Kill saloon doors without a tracer, add height check for non-blocking doors 2020-12-06 14:11:08 -03:00
GoldenTails
d0b1a48806 Make caret coloring support letters. 2020-12-06 04:28:12 -06:00
katsy
9095c87be3 space 2020-12-06 04:32:30 -05:00
katsy
a542fac11f Revert "add noclipheight on chaingrab"
This reverts commit a796deef3f
2020-12-06 07:44:59 +00:00
katsy
2a3fa4c887 Revert "ensure the new flag is cleared properly"
This reverts commit ad4c97f76f
2020-12-06 07:44:49 +00:00
katsy
67f65961d2 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
23449b58ed Replace p_inter.c 2020-12-06 00:10:45 -05:00
katsy
2f5b964e45 Replace p_user.c 2020-12-06 00:10:28 -05:00
katsy
118c6188fa Replace p_mobj.c 2020-12-06 00:09:40 -05:00
katsy
ad4c97f76f ensure the new flag is cleared properly 2020-12-05 23:17:01 -05:00
katsy
a796deef3f add noclipheight on chaingrab 2020-12-05 23:13:47 -05:00
GoldenTails
4eae6aaf3f Fix weird spelling mistake 2020-12-05 05:00:59 -06:00
James R
a4ea83b1dc Invalidate taglist userdata 2020-12-05 02:26:00 -08:00