James R
fd74f1848c
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
toaster
a8169e3844
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
toaster
b501e5b358
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
Jaime Passos
34f1dc20b1
Fix warnings when NOPNG=1
2019-10-28 23:46:33 -03:00
Jaime Passos
1c46be78af
add r_patch.c
2019-10-28 15:28:42 -03:00
James R
43422eb670
ferror does not return errno, are you stupid?
...
Use M_FileError to return the proper error description, or "end-of-file".
2019-10-07 17:55:31 -07:00
Jaime Passos
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
Jaime Passos
e95bd8add3
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03:00
toaster
db71626518
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
Jaime Passos
0d11dd516a
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
James R
201d97b5f7
Support W_VerifyFile on PK3
2019-09-12 17:06:57 -07:00
Jaime Passos
1dbbb226a9
Allow PNG graphics to be used as patches
...
Also allows them to be used as sprites.
2019-09-11 16:59:28 -03:00
Jaime Passos
398b320aec
initial stuff
2019-09-08 18:27:35 -03:00
Jaime Passos
b28af03b1c
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
Alam Ed Arias
aedcd8b0b9
Merge remote-tracking branch 'origin/master' into flats-png
2019-07-24 19:07:36 -04:00
mazmazz
14df513db6
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
cc22795871
Merge branch 'public_next' into internal-md3-vanilla
2019-06-29 16:23:19 -04:00
Monster Iestyn
0fb5a82215
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
mazmazz
11955ba838
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
Monster Iestyn
9933f98dc2
Merge branch 'master' into next
...
# Conflicts:
# src/r_data.c
2019-06-28 23:24:36 +01:00
Jaime Passos
e0622c4489
Merge remote-tracking branch 'upstream/master' into flats-png
2019-06-25 16:02:35 -03:00
Monster Iestyn
9c9b674262
Fixed goofups I missed back 3 months ago
2019-06-23 17:51:58 +01:00
Monster Iestyn
fea05ff9c5
Saving work so far, UNTESTED
...
# Conflicts:
# src/r_data.c
2019-06-23 17:51:36 +01:00
Sryder
d1b0a31e2b
Don't overlap strncpy in WAD file load
2019-06-23 14:52:49 +01:00
Monster Iestyn
0368689e27
Merge branch 'public_next'
2019-06-22 22:44:42 +01:00
Sryder13
19f25e6a8e
Free the zentries
2019-06-22 00:52:28 +01:00
Sryder13
bf2c82633c
Merge branch 'master' into pk3_leak
2019-06-22 00:28:14 +01:00
Sryder13
b9a9108dc4
Remember to end inflating
2019-06-22 00:19:34 +01:00
Monster Iestyn
e95696c94b
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
Monster Iestyn
f31db6f0d4
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
2019-06-20 13:24:54 +01:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Jaime Passos
75165ebb28
PNG support
2019-05-26 23:37:23 -03:00
mazmazz
f9354289ba
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04:00
fickleheart
7253f0e499
Strip out things that limit wad files added by filename
2019-04-17 23:09:10 -05:00
Monster Iestyn
257f31c1ba
Merge branch 'public_next'
...
# Conflicts:
# src/doomstat.h
# src/g_game.c
2019-03-28 14:19:02 +00:00
Monster Iestyn
7c36a2a99e
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
Alam Arias
d6da0b1b7f
Merge commit 'upstream/master~1'
2019-03-22 10:18:10 -04:00
Jaime Passos
08efec4cf3
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
Jaime Passos
3a34a13118
PK3 support
2019-03-19 18:25:55 -03:00
Jaime Passos
843498ef4a
Improve custom shader support
2019-03-19 17:37:04 -03:00
Jaime Passos
cfc5bd4ac7
custom shader support
2019-03-18 23:03:29 -03:00
Steel Titanium
4757031929
Remove the define.
2019-03-15 18:46:25 -04:00
Steel Titanium
4837c1742b
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
fickleheart
5c4c0a5ff6
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
fickleheart
e316963e1a
Merge remote-tracking branch 'remotes/upstream/master' into HEAD
2019-03-11 21:53:47 -05:00
fickleheart
ba6975607a
Move modified check on -file addons later in startup
2019-03-10 19:44:31 -05:00
fickleheart
f388416264
Use consts in place of some 16s
2019-03-09 16:46:55 -06:00
Steel Titanium
c6900b6c89
Check using memcmp()
2019-03-03 22:43:21 -05:00
Steel Titanium
0b11424e3d
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00