258 commits

Author	SHA1	Message	Date
toaster	cbbc76b673	Fix snapping of extra multiplayer text. (Resolves #101)	2020-01-10 12:50:58 +00:00
fickleheart	f8a3e3b898	Merge remote-tracking branch 'origin/next' into next-newcontrols	2020-01-04 09:57:09 -06:00
James R	9931f0d58f	Merge branch 'thiccnames' into 'next' ... Allow 6-letter character names to be drawn with the thick font See merge request STJr/SRB2!618	2020-01-01 21:49:13 -05:00
lachwright	dc7f10e17d	Allow 6-letter character names to be drawn with the thick font	2020-01-01 23:49:29 +08:00
fickleheart	b22de48c03	Merge branch 'next' into next-newcontrols ... # Conflicts: # src/g_game.c # src/p_setup.c	2019-12-31 12:58:36 -06:00
Jaime Passos	181a366d4a	Merge remote-tracking branch 'origin/next' into respawndelaygametyperule	2019-12-30 18:39:31 -03:00
James R	fc8c0f8a9a	Merge remote-tracking branch 'origin/master' into next	2019-12-30 13:16:53 -08:00
fickleheart	c3d14064e2	Convert simple movement to directionchar+analog ... Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).	2019-12-30 15:05:24 -06:00
Jaime Passos	4b604328d5	Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.	2019-12-28 19:47:03 -03:00
Jaime Passos	1fb244d87f	GTR_HIDETIME, not GTR_TAG	2019-12-27 18:24:08 -03:00
Jaime Passos	1f96f70173	Preparing for the inevitable gametype rule that will handle cooplives...	2019-12-27 17:08:20 -03:00
Jaime Passos	ed29efd9eb	ST_drawLivesArea stuff.	2019-12-27 16:58:55 -03:00
Jaime Passos	51404130af	Respawn delay gametype rule	2019-12-27 01:44:27 -03:00
Jaime Passos	3622829504	Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery	2019-12-24 17:55:46 -03:00
James R	0780e48f86	Merge branch 'titlecard2' into 'next' ... More customisable title card See merge request STJr/SRB2!552	2019-12-24 14:47:55 -05:00
Jaime Passos	9319014d8d	Title card fixes.	2019-12-24 16:22:25 -03:00
Jaime Passos	0accadf02f	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-19 02:15:45 -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	7768e2c7f9	More spectator tweaks	2019-12-18 15:14:24 -03:00
Jaime Passos	86ac94817a	Spectator HUD tweaks	2019-12-18 12:28:01 -03:00
Jaime Passos	299f2bd8cd	GTR_TEAMFLAGS	2019-12-18 11:43:50 -03:00
Jaime Passos	ea5e0d28ed	More gametype rules yay!!	2019-12-18 01:54:45 -03:00
Jaime Passos	254d812901	More customisable title card ... Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC. Add the same fields to Lua under their internal names. Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)	2019-12-18 00:28:58 -03:00
Tatsuru	0ab31b3de0	Let Lua toggle Match/CTF team scores HUD element	2019-12-16 17:58:00 -03:00
Jaime Passos	9248f12d55	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-10 23:01:10 -03:00
MascaraSnake	a3549cc8f2	Merge branch 'datestuff' into 'master' ... Date stuff See merge request STJr/SRB2Internal!618	2019-12-06 16:10:36 -05:00
Steel Titanium	d415cd5c6d	Update copyright date on source files	2019-12-06 13:49:42 -05:00
Jaime Passos	c0cc742fb8	Remove unnecessary function parameters from title card code	2019-12-05 01:58:19 -03:00
toaster	fdcc8c912a	Actually, wait; this is way better and cleaner.	2019-11-29 20:41:13 +00:00
toaster	ed0529b9d5	Match final countdown timer to timer (resolves #400).	2019-11-29 20:35:59 +00:00
toaster	ef556ca6d5	Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check). ... Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.	2019-11-25 18:52:38 +00:00
Jaime Passos	2a9db29c58	fix showfps with st_translucency	2019-11-23 18:41:28 -03:00
Jaime Passos	e0a9b3d695	Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes	2019-11-19 21:49:45 -03:00
toaster	2ac44240db	Fix the coords of the subtitle.	2019-11-19 12:59:01 +00:00
Jaime Passos	99d4db956c	change vertical alignment	2019-11-18 21:45:30 -03:00
Jaime Passos	8de7ff0c86	fix subttl	2019-11-18 21:44:02 -03:00
Jaime Passos	1e4060af8c	remove unused levelwipes	2019-11-18 19:22:46 -03:00
Jaime Passos	1698e2d986	adjust duration	2019-11-18 19:08:04 -03:00
Jaime Passos	8a05afa1aa	Merge remote-tracking branch 'origin/master' into f_wipes	2019-11-18 18:48:19 -03:00
Jaime Passos	aa659836ee	Merge remote-tracking branch 'origin/master' into titlecards	2019-11-18 17:55:47 -03:00
MascaraSnake	233ff8bd27	Merge branch 'exit-move-lj' into 'master' ... Post-exit movement See merge request STJr/SRB2Internal!486	2019-11-18 15:10:15 -05:00
Jaime Passos	dc70a24b30	restore zigzags	2019-11-18 15:32:48 -03:00
Jaime Passos	b7f2b74d9a	V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements	2019-11-18 15:18:27 -03:00
Jaime Passos	29792c7a2b	missing prototype	2019-11-18 15:13:31 -03:00
Jaime Passos	cf24b57d8f	perplayer	2019-11-18 15:12:55 -03:00
Jaime Passos	5c55c86dd2	invert conditional	2019-11-18 15:06:07 -03:00
Jaime Passos	85f1b847e9	LF_WARNINGTITLE	2019-11-18 15:04:40 -03:00
Jaime Passos	444953d0bb	oh sh	2019-11-18 14:32:34 -03:00
Jaime Passos	6920d20a0f	map header option	2019-11-18 14:08:47 -03:00