Commit graph

231 commits

Author SHA1 Message Date
Jaime Passos
7bc4af41ab Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Jaime Passos
cb3660331a Refactor renderer switching 2020-08-14 22:27:16 -03:00
Jaime Passos
a7f3dd7eff Refactor patch loading 2020-08-08 05:16:47 -03:00
James R
e8a06868b9 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
b14633f745 Include "is old" in the list of possible causes for a MD5 mismatch. 2020-07-28 03:53:25 -05:00
Jaime Passos
10189ecdc0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03:00
Jaime Passos
c385eca5d2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Jaime Passos
146da28f88 Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Steel Titanium
06f76f07f4 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
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Louis-Antoine
808b7b17cc Add dofile() to Lua 2020-05-29 17:35:07 +02:00
Jaime Passos
c69a4f9ced Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
Alam Ed Arias
ec948af34f Merge branch 'master' into next 2020-05-06 18:36:20 -04:00
Alam Ed Arias
b46398b06a fix build errors in public master 2020-05-06 18:35:54 -04:00
Louis-Antoine
4130a30008 Revert "Replace a few instance of strncpy with strlcpy"
This reverts commit b03e0d1289.
2020-04-29 10:55:49 +02:00
Louis-Antoine
b03e0d1289 Replace a few instance of strncpy with strlcpy 2020-04-26 00:42:17 +02:00
Louis-Antoine
70d03c9c6f Restore old entry searching functions and add alternate versions for long names 2020-04-26 00:39:52 +02:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Louis-Antoine
74fd37fa38 Let W_CheckNumForName(Pwad) find entries with long names 2020-04-21 11:08:18 +02:00
Louis-Antoine
90ebe18c5a Add a longname field to lumpinfo_t 2020-04-21 10:21:41 +02:00
Louis-Antoine
74e8d7f733 Rename lumpinfo_t.name2 to lumpinfo_t.fullname 2020-04-20 23:40:41 +02:00
James R
8de2bab4a9 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
81a01041e8 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R
f68a361f6e 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
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Jaime Passos
876d4cd02b Fix OpenGL 2020-03-17 15:23:13 -03:00
fickleheart
33a9e5aa83 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
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