218 commits

Author	SHA1	Message	Date
James R	40dc532ea2	Merge branch 'clarify-md5-mismatch' into 'next' ... Include "is old" in the list of possible causes for a MD5 mismatch. See merge request STJr/SRB2!1095	2020-07-29 21:19:23 -04:00
GoldenTails	55d137215f	Include "is old" in the list of possible causes for a MD5 mismatch.	2020-07-28 03:53:25 -05:00
Jaime Passos	ac04853f8c	Remove GrTexInfo	2020-07-06 00:35:48 -03:00
Steel Titanium	3946309ece	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport ... # Conflicts: # src/hardware/r_opengl/r_opengl.c	2020-06-17 18:15:07 -04:00
Hannu Hanhi	da98ea242e	Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge	2020-06-07 20:01:05 +03:00
Louis-Antoine	1dbb755743	Add dofile() to Lua	2020-05-29 17:35:07 +02:00
Alam Ed Arias	24df9f032f	Merge branch 'master' into next	2020-05-06 18:36:20 -04:00
Alam Ed Arias	38232ce07e	fix build errors in public master	2020-05-06 18:35:54 -04:00
Louis-Antoine	9b3917cd72	Revert "Replace a few instance of strncpy with strlcpy" ... This reverts commit 2e27f32d3e.	2020-04-29 10:55:49 +02:00
Louis-Antoine	2e27f32d3e	Replace a few instance of strncpy with strlcpy	2020-04-26 00:42:17 +02:00
Louis-Antoine	212358dbba	Restore old entry searching functions and add alternate versions for long names	2020-04-26 00:39:52 +02:00
James R	fe9b933b97	Merge remote-tracking branch 'origin/master' into HEAD	2020-04-24 22:10:59 -07:00
Louis-Antoine	0ddd2fea21	Let W_CheckNumForName(Pwad) find entries with long names	2020-04-21 11:08:18 +02:00
Louis-Antoine	29a94ee26a	Add a longname field to lumpinfo_t	2020-04-21 10:21:41 +02:00
Louis-Antoine	f6e2c7063f	Rename lumpinfo_t.name2 to lumpinfo_t.fullname	2020-04-20 23:40:41 +02:00
James R	d460e1e826	Merge branch 'pk3-xtra-comm-fix' into 'next' ... PK3: Proper ignorance for file comments/extra data See merge request STJr/SRB2!761	2020-04-09 21:25:11 -04:00
James R	aca39d6210	Merge remote-tracking branch 'origin/master' into next	2020-04-09 17:04:04 -07:00
James R	4e7283c833	Merge branch 'pk3-directory-start' into 'next' ... Don't skip the first directory entry of PK3 if it's a file See merge request STJr/SRB2!764	2020-04-09 19:49:44 -04:00
Louis-Antoine	e3cbdf8fab	Use HAVE_BLUA as fuel for my fireplace	2020-03-19 18:36:14 +01:00
Jaime Passos	1904e3b5e9	Fix OpenGL	2020-03-17 15:23:13 -03:00
fickleheart	b9d7b3e5c5	Merge remote-tracking branch 'upstream/master' into shaders-222 ... # Conflicts: # src/hardware/r_opengl/r_opengl.c # src/i_video.h # src/r_main.c # src/r_main.h # src/screen.c # src/sdl/i_video.c # src/sdl/ogl_sdl.c # src/w_wad.c	2020-03-14 12:52:15 -05:00
James R	f6df71ba54	Fix NOMD5 compiling	2020-02-21 21:06:04 -08:00
SteelT	a1cf58cf7f	Merge branch 'update-copyright-year' into 'master' ... Update copyright year See merge request STJr/SRB2!801	2020-02-21 20:59:56 -05:00
James R	fb0bedf02c	Merge branch 'ogl-colorbug' into 'master' ... Fix OpenGL "color bug" See merge request STJr/SRB2!795	2020-02-20 19:32:34 -05:00
James R	7060083db5	Update copyright year to 2020	2020-02-19 14:08:45 -08:00
Jaime Passos	8bd5193ee0	Merge remote-tracking branch 'origin/master' into sal-oglshaderport	2020-02-19 00:55:46 -03: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	00bdb41640	Merge remote-tracking branch 'origin/master' into sal-oglshaderport	2020-02-17 12:28:16 -03:00
Sally Cochenour	07d71778dc	FIX COLOR BUG	2020-02-17 01:19:28 -03:00
MascaraSnake	8618589acc	Merge remote-tracking branch 'Public/next' into public_next	2020-02-10 22:44:15 +01:00
Jaime Passos	b38f336dc5	why does this still exist?	2020-02-08 18:19:27 -03:00
James R	0a53f91820	Don't skip the first directory entry of PK3 if it's a file ... Also puts the marker skipping in the WAD API.	2020-02-07 19:41:45 -08:00
fickleheart	fb7c4ab812	zentries is unnecessary	2020-02-07 18:47:56 -06:00
fickleheart	ee9aa86ecd	Use the proper numbers to adjust lump's offset position	2020-02-07 18:46:46 -06:00
fickleheart	f7cf8e50f8	Oops	2020-02-07 18:43:20 -06:00
fickleheart	8cb9d6f670	Uhhh do VerifyPk3 too	2020-02-07 00:04:02 -06:00
fickleheart	57a4545fdf	PK3: Proper ignorance for file comments/extra data	2020-02-07 00:01:20 -06:00
James R	7805828c4a	Merge remote-tracking branch 'origin/master' into next	2020-02-04 14:31:21 -08:00
Jaime Passos	90eb6a6011	Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport	2020-02-03 01:17:26 -03:00
Steel Titanium	1794949696	Add empty entry	2020-02-02 18:52:41 -05:00
Sally Cochenour	07b2a5aca8	FIX COLOR BUG	2020-02-02 07:28:31 -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
Jaime Passos	828961264e	Update w_wad.c	2020-02-01 22:50:52 -03:00
Steel Titanium	a2c15c5cb2	Only check if the directory is not empty, use strncasecmp for case insensitive comparing, and remove debug print	2020-01-31 20:21:09 -05:00
Steel Titanium	7c83e5e420	Implement folder blacklisting	2020-01-31 16:37:55 -05:00
Jaime Passos	c87119f18f	Fix shader reading yet again	2020-01-27 02:15:34 -03:00
Jaime Passos	7c4c04ca6a	Fix custom shader loading	2020-01-24 16:57:21 -03:00
Jaime Passos	b18c0cfcab	Un-HWRENDER shader lump names	2020-01-24 16:42:55 -03:00
James R	bf8a39f7ee	Only exit if base files fail to load	2020-01-11 15:40:18 -08:00
Sally Cochenour	5fac6f542e	Merge branch 'namirays' into oglshaderport	2020-01-11 09:32:59 -05:00