Commit graph

190 commits

Author SHA1 Message Date
Jaime Passos
434ffb2812 Fix ACZ fence texture 2020-02-01 22:25:48 -03:00
Alam Ed Arias
282abfd4ac Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
James R
f6def02b49 Load flats first so textures with the same name are prefered on walls 2020-01-13 15:21:35 -08:00
James R
3842b04bdc Refactor R_LoadTextures into something manageable (no goto!!) 2020-01-13 15:20:50 -08:00
toaster
456778f950 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang
# Conflicts:
#	src/r_defs.h
2020-01-08 21:47:47 +00:00
toaster
336b6ad85e Hexafaceted sprite angle support (See merge request description coming soon).
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
2020-01-08 20:49:14 +00:00
Jaime Passos
652a71abf6 Merge remote-tracking branch 'origin/master' into more-opengl-fixes 2020-01-05 22:04:51 -03:00
Jaime Passos
8cfc38813c I was using V_GetColor in a lot of places I shouldn't have, making the game look wrong with a non-default colour profile.
Though, I left R_RainbowColormap alone.
2020-01-05 03:20:05 -03:00
Jaime Passos
4630b8615c Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
James R
469e5a7c9b Fix NOPNG compiling 2019-12-24 11:37:37 -08:00
Jaime Passos
1002c47407 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos
da81238610 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
Jaime Passos
aaa0841322 Sad! 2019-12-11 22:11:00 -03:00
Jaime Passos
3c9cc53185 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Jaime Passos
5d2bbb53fc Optimize mipmaps 2019-12-08 03:23:37 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos
31ee16181f Accidental missing (void) 2019-11-15 18:53:32 -03:00
Jaime Passos
dc7f8bafd5 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
Jaime Passos
24d20d2abb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
Jaime Passos
4acdb54d87 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
Jaime Passos
66b009722b Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-11-12 18:26:51 -03:00
Jaime Passos
b078b8791a Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
Jaime Passos
d4bf34b714 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-11-11 14:10:37 -03:00
Jaime Passos
33de0ad0d7 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-11 14:05:03 -03:00
Jaime Passos
d7f38ed2c9 Support OpenGL 2019-11-09 13:28:56 -03:00
Jaime Passos
a6670be2fb WORK!! 2019-11-09 12:22:18 -03:00
Jaime Passos
06e50d1ac4 fix uninitialized pdata* 2019-11-09 02:09:10 -03:00
Jaime Passos
fc595d7a6b minor tweaks 2019-11-09 01:50:47 -03:00
Jaime Passos
bb5ac7ce61 minor fixes 2019-11-09 01:45:00 -03:00
Jaime Passos
486df5ea7a Flats as walls textures support, WIP, doesn't support animations yet 2019-11-09 01:36:53 -03:00
Jaime Passos
a1339b60ad Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00
James R
8e5e4bfd08 Fix misaligned pointers 2019-11-07 16:29:58 -08:00
Jaime Passos
2e1ecda3fa Use doomtype.h types instead of libpng types 2019-10-29 00:15:33 -03:00
Jaime Passos
34f1dc20b1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
Jaime Passos
76a5b60e39 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
Jaime Passos
1c46be78af add r_patch.c 2019-10-28 15:28:42 -03:00
Jaime Passos
5f31d02d28 Update r_data.c 2019-10-28 14:36:19 -03:00
Jaime Passos
116fb2639e Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
Monster Iestyn
81d4bf8cd9 remove last few specks of Windows CE code I missed years ago 2019-10-22 16:39:44 +01:00
James R
91588db299 Optimize texture/patch/png/flat flat caching
SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat,
has been fixed.

Missing flats for now yield a HOM instead of REDFLR as well.

OpenGL also doesn't work yet. And I'm too tired for now to bother with it.
2019-10-20 20:24:03 -07:00
Jaime Passos
08c3210e52 fix holey textures 2019-10-13 18:37:41 -03:00
Jaime Passos
e2ce3988fb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos
0346c28cc0 ignore TRANSPARENTPIXEL 2019-09-23 19:20:59 -03:00
Jaime Passos
be6c8b08ea pixel alpha mistake 2019-09-23 18:27:43 -03:00
Jaime Passos
fac1a2b36e patch fixes 2019-09-23 18:25:53 -03:00
Jaime Passos
d9777c59e0 Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already 2019-09-19 22:41:45 -03:00