254 commits

Author	SHA1	Message	Date
Jaime Passos	81a57d5fac	Merge remote-tracking branch 'origin/next' into pictureformats	2020-03-07 20:43:16 -03:00
James R	1a251ccee2	Fix NOMD5 compiling	2020-02-21 21:06:04 -08:00
SteelT	fcb0c62bf7	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	aa0d40212e	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	2274129f57	Update copyright year to 2020	2020-02-19 14:08:45 -08:00
Jaime Passos	b0ce2e088f	Merge remote-tracking branch 'origin/next' into pictureformats	2020-02-19 02:25:36 -03:00
Jaime Passos	0813f59bd7	Merge remote-tracking branch 'origin/master' into sal-oglshaderport	2020-02-19 00:55:46 -03:00
James R	1bc6f2cd91	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	043057532c	Merge remote-tracking branch 'origin/master' into sal-oglshaderport	2020-02-17 12:28:16 -03:00
Sally Cochenour	07d355e4d3	FIX COLOR BUG	2020-02-17 01:19:28 -03:00
MascaraSnake	5961c7adc6	Merge remote-tracking branch 'Public/next' into public_next	2020-02-10 22:44:15 +01:00
Jaime Passos	830583d973	why does this still exist?	2020-02-08 18:19:27 -03:00
James R	e1b67967ce	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	856ff430c0	zentries is unnecessary	2020-02-07 18:47:56 -06:00
fickleheart	995c885927	Use the proper numbers to adjust lump's offset position	2020-02-07 18:46:46 -06:00
fickleheart	1131266579	Oops	2020-02-07 18:43:20 -06:00
fickleheart	f872124d0e	Uhhh do VerifyPk3 too	2020-02-07 00:04:02 -06:00
fickleheart	a3bff2ae08	PK3: Proper ignorance for file comments/extra data	2020-02-07 00:01:20 -06:00
James R	4415fb4c75	Merge remote-tracking branch 'origin/master' into next	2020-02-04 14:31:21 -08:00
Jaime Passos	402b63ed77	Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport	2020-02-03 01:17:26 -03:00
Steel Titanium	aa06787141	Add empty entry	2020-02-02 18:52:41 -05:00
Sally Cochenour	8ee1cc9209	FIX COLOR BUG	2020-02-02 07:28:31 -05:00
James R	956ae6b823	Don't I_Error on startup files only if a file was added twice	2020-02-01 19:32:08 -08:00
Jaime Passos	d1a755664c	Update w_wad.c	2020-02-01 22:50:52 -03:00
Steel Titanium	2913736fc1	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	f89a48f092	Implement folder blacklisting	2020-01-31 16:37:55 -05:00
Jaime Passos	6f60fd2a64	Fix shader reading yet again	2020-01-27 02:15:34 -03:00
Jaime Passos	3d97a0b73d	Fix custom shader loading	2020-01-24 16:57:21 -03:00
Jaime Passos	b8862e7475	Un-HWRENDER shader lump names	2020-01-24 16:42:55 -03:00
Jaime Passos	2b9b3d1561	Remove W_FlushCachedPatches	2020-01-20 17:03:38 -03:00
James R	98fb3fca57	Only exit if base files fail to load	2020-01-11 15:40:18 -08:00
Sally Cochenour	889bb09e6c	Merge branch 'namirays' into oglshaderport	2020-01-11 09:32:59 -05:00
Jaime Passos	a6472c2ffb	Merge remote-tracking branch 'origin/next' into pictureformats	2020-01-10 04:11:26 -03:00
James R	f97afe47fa	Merge remote-tracking branch 'origin/master' into next	2020-01-08 13:27:14 -08:00
Jaime Passos	3b29ec3fbc	Merge remote-tracking branch 'origin/next' into pictureformats	2020-01-07 16:10:25 -03:00
Jaime Passos	96340ac80c	Move texture stuff to its own file	2020-01-07 12:35:10 -03:00
Sally Cochenour	d2e3c832da	Merge next	2020-01-07 07:35:39 -05:00
Jaime Passos	385a6cf3c3	Cleanup, NOW	2020-01-06 20:16:48 -03:00
Jaime Passos	4630b8615c	Remove unused parameter	2020-01-01 17:36:55 -03:00
Jaime Passos	372bfe39f6	Fix transparent PNG conversion	2020-01-01 17:28:22 -03:00
James R	67ca512120	Merge remote-tracking branch 'origin/master' into next	2019-12-30 13:16:53 -08:00
Sally Cochenour	931b44519d	Merge next	2019-12-25 14:41:31 -05:00
Sally Cochenour	add2497220	Port of Jimita's shader stuff + my lighting shader ... Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>	2019-12-25 14:22:01 -05:00
Jaime Passos	f55b4bf6ad	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-25 05:43:46 -03:00
James R	ddae69f672	Merge remote-tracking branch 'origin/master' into next	2019-12-24 11:53:49 -08:00
James R	469e5a7c9b	Fix NOPNG compiling	2019-12-24 11:37:37 -08:00
MascaraSnake	f91e9bdee5	Merge branch 'next' into virtres ... # Conflicts: # src/p_setup.c	2019-12-22 23:02:47 +01:00
Jaime Passos	ed6d6e3bd7	Free PU_HWRMODELTEXTURE tag	2019-12-17 16:28:32 -03:00
Jaime Passos	1002c47407	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-17 16:12:44 -03:00
MascaraSnake	3c9354991e	Minor cleanup of virtual resources code	2019-12-16 00:04:48 +01:00