toaster
|
b4af07ffed
|
Merge branch 'master' into new-menus
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/v_video.c
# src/y_inter.c
|
2021-10-18 01:18:37 +01:00 |
|
toaster
|
b3d006b093
|
structs gunched
|
2021-04-17 00:27:13 +01:00 |
|
Sally Coolatta
|
de1f67b72a
|
Use strings in the map header for next level, marathon next, thumbnails, minimaps, encoremaps, and tweakmaps
|
2021-04-09 21:10:46 -04:00 |
|
Sally Coolatta
|
420a6ccccb
|
Fix Dehacked loading
|
2021-02-28 22:39:47 -05: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 |
|
GoldenTails
|
d673604b48
|
Split dehacked.c into multiple files.
|
2020-11-23 21:42:26 -06:00 |
|