Jaime Passos
f106ba7ac4
Fix color LUT using the wrong palette
...
(cherry picked from commit 636093a59ddd95b25d79c4ebff51dc6412de1956)
2020-03-23 17:11:13 -07:00
toasterbabe
2fb599661e
Introducing pMasterPalette.
...
Used instead of pLocalPalette when attempting to determine objective truths, such as "the colours of this gif without color profile modification" and "what indicies should this colormap remap to".
Also, made f_wipe.c's paldiv only get calculated once.
(cherry picked from commit d669a4e84a )
2020-03-23 16:45:57 -07:00
MascaraSnake
79852f0ec0
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
MascaraSnake
cbcabfd925
Merge branch 'udmf-next' into udmf-colormaps
2020-03-15 09:58:39 +01:00
MascaraSnake
ffb8928141
Add UDMF colormap fields
2020-03-15 09:55:57 +01:00
fickleheart
33a9e5aa83
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
Jaime Passos
81a57d5fac
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
Jaime Passos
fa8e87ea16
Set pixel RGBA to nothing instead of the alpha only
2020-02-29 19:36:50 -03:00
Jaime Passos
d62090afae
Fix ACZ fence texture
2020-02-28 17:33:58 -03:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
b0ce2e088f
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
Jaime Passos
043057532c
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-17 12:28:16 -03:00
MascaraSnake
4c4596a45f
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +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
James R
4415fb4c75
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
Jaime Passos
434ffb2812
Fix ACZ fence texture
2020-02-01 22:25:48 -03:00
Jaime Passos
e1ee02c308
Fix color LUT using the wrong palette
2020-01-27 13:55:13 -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
Jaime Passos
a6472c2ffb
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-10 04:11:26 -03: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
96340ac80c
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
Jaime Passos
385a6cf3c3
Cleanup, NOW
2020-01-06 20:16:48 -03:00
Jaime Passos
4e0810e8a3
Picture formats test
2020-01-06 18:22:23 -03: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