Commit graph

365 commits

Author SHA1 Message Date
James R
bde40c36b1 Merge branch 'team-elementalfire' into 'next'
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
katsy
ead6180ef5 lol 2020-12-14 05:32:51 -06:00
katsy
f76803d8c0 go away whitespace 2020-12-14 04:05:14 -05:00
katsy
e6aff20076 ditto 2020-12-14 04:02:17 -05:00
James R
956fd338f0 Merge branch 'oldguards' into 'next'
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
Zippy_Zolton
b153276057 Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
James R
ff9c21c80b Merge branch 'dehacked-hell-bruh' into 'next'
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops

See merge request STJr/SRB2!1286
2020-12-10 15:36:01 -05:00
Louis-Antoine
d7a4e24e70 Add a shorthand alias for FRACUNIT 2020-12-10 11:49:29 -08:00
GoldenTails
4eae6aaf3f Fix weird spelling mistake 2020-12-05 05:00:59 -06:00
GoldenTails
db7cc8e988 Fix missing stuff 2020-12-02 19:47:00 -06:00
James R
6dea40beaa Fix double define 2020-11-30 19:04:23 -08:00
LJ Sonic
079df8df4d 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
GoldenTails
17092cc5b0 Replace credits with original authors 2020-11-23 21:42:33 -06:00
GoldenTails
d673604b48 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00