1311 commits

Author	SHA1	Message	Date
Sally Coolatta	1d5251e1f1	Fix ZONE being all caps, standardize the function comments	2020-08-17 06:13:32 -04:00
Sally Coolatta	8fd64ca607	Fix ring usage & gravity	2020-08-16 02:12:17 -04:00
Jaime Passos	d18d12fdea	Introduce Doom patch format into picture formats ... Fixes sprite rotation	2020-08-15 21:52:01 -03:00
Jaime Passos	7bc4af41ab	Merge branch 'pictureformats' into patch-stuff-again-2	2020-08-15 20:48:28 -03:00
Jaime Passos	901adcf3da	Rename R_CheckIfPatch	2020-08-15 20:14:36 -03:00
Sally Coolatta	0dc21106e5	Lua stuff is done	2020-08-15 07:47:18 -04:00
Nev3r	e80e0b6007	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag	2020-08-15 13:44:59 +02:00
Sally Coolatta	9b9ab8a2d5	Get up to p_user	2020-08-14 23:23:14 -04:00
Sally Coolatta	5a98c00405	NOW we make it past p_mobj	2020-08-14 22:28:49 -04:00
Jaime Passos	cb3660331a	Refactor renderer switching	2020-08-14 22:27:16 -03:00
Sally Coolatta	c665393bd0	actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V	2020-08-14 21:21:17 -04:00
Louis-Antoine	8471f9e71f	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate ... # Conflicts: # src/d_clisrv.c # src/d_clisrv.h # src/d_net.c # src/p_saveg.c # src/p_saveg.h	2020-08-13 13:53:10 +02:00
Sally Coolatta	6ef0af4ba5	g_game and g_input now compile	2020-08-13 00:05:44 -04:00
Sally Coolatta	f9ca40e673	Merge branch 'master' into the-scary-22-merge	2020-08-12 20:59:09 -04:00
Sally Coolatta	f8d1e75025	Merge remote-tracking branch 'public/next'	2020-08-12 18:50:41 -04:00
Sally Coolatta	135e9b9797	f_finale now compiles	2020-08-11 23:13:25 -04:00
Sally Coolatta	b9436ee015	More fixing up ... Got tired again, but now it makes it to f_finale	2020-08-11 18:46:00 -04:00
Sally Coolatta	8731c6b7a4	Another round of fixing up ... - gametyperules are now fitting for kart, not applied to the whole codebase though - a few more files compile	2020-08-11 16:13:17 -04:00
Sally Coolatta	a50a9a1843	Lots of splitscreen fixes ... LOTS of stuff I changed to use arrays instead of constantly duplicated code	2020-08-10 23:38:32 -04:00
Sally Coolatta	c96bd5f64a	Many removals ... Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla	2020-08-10 21:45:51 -04:00
Sally Coolatta	335deb80cd	Merge p_setup.c	2020-08-10 14:43:24 -04:00
Sally Coolatta	e296e1309a	YAY, round 2	2020-08-09 21:02:56 -04:00
James R	f9e74e8ba2	Merge branch 'kill-cd-support' into 'next' ... Kill CD support See merge request STJr/SRB2!1102	2020-08-09 20:48:25 -04:00
James R	66d36d4fdf	Merge branch 'opengl-skydome-fixes' into 'next' ... Move the sky dome code out of r_opengl.c, fix issues with shaders See merge request STJr/SRB2!1071	2020-08-09 20:45:01 -04:00
Steel Titanium	913c07959e	Kill CD support	2020-08-07 17:06:19 -04:00
Sally Coolatta	337db54965	Missed this in p_setup.c	2020-08-06 17:55:36 -04:00
Sally Coolatta	b9886a166e	Merge p_setup.c	2020-08-06 11:42:16 -04:00
Nev3r	3854b56228	Merge branch 'next' into udmf-multitag ... # Conflicts: # src/hardware/hw_main.c	2020-07-29 13:55:14 +02:00
Sally Coolatta	c45a67c3f9	Pre start bulbs	2020-07-29 01:19:53 -04:00
Nev3r	3d90a6aebe	Merge branch 'udmf-next' into 'next' ... Merge udmf-next into next See merge request STJr/SRB2!1075	2020-07-28 14:03:59 -04:00
Sally Coolatta	b08459cbee	Buffer time before countdown depends on player count, no intro spin in 1v1	2020-07-27 23:31:46 -04:00
Sally Coolatta	679f3223b6	Remove silly white space	2020-07-25 21:07:27 -04:00
Sally Coolatta	f0044e05c1	Crossing the finish line first before anyone else gives you a free rainbow boost	2020-07-24 21:41:41 -04:00
Jaime Passos	10189ecdc0	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-21 22:25:00 -03:00
Sally Coolatta	643a63e1e6	Finish merge	2020-07-20 13:39:05 -04:00
Steel Titanium	9630b9e244	Fix muspostbossname sometimes returning garbage.	2020-07-19 13:47:33 -04:00
Jaime Passos	16c4ba672a	Move the sky dome code out of r_opengl.c, fix issues with shaders	2020-07-17 02:48:05 -03:00
toaster	90b46ebfe6	Fix live event backups being created at run start; there's no meaningful progress in GFZ1 to recover from.	2020-07-12 19:00:58 +01:00
Nev3r	e40bbc3ee0	What the fuck was I thinking? ... Fixed really stupid brainless code piece involving polyobject spawnpoint tagging.	2020-07-11 11:01:05 +02:00
Nev3r	ebe16a66d9	Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag ... # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h	2020-07-10 18:18:07 +02:00
Nev3r	9210b2ba0b	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-10 11:47:16 +02:00
Jaime Passos	c385eca5d2	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-06 19:29:14 -03:00
Nev3r	6b38fe4b2c	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-06 11:13:27 +02:00
Jaime Passos	9788afa820	Remove Software tricks	2020-07-06 01:26:56 -03:00
LJ Sonic	6ce388908b	Merge branch 'levelflat_name' into 'next' ... Use levelflat->name instead of flatname See merge request STJr/SRB2!1024	2020-07-04 08:46:04 -04:00
SteelT	2d6fff5165	Merge branch 'na-char-replays' into 'next' ... Add support for saving/loading per-skin NiGHTS replays See merge request STJr/SRB2!1025	2020-07-03 14:51:05 -04:00
Nev3r	e301d268ec	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next ... # Conflicts: # src/hardware/hw_main.c	2020-06-30 20:29:48 +02:00
Steel Titanium	f891c6cde4	Add support for saving/loading per-skin NiGHTS replays	2020-06-28 16:59:36 -04:00
James R	dc746f4dfe	Use levelflat->name instead of flatname	2020-06-27 14:30:41 -07:00
toaster	94dbb0ebe1	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save ... # Conflicts: # src/g_game.c	2020-06-25 10:48:36 +01:00