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 |
|
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 |
|
MascaraSnake
|
fae4fb16e9
|
Merge branch 'internal-md3-vanilla-c' into 'master'
Internal MD3 merge 2 good riddance glBegin
See merge request STJr/SRB2Internal!362
|
2019-11-12 15:44:20 -05:00 |
|