f6e2c7063f
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
2020-04-20 23:40:41 +02:00
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
aca39d6210
Merge remote-tracking branch 'origin/master' into next
2020-04-09 17:04:04 -07:00
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
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
1904e3b5e9
Fix OpenGL
2020-03-17 15:23:13 -03:00
b9d7b3e5c5
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
26e367eb9b
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
f6df71ba54
Fix NOMD5 compiling
2020-02-21 21:06:04 -08:00
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
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
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
2893803c68
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
8bd5193ee0
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-19 00:55:46 -03:00
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
00bdb41640
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-17 12:28:16 -03:00
07d71778dc
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
8618589acc
Merge remote-tracking branch 'Public/next' into public_next
2020-02-10 22:44:15 +01:00
b38f336dc5
why does this still exist?
2020-02-08 18:19:27 -03:00
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
fb7c4ab812
zentries is unnecessary
2020-02-07 18:47:56 -06:00
ee9aa86ecd
Use the proper numbers to adjust lump's offset position
2020-02-07 18:46:46 -06:00
f7cf8e50f8
Oops
2020-02-07 18:43:20 -06:00
8cb9d6f670
Uhhh do VerifyPk3 too
2020-02-07 00:04:02 -06:00
57a4545fdf
PK3: Proper ignorance for file comments/extra data
2020-02-07 00:01:20 -06:00
7805828c4a
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
90eb6a6011
Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport
2020-02-03 01:17:26 -03:00
1794949696
Add empty entry
2020-02-02 18:52:41 -05:00
07b2a5aca8
FIX COLOR BUG
2020-02-02 07:28:31 -05:00
57492347ed
Don't I_Error on startup files only if a file was added twice
2020-02-01 19:32:08 -08:00
828961264e
Update w_wad.c
2020-02-01 22:50:52 -03:00
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
7c83e5e420
Implement folder blacklisting
2020-01-31 16:37:55 -05:00
c87119f18f
Fix shader reading yet again
2020-01-27 02:15:34 -03:00
7c4c04ca6a
Fix custom shader loading
2020-01-24 16:57:21 -03:00
b18c0cfcab
Un-HWRENDER shader lump names
2020-01-24 16:42:55 -03:00
720695a6c4
Remove W_FlushCachedPatches
2020-01-20 17:03:38 -03:00
bf8a39f7ee
Only exit if base files fail to load
2020-01-11 15:40:18 -08:00
5fac6f542e
Merge branch 'namirays' into oglshaderport
2020-01-11 09:32:59 -05:00
c1acdfe52e
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-10 04:11:26 -03:00
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
5a2ad5c2f3
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-07 16:10:25 -03:00
f85476c723
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
ca5b56181b
Merge next
2020-01-07 07:35:39 -05:00
edb0bbcd6d
Cleanup, NOW
2020-01-06 20:16:48 -03:00
c7794d4ce0
Remove unused parameter
2020-01-01 17:36:55 -03:00
401c35b407
Fix transparent PNG conversion
2020-01-01 17:28:22 -03:00
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
da3d5a0184
Merge next
2019-12-25 14:41:31 -05:00
7851bef929
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
03a3b02301
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-25 05:43:46 -03:00
02779cb6ef
Merge remote-tracking branch 'origin/master' into next
2019-12-24 11:53:49 -08:00
be063c454a
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
a4fde93fbb
Merge branch 'next' into virtres
...
# Conflicts:
# src/p_setup.c
2019-12-22 23:02:47 +01:00
53885e5ac0
Free PU_HWRMODELTEXTURE tag
2019-12-17 16:28:32 -03:00
cc54163210
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
bb3440d021
Minor cleanup of virtual resources code
2019-12-16 00:04:48 +01:00
c1d54007e4
Fix C90 error from NOHW
2019-12-14 13:30:10 -08:00
edfe053cc3
Treat warnings as errors; comment out unused function.
2019-12-11 16:37:41 +01:00
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
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
bf477c6ed4
Merge branch 'master' into nondevelop
2019-12-06 23:23:01 +01:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
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
839251633c
fix ErrorIfPNG errors
2019-12-04 15:26:51 -03:00
efac76f833
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
8f6890025c
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
10d1b63ff2
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
d591554a5d
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
245881ec55
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
c6253bb6f9
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
66123b8165
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
91a01be891
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-11 14:41:55 -03:00
d2a7a87c7f
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
5f8671b100
Sound test is cool now!
...
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif
* Port MUSICDEFs from Kart.
* Safe to modify without modifying game, so we can put it in music.dta eventually.
* "Title", "AltTitle", "Authors" fields are self-evident.
* "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
* "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
* Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
* Now called "V_DrawStretchyFixedPatch".
* "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
* Available to Lua under v.drawStretched!
* Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.
Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00
67f5b2245f
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
0a49340ae1
Fix warnings when NOPNG=1
2019-10-28 23:46:33 -03:00
a22af36305
add r_patch.c
2019-10-28 15:28:42 -03:00
7746767735
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
fe60902df5
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03:00
361be5c659
Merge branch 'nmus-pk3' into 'master'
...
Support W_VerifyFile on PK3
See merge request STJr/SRB2Internal!328
2019-09-20 11:35:22 -04:00
db979845e0
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
86f9609623
Support W_VerifyFile on PK3
2019-09-12 17:06:57 -07:00
aa91627ba2
Allow PNG graphics to be used as patches
...
Also allows them to be used as sprites.
2019-09-11 16:59:28 -03:00
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03:00
0cc553be5f
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
f67f9405bc
Merge remote-tracking branch 'origin/master' into flats-png
2019-07-24 19:07:36 -04:00
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
22629cccbe
Merge branch 'public_next' into internal-md3-vanilla
2019-06-29 16:23:19 -04:00
9913cc39a1
Merge branch 'public_next'
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
# src/p_user.c
# src/r_data.c
2019-06-29 20:55:58 +01:00
521d8fd8c1
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
3a9ce483f5
Merge branch 'master' into next
...
# Conflicts:
# src/r_data.c
2019-06-28 23:24:36 +01:00
28566008b4
Merge remote-tracking branch 'upstream/master' into flats-png
2019-06-25 16:02:35 -03:00
826e8e1aaf
Fixed goofups I missed back 3 months ago
2019-06-23 17:51:58 +01:00
d9ca8b45d3
Saving work so far, UNTESTED
...
# Conflicts:
# src/r_data.c
2019-06-23 17:51:36 +01:00
5f339fc2a9
Don't overlap strncpy in WAD file load
2019-06-23 14:52:49 +01:00
ce6db1cc9c
Merge branch 'public_next'
2019-06-22 22:44:42 +01:00
8444379d53
Free the zentries
2019-06-22 00:52:28 +01:00
83da71f809
Merge branch 'master' into pk3_leak
2019-06-22 00:28:14 +01:00
dcd4995eb3
Remember to end inflating
2019-06-22 00:19:34 +01:00
Louis-Antoine
