694 commits

Author	SHA1	Message	Date
Alam Ed Arias	a26c5f5428	Merge branch 'master' into next	2020-01-03 14:56:37 -05:00
LJ Sonic	c6aec51d99	Merge branch 'ungrab-mouse-in-menus' into 'master' ... Let the mouse move freely when a menu is open or game is paused See merge request STJr/SRB2!617	2020-01-02 18:48:38 -05:00
Louis-Antoine	3af00ac93e	Minor code refactoring	2020-01-02 00:47:20 +01:00
Louis-Antoine	5bde4df439	Grab mouse again when closing menu, unpausing, etc	2020-01-02 00:45:28 +01:00
James R	0c40a466d8	Merge remote-tracking branch 'origin/master' into next	2020-01-01 15:39:05 -08:00
James R	85fbf4f571	Merge branch 'custom-gametype-serverinfo' into 'next' ... Gametype name in SERVERINFO See merge request STJr/SRB2!610	2020-01-01 17:52:46 -05:00
James R	b4ebb01e2d	Truncate gametype name in server list if it's too long	2019-12-30 22:23:19 -08:00
James R	281f30c4fd	Replace gametype with gametypename in SERVERINFO ... PACKETVERSION 1	2019-12-30 22:18:55 -08:00
James R	7af2533d23	Make the menu option for renderer switching transparent under NOHW	2019-12-30 21:45:19 -08:00
James R	38492073fa	IT_PAIR for when you want to define both sides of a menu item	2019-12-30 21:40:13 -08: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
James R	5e5f3c4fa7	Merge branch 'renderswitch' into 'master' ... Renderer switching See merge request STJr/SRB2!550	2019-12-30 15:36:17 -05:00
James R	7886a4bbee	Don't warn if we start in OpenGL	2019-12-29 18:37:44 -08:00
James R	569453ee93	Warn when going to OpenGL from the menu	2019-12-29 18:37:22 -08:00
Jaime Passos	5c023739e6	change this > to >=	2019-12-27 12:23:50 -03:00
Jaime Passos	eca5be52b2	And the sound test	2019-12-26 23:52:42 -03:00
Jaime Passos	956905c8f4	Same deal, but for the level platter and save select screen	2019-12-26 23:49:31 -03:00
Jaime Passos	644e41d90c	Handle character select screen correctly after a renderer switch	2019-12-26 23:39:40 -03:00
Jaime Passos	e617f35182	PU_PATCH funny	2019-12-26 23:26:43 -03: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
Jaime Passos	03a3b02301	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-25 05:43:46 -03:00
Jaime Passos	3622829504	Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery	2019-12-24 17:55:46 -03:00
James R	3f339384c8	Merge branch 'hwrtexfix' into 'master' ... Fix model texture blending See merge request STJr/SRB2!546	2019-12-24 14:44:19 -05:00
Jaime Passos	61b72203a8	Merge remote-tracking branch 'origin/master' into gametype-clownery	2019-12-23 18:21:13 -03:00
James R	3e2b28e162	Merge remote-tracking branch 'origin/master' into turnmultiplier	2019-12-22 21:26:36 -08:00
James R	2ed5617c5f	Merge branch 'better-deadzone' into 'master' ... Better Deadzones See merge request STJr/SRB2!541	2019-12-20 17:33:29 -05:00
Jaime Passos	4e349cbd0f	Remove W_UnlockCachedPatch calls to avoid crashing	2019-12-19 17:14:56 -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	e359f802fd	Update comments	2019-12-17 16:14:26 -03:00
Jaime Passos	cc54163210	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-17 16:12:44 -03:00
Jaime Passos	a0971d0756	Put loadgame patch loading back in M_ReadSaveStrings	2019-12-17 15:56:56 -03:00
Jaime Passos	7e55dd31f5	fix menu spacing	2019-12-17 12:53:26 -03:00
Sryder	a093c76cfb	Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone	2019-12-15 15:47:45 +00:00
Monster Iestyn	eb179e4d6a	Remove anti-Tails restriction for the Allow super Pandora's Box cheat. ... Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!	2019-12-15 15:40:56 +00:00
Sryder	76d59330f7	Port the deadzone cvar stuff from kart. ... Add menu items for deadzone.	2019-12-15 15:36:13 +00:00
Jaime Passos	af3cf93683	grafik designe is m passion	2019-12-12 21:41:13 -03:00
Jaime Passos	3ca0fbf5c3	da ba dee da ba die	2019-12-12 01:29:59 -03:00
Jaime Passos	f531a8971f	Update m_menu.c	2019-12-10 23:40:15 -03:00
Jaime Passos	9248f12d55	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-10 23:01:10 -03:00
James R	4f9e227830	Cvar and menu option to let user increase turn speed ... cam_turnmultiplier and cam2_turnmultiplier. "Camera Speed" has been renamed to "Camera Spacial Speed" in the menu. "Camera Turning Speed" is now an option.	2019-12-09 16:30:03 -08:00
Jaime Passos	c6769e7220	Die	2019-12-08 22:12:56 -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
lachwright	2e77970526	Fix whitespace issues from when I was new to this shit	2019-12-07 02:31:31 +08:00
MascaraSnake	69da1a7733	Merge branch 'perfectra' into 'master' ... Record Attack perfect bonus stuff Closes #457 See merge request STJr/SRB2Internal!607	2019-12-05 17:02:38 -05:00
MascaraSnake	bbc5d33266	Merge branch 'notutclear' into 'master' ... Fix clearing maps/unlockables causing crashes and hangs. See merge request STJr/SRB2Internal!609	2019-12-05 17:02:10 -05:00
MascaraSnake	87843365fc	Merge branch 'nightslevsel' into 'master' ... NiGHTS Attack left-right level selection See merge request STJr/SRB2Internal!608	2019-12-05 16:53:21 -05:00