300 commits

Author	SHA1	Message	Date
James R	4244480d63	Add patch_music.pk3	2020-02-22 14:43:41 -08:00
Steel Titanium	03e38e9486	Enable use of the patch file	2020-02-22 16:42:24 -05:00
Steel Titanium	76f26cda24	Merge branch 'master' into next	2020-02-21 21:01:29 -05:00
Monster Iestyn	5c33ff0458	clarify the situation a bit more in the comments	2020-02-20 20:38:01 +00:00
Monster Iestyn	903cc311a7	move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified	2020-02-20 20:31:11 +00:00
James R	7060083db5	Update copyright year to 2020	2020-02-19 14:08:45 -08:00
Steel Titanium	281d40d6d2	Merge branch 'master' into next	2020-02-18 22:03:08 -05:00
James R	c1a91cdc2e	Merge branch 'setrenderneeded-fix' into 'master' ... Clear setrenderneeded after calling VID_CheckRenderer See merge request STJr/SRB2!793	2020-02-18 21:53:14 -05:00
James R	8054f341a1	Merge branch 'startup-file-not-found' into 'master' ... Fix the issue !678 did, but just don't exit if the file was added twice See merge request STJr/SRB2!753	2020-02-18 21:50:11 -05:00
Jaime Passos	9e83e2751d	Clear setrenderneeded after calling VID_CheckRenderer	2020-02-17 00:36:10 -03:00
fickleheart	c4b390bc76	Merge remote-tracking branch 'upstream/master' into viewroll	2020-02-16 21:32:57 -06:00
James R	472d533d79	Merge remote-tracking branch 'origin/next' into public_next	2020-02-16 17:38:03 -08:00
James R	e245354c80	Merge remote-tracking branch 'origin/master' into next	2020-02-16 17:35:59 -08:00
James R	705cf9fd40	Revert "Let the console open in menus" ... This reverts commit ef3d462eb7.	2020-02-16 17:14:54 -08:00
Steel Titanium	b44358df63	Update file hash yet again	2020-02-16 18:54:51 -05:00
Steel Titanium	3a82864ce9	Update comment	2020-02-16 11:34:02 -05:00
Steel Titanium	4281de3b89	Update file hashes	2020-02-09 21:29:46 -05:00
James R	57492347ed	Don't I_Error on startup files only if a file was added twice	2020-02-01 19:32:08 -08:00
fickleheart	bea7ad2185	Merge remote-tracking branch 'upstream/next' into viewroll	2020-01-26 18:01:58 -06:00
Monster Iestyn	ef53672deb	Merge branch 'master' into next ... # Conflicts: # src/g_game.c	2020-01-26 19:23:05 +00:00
James R	f297f4ff56	Sonic is dead again	2020-01-21 12:24:24 -08:00
James R	c347254e80	Reorder Sonic's ass so the OpenGL wipe doesn't see garbage	2020-01-21 12:23:34 -08:00
fickleheart	d63aa1031e	Merge remote-tracking branch 'upstream/next' into viewroll	2020-01-17 18:27:15 -06:00
Alam Ed Arias	709489cab8	Merge branch 'master' into next	2020-01-16 12:08:36 -05:00
James R	36b9549b23	Merge branch 'locale-liberation' into 'master' ... Locale liberation Closes #113 See merge request STJr/SRB2!677	2020-01-15 23:38:40 -05:00
fickleheart	c25e969676	wip viewroll stuff	2020-01-14 23:29:56 -06:00
James R	2b95ea0135	Merge remote-tracking branch 'origin/master' into next	2020-01-12 14:17:52 -08:00
Monster Iestyn	9c8988ab57	Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff!	2020-01-11 18:48:47 +00:00
James R	ef3d462eb7	Let the console open in menus	2020-01-09 22:42:00 -08:00
fickleheart	f8a3e3b898	Merge remote-tracking branch 'origin/next' into next-newcontrols	2020-01-04 09:57:09 -06:00
fickleheart	f0e6a56b6b	Merge branch 'newcontrols' into next-newcontrols	2020-01-04 09:56:24 -06:00
James R	0c40a466d8	Merge remote-tracking branch 'origin/master' into next	2020-01-01 15:39:05 -08:00
James R	01be810aee	Merge branch 'warp-by-name' into 'master' ... Properly fix the issue that !528 tried to; let the -warp parameter work with map name See merge request STJr/SRB2!596	2020-01-01 17:51:21 -05: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	e0f35d207f	Convert analog/directionchar cvars into 2-long arrays	2019-12-30 14:01:14 -06:00
James R	404f3c13e4	If we move the -warp code down, map searching can be used	2019-12-29 02:31:48 -08:00
Jaime Passos	e63f77ea1a	Merge remote-tracking branch 'origin/next' into respawndelaygametyperule	2019-12-28 21:39:38 -03:00
Jaime Passos	2166571920	Add GTR_CUTSCENES. And I ran out of rule slots. Cool.	2019-12-28 20:33:28 -03: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
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	75a5142aad	Merge branch 'wipes2' into 'master' ... Wipe styles cleanup See merge request STJr/SRB2!525	2019-12-24 14:47:14 -05:00
James R	1df31f2e98	Merge branch 'soundtest-fix' into 'master' ... Init MUSICDEFs regardless of music state See merge request STJr/SRB2!532	2019-12-24 14:44:08 -05:00
James R	9defd997c3	Merge branch 'fixsignalhandler' into 'master' ... Handle signals correctly on linux See merge request STJr/SRB2!530	2019-12-24 02:54:44 -05:00
Jaime Passos	7807424633	NUMGAMETYPES vs gametypecount	2019-12-18 12:30:01 -03:00
Jaime Passos	7bfdc2caa0	Gametype rules draft, mind the debug command	2019-12-18 01:25:57 -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