315 commits

Author	SHA1	Message	Date
James R	aca39d6210	Merge remote-tracking branch 'origin/master' into next	2020-04-09 17:04:04 -07:00
James R	2dfe276a73	Merge branch 'sdlglcontext' into 'master' ... Only initialise OpenGL if the user intends to load it (for real this time) See merge request STJr/SRB2!796	2020-04-09 19:51:20 -04:00
Louis-Antoine	e3cbdf8fab	Use HAVE_BLUA as fuel for my fireplace	2020-03-19 18:36:14 +01:00
Steel Titanium	10d08fc8bb	Merge branch 'master' into next	2020-03-02 15:26:01 -05:00
SteelT	7d14796954	Merge branch 'fix-ogllib' into 'master' ... Fix -OGLlib See merge request STJr/SRB2!794	2020-03-02 15:21:50 -05:00
LJ Sonic	2cace6e147	Merge branch 'lua-io' into 'next' ... Support for Lua's I/O library See merge request STJr/SRB2!727	2020-03-01 11:12:45 -05:00
James R	711c8ed6b4	Merge branch 'console-in-menus-mk-ii' into 'master' ... Console in menus again! See merge request STJr/SRB2!797	2020-02-23 18:15:43 -05: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
Louis-Antoine	ec5b88e79f	Fix weird comment style	2020-02-21 17:17:39 +01:00
James R	2df4717f18	Fix NO_LUA compiling	2020-02-20 17:20:50 -08: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
Louis-Antoine	12959ff4a9	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io	2020-02-19 22:40:54 +01: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	bd7b2fcb93	setrenderneeded is already cleared earlier	2020-02-17 22:33:36 -03:00
James R	b78fc670d0	Don't let console open with menu keys while the menu is open	2020-02-17 17:10:29 -08:00
James R	b2733eba73	Draw console in the Record/NiGHTS Attack menus ... (cherry picked from commit 4efd915d28)	2020-02-17 16:37:29 -08:00
James R	a9a0601c84	Revert "Revert "Let the console open in menus"" ... This reverts commit 705cf9fd40.	2020-02-17 16:37:13 -08:00
Jaime Passos	cac5f9d171	add -nogl parm	2020-02-17 12:14:51 -03: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
Louis-Antoine	e8760fe5dd	Update Lua I/O support to 2.2	2020-01-22 23:08:57 +01: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