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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Steel Titanium
|
aa06787141
|
Add empty entry
|
2020-02-02 18:52:41 -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 |
|
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 |
|
James R
|
98fb3fca57
|
Only exit if base files fail to load
|
2020-01-11 15:40:18 -08:00 |
|
James R
|
f97afe47fa
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-08 13:27:14 -08: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 |
|
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 |
|
James R
|
4be9f8eff7
|
Fix C90 error from NOHW
|
2019-12-14 13:30:10 -08:00 |
|
Nev3r
|
9ab9373084
|
Treat warnings as errors; comment out unused function.
|
2019-12-11 16:37:41 +01:00 |
|
Nev3r
|
23c0c8f68e
|
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
|
6976b9bf01
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-10 23:01:10 -03:00 |
|
MascaraSnake
|
3ad7f9e445
|
Merge branch 'master' into nondevelop
|
2019-12-06 23:23:01 +01:00 |
|
Steel Titanium
|
a5cdb0a4b3
|
Update copyright date on source files
|
2019-12-06 13:49:42 -05:00 |
|
toaster
|
67d8b291bb
|
* 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 |
|
Jaime Passos
|
3b2b84ce24
|
fix ErrorIfPNG errors
|
2019-12-04 15:26:51 -03:00 |
|
Steel Titanium
|
dc9a09f837
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
MascaraSnake
|
9a0a85ba67
|
Merge branch 'secretstuff' into 'master'
The letter
See merge request STJr/SRB2Internal!438
|
2019-11-14 17:49:23 -05:00 |
|
Jaime Passos
|
499c724f9f
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-14 12:49:03 -03:00 |
|
MascaraSnake
|
d648a2ad87
|
Merge branch 'radiomode' into 'master'
Radio mode
See merge request STJr/SRB2Internal!443
|
2019-11-13 04:16:38 -05:00 |
|
Jaime Passos
|
24d20d2abb
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -03:00 |
|
Jaime Passos
|
845b82668b
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-11-12 20:25:40 -03:00 |
|