Commit graph

197 commits

Author SHA1 Message Date
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
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
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
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
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
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
Steel Titanium 1794949696
Add empty entry 2020-02-02 18:52:41 -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
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
James R bf8a39f7ee Only exit if base files fail to load 2020-01-11 15:40:18 -08:00
James R 7deb18bdc9 Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
Jaime Passos c7794d4ce0 Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos 401c35b407 Fix transparent PNG conversion 2020-01-01 17:28:22 -03:00
James R fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
Jaime Passos 03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
James R 02779cb6ef Merge remote-tracking branch 'origin/master' into next 2019-12-24 11:53:49 -08:00
James R be063c454a Fix NOPNG compiling 2019-12-24 11:37:37 -08:00
MascaraSnake a4fde93fbb Merge branch 'next' into virtres
# Conflicts:
#	src/p_setup.c
2019-12-22 23:02:47 +01:00
Jaime Passos 53885e5ac0 Free PU_HWRMODELTEXTURE tag 2019-12-17 16:28:32 -03:00
Jaime Passos cc54163210 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
MascaraSnake bb3440d021 Minor cleanup of virtual resources code 2019-12-16 00:04:48 +01:00
James R c1d54007e4 Fix C90 error from NOHW 2019-12-14 13:30:10 -08:00
Nev3r edfe053cc3 Treat warnings as errors; comment out unused function. 2019-12-11 16:37:41 +01:00
Nev3r 854d50f479 Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears. 2019-12-11 11:44:46 +01:00
Jaime Passos 9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
MascaraSnake bf477c6ed4 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster 9e38af7421 * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461).
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
2019-12-06 17:14:51 +00:00