11 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	19b2c20bda	* Disable inverting on encore level select pictures at unanimous request of last night's netgame. ... * Also, correct their alignment in y_inter.c.	2018-08-14 15:32:17 +01:00
toaster	a6d1e799f9	* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). ... * A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby! * Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value. * Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.	2018-08-11 22:23:40 +01:00
toaster	bd78c34b99	Encore mode - a fresh take on mirror mode! ... * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.	2018-07-23 23:50:41 +01:00
TehRealSalt	66a9a6bdd4	Fixed local sync fail, among a bunch of other splitscreen check fixes in other files ... I don't know how many of the changes in d_clisrv were really necessary, I was just franticly trying to figure out the source of the local sync fail	2017-12-17 14:17:07 -05:00
ZTsukei	e4a970f894	Starting from scratch. SRB2 v2.1.15	2016-07-06 00:10:19 -04:00
Monster Iestyn	b4cf7fbc97	Fix player 1 and player 2 affecting whether the other can see skyboxes or not	2016-05-18 18:20:56 +01:00
Inuyasha	f07585191b	copyright dates/statements updated and such ... (no actual SLOC changes)	2016-05-17 17:42:11 -07:00
Alam Ed Arias	404b5f666c	SRB2 2.1.12 release	2014-11-11 19:55:07 -05:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00