434 commits

Author	SHA1	Message	Date
MascaraSnake	bf25128986	Merge branch 'mapload-refactor' into 'next' ... Refactor map loading functions See merge request STJr/SRB2!594	2019-12-29 10:04:27 -05:00
MascaraSnake	bb9093ff57	Merge branch 'kill-zshift' into 'next' ... Eliminate all unnecessary uses of ZSHIFT See merge request STJr/SRB2!580	2019-12-29 08:35:52 -05:00
MascaraSnake	5590343043	Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them.	2019-12-28 14:13:26 +01:00
MascaraSnake	319ed09c00	Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions	2019-12-28 11:30:39 +01:00
MascaraSnake	e71d07fa8e	Merge branch 'next' into kill-zshift ... # Conflicts: # src/p_mobj.c	2019-12-27 08:11:04 +01:00
James R	1dac3d174e	Merge remote-tracking branch 'origin/master' into next	2019-12-26 15:35:53 -08:00
James R	414a066ec8	Merge branch 'turnmultiplier' into 'master' ... Option to increase the turning speed See merge request STJr/SRB2!553	2019-12-26 18:18:23 -05:00
MascaraSnake	7ccb695fa1	Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost	2019-12-26 20:54:06 +01:00
Jaime Passos	7e5ec552ee	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-25 06:09:00 -03:00
Jaime Passos	3622829504	Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery	2019-12-24 17:55:46 -03:00
James R	75a5142aad	Merge branch 'wipes2' into 'master' ... Wipe styles cleanup See merge request STJr/SRB2!525	2019-12-24 14:47:14 -05:00
Jaime Passos	c61c1e2514	Turn the babysitting deterrent into its own rule.	2019-12-24 16:30:18 -03:00
Jaime Passos	9319014d8d	Title card fixes.	2019-12-24 16:22:25 -03:00
Jaime Passos	5b4d587b1a	Don't warn about missing CTF starts if the gametype doesn't have team flags.	2019-12-24 16:12:05 -03:00
Jaime Passos	a657392d39	ViewpointSwitch improvements.	2019-12-23 20:22:57 -03:00
Jaime Passos	630c06b7b0	Turn GTR_CHASECAM into GTR_FIRSTPERSON.	2019-12-23 19:24:06 -03:00
Jaime Passos	61b72203a8	Merge remote-tracking branch 'origin/master' into gametype-clownery	2019-12-23 18:21:13 -03:00
James R	f574cd0ce2	Whoops I forgot player 2	2019-12-22 21:29:41 -08:00
James R	3e2b28e162	Merge remote-tracking branch 'origin/master' into turnmultiplier	2019-12-22 21:26:36 -08:00
Jaime Passos	74a4ec6f54	Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects	2019-12-19 16:31:38 -03:00
Jaime Passos	9b2b526eb4	Removing commented out code	2019-12-19 16:22:55 -03:00
Jaime Passos	7efd9662d1	Remove GTR_NOGAMEEND	2019-12-19 16:13:27 -03:00
Jaime Passos	f4bb618f93	Organise rules	2019-12-19 16:12:10 -03:00
Jaime Passos	6d7262e985	Remove GTR_PLATFORM	2019-12-19 16:05:03 -03:00
Jaime Passos	768080977f	Remove GTR_ROUNDENDMESSAGE	2019-12-19 15:47:37 -03:00
Jaime Passos	ce0e4201b8	GTR_DEATHMATCHSTARTS	2019-12-19 02:26:17 -03:00
Jaime Passos	ebdd9c6257	fix warnings	2019-12-19 02:20:49 -03:00
Jaime Passos	019e52a4f4	allow CTF spawns in GTR_TEAMS gametype rule	2019-12-19 02:17:03 -03:00
Jaime Passos	fb6f2fc9b0	Lua! Lua! Lua! ... Expecting the buildbot to complain	2019-12-19 02:13:09 -03:00
Jaime Passos	ef7e53488d	GTR_CAMPAIGN and GTR_NOGAMEEND	2019-12-18 22:50:49 -03:00
Jaime Passos	5daedc70e7	Special Stages/token stuff	2019-12-18 22:46:17 -03:00
Jaime Passos	9228f99260	Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit	2019-12-18 22:23:30 -03:00
Jaime Passos	5e818e1dab	Custom gametype rankings	2019-12-18 22:02:37 -03:00
Jaime Passos	0421c81e04	ViewpointSwitch hook for Lua	2019-12-18 20:43:54 -03:00
Jaime Passos	d0e18444fb	GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes	2019-12-18 20:12:52 -03:00
Jaime Passos	396106829a	Ringslinger tweaks	2019-12-18 19:26:45 -03:00
Jaime Passos	ec8682b2af	GTR_NOTITLECARD	2019-12-18 18:39:59 -03:00
Jaime Passos	5f73d48614	Some sort of intermission tally support.	2019-12-18 17:13:05 -03:00
Jaime Passos	e3584e8230	GTR_ALLOWEXIT	2019-12-18 16:52:05 -03:00
Jaime Passos	5b0a094f67	TOL stuff	2019-12-18 16:00:02 -03:00
Jaime Passos	94f2b8f970	Fix warnings	2019-12-18 15:41:03 -03:00
Jaime Passos	7c3cde4564	How did I mess this up?	2019-12-18 15:23:41 -03:00
Jaime Passos	d3d91726f5	GTR_EMERALDHUNT and GTR_SPAWNENEMIES	2019-12-18 14:57:42 -03:00
Jaime Passos	1e2331d672	SOC stuff	2019-12-18 14:37:48 -03:00
Jaime Passos	79d5192b7c	TOL/Level platter stuff	2019-12-18 13:24:10 -03:00
Jaime Passos	7807424633	NUMGAMETYPES vs gametypecount	2019-12-18 12:30:01 -03:00
Jaime Passos	15862ed02c	G_NewGametype	2019-12-18 12:23:42 -03:00
Jaime Passos	da4e759a73	GTR_DEATHPENALTY	2019-12-18 12:13:24 -03:00
Jaime Passos	83732f38a9	GTR_PITYSHIELD	2019-12-18 12:09:44 -03:00
Jaime Passos	299f2bd8cd	GTR_TEAMFLAGS	2019-12-18 11:43:50 -03:00