5 commits

Author	SHA1	Message	Date
toaster	a1e1aa81b5	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h # src/g_game.c # src/p_floor.c # src/p_user.c # src/r_data.c # src/r_data.h # src/v_video.c	2018-10-14 21:52:05 +01:00
Monster Iestyn	61a29bed85	Remove unused sscount variable ... (it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)	2018-10-11 19:59:26 +01:00
toaster	f20710fbb4	Turns out I actually forgot to push this when I did the GL fade colour thing earlier, woops.	2018-09-22 21:05:20 +01:00
toaster	4fd4deff8a	One last thing - make the OpenGL level loading bar screen have the correct background colour.	2018-09-22 12:43:54 +01:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00