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 |
|
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 |
|
Steel Titanium
|
e7683fb239
|
Reword the error to be more consistent with other errors
|
2020-12-03 21:14:27 -05:00 |
|
Steel Titanium
|
acf0d768fb
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-skinsprites
|
2020-12-03 17:29:08 -05:00 |
|
Tatsuru
|
e9a7d98522
|
Initialize in p_spec.c too + magic number replacement
|
2020-12-03 17:50:10 -03:00 |
|
Zippy_Zolton
|
dc53970fac
|
g
|
2020-12-03 02:05:10 -06:00 |
|
Zippy_Zolton
|
5fc6864cc2
|
Fix fire objects disappearing in lava
|
2020-12-03 01:28:54 -06:00 |
|
GoldenTails
|
db7cc8e988
|
Fix missing stuff
|
2020-12-02 19:47:00 -06:00 |
|
Jaime Ita Passos
|
4b8b5d928d
|
Don't clip if the 3D floor is fog
|
2020-12-02 15:34:11 -03:00 |
|
Jaime Ita Passos
|
fefd953a83
|
Fix 3D floor culling with polyobject segs
|
2020-12-02 15:31:11 -03:00 |
|
Tatsuru
|
2f44a9ab02
|
Don't spawn the projectile if you're just gonna delete it
|
2020-12-02 12:05:40 -03:00 |
|
Nev3r
|
0b6585b51d
|
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
|
f17cae1b5d
|
Follow GZDoom's convention for stringargs.
|
2020-12-01 18:35:24 +01:00 |
|
Zachary McAlpin
|
7eebfdc7d4
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
|
2020-11-30 23:48:49 -06:00 |
|
James R
|
6dea40beaa
|
Fix double define
|
2020-11-30 19:04:23 -08:00 |
|
Zippy_Zolton
|
3015ee07ae
|
thanks zap
|
2020-11-30 16:39:24 -06:00 |
|
Tatsuru
|
8502675e1b
|
Initialize junk line tag lists
|
2020-11-30 18:21:06 -03:00 |
|
Zippy_Zolton
|
6bfccec3c3
|
oops
|
2020-11-30 12:05:45 -06:00 |
|