toaster
|
bf6b9c6fed
|
Remove music slot compatibility
# Conflicts:
# src/deh_lua.c
# src/lua_baselib.c
|
2022-03-18 13:54:03 +00:00 |
|
James R
|
82f4364eb4
|
pedantic: fix misc leniencies and GNU-isms
|
2022-02-20 03:28:22 -08:00 |
|
toaster
|
b3d006b093
|
structs gunched
|
2021-04-17 00:27:13 +01:00 |
|
toaster
|
71cceaaf3c
|
Readded Kartstuff and Karthud access to Lua, resolving both #143 and #138.
|
2021-03-28 23:10:30 +01:00 |
|
James R
|
9df5a4b25f
|
Conflicts a59c03fef 08d087c6b
|
2021-02-27 03:32:19 -08:00 |
|
Sally Coolatta
|
9d7ec0ab8f
|
Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
|
2021-02-27 05:18:36 -05: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
|
d673604b48
|
Split dehacked.c into multiple files.
|
2020-11-23 21:42:26 -06:00 |
|