Jaime Passos
|
9b426b474c
|
Merge branch 'pictureformats' into patch-stuff-again-2
|
2020-08-15 20:48:28 -03:00 |
|
Jaime Passos
|
78cc4a78d0
|
Refactor renderer switching
|
2020-08-14 22:27:16 -03:00 |
|
Jaime Passos
|
91ed56ef40
|
Refactor patch loading
|
2020-08-08 05:16:47 -03:00 |
|
Jaime Passos
|
ca060a4372
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-21 22:25:00 -03:00 |
|
Nev3r
|
2cdfb8ffc6
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-12 14:59:38 +02:00 |
|
Jaime Passos
|
3a4ce6aea3
|
Merge remote-tracking branch 'origin/next' into opengl-blending-fix
|
2020-07-06 19:48:13 -03:00 |
|
Jaime Passos
|
7911deebf8
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-06 19:29:14 -03:00 |
|
Nev3r
|
ff8759e507
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
# src/hardware/hw_main.c
|
2020-06-30 20:29:48 +02:00 |
|
Hannu Hanhi
|
da98ea242e
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
Jaime Passos
|
423494381e
|
Fix mistake
|
2020-05-16 14:01:42 -03:00 |
|
Jaime Passos
|
c64e231b2b
|
Attempt to properly match Software texture blending
without messing with the original ASTBlendPixel function
|
2020-05-16 13:51:10 -03:00 |
|
Jaime Passos
|
288d7166bc
|
Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all
|
2020-05-15 16:41:39 -03:00 |
|
Jaime Passos
|
1a79f6246d
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-05-15 01:34:54 -03:00 |
|
Nev3r
|
2b2a18fdf1
|
Merge branch 'udmf-colormaps' into 'udmf-next'
UDMF colormaps
See merge request STJr/SRB2!855
|
2020-04-18 07:42:24 -04:00 |
|
James R
|
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 |
|
MascaraSnake
|
7cf9ad2f2b
|
Adapt setup of colormap linedefs
|
2020-03-20 11:19:30 +01:00 |
|
MascaraSnake
|
bc8a1350e4
|
Merge branch 'udmf-next' into udmf-colormaps
|
2020-03-15 09:58:39 +01:00 |
|
MascaraSnake
|
e545e5f9ba
|
Add UDMF colormap fields
|
2020-03-15 09:55:57 +01:00 |
|
fickleheart
|
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 |
|
Jaime Passos
|
26e367eb9b
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-03-07 20:43:16 -03:00 |
|
Jaime Passos
|
94107a5320
|
Set pixel RGBA to nothing instead of the alpha only
|
2020-02-29 19:36:50 -03:00 |
|
Jaime Passos
|
4446b0d563
|
Fix ACZ fence texture
|
2020-02-28 17:33:58 -03:00 |
|
Steel Titanium
|
76f26cda24
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
James R
|
7060083db5
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Jaime Passos
|
2893803c68
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-02-19 02:25:36 -03:00 |
|
Jaime Passos
|
00bdb41640
|
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
|
2020-02-17 12:28:16 -03:00 |
|
MascaraSnake
|
512c6f24a9
|
Clean up the mess that is extracolormap_t::fog
|
2020-02-16 20:19:24 +01:00 |
|
James R
|
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 |
|
James R
|
7805828c4a
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-04 14:31:21 -08:00 |
|
Jaime Passos
|
65da251a2f
|
Fix ACZ fence texture
|
2020-02-01 22:25:48 -03:00 |
|
Jaime Passos
|
636093a59d
|
Fix color LUT using the wrong palette
|
2020-01-27 13:55:13 -03:00 |
|
Alam Ed Arias
|
709489cab8
|
Merge branch 'master' into next
|
2020-01-16 12:08:36 -05:00 |
|
James R
|
68b78f44d8
|
Load flats first so textures with the same name are prefered on walls
|
2020-01-13 15:21:35 -08:00 |
|
James R
|
0d6b6efe0f
|
Refactor R_LoadTextures into something manageable (no goto!!)
|
2020-01-13 15:20:50 -08:00 |
|
Jaime Passos
|
c1acdfe52e
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-01-10 04:11:26 -03:00 |
|
toaster
|
d89050f073
|
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
|
0b1108425d
|
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
|
f85476c723
|
Move texture stuff to its own file
|
2020-01-07 12:35:10 -03:00 |
|
Jaime Passos
|
edb0bbcd6d
|
Cleanup, NOW
|
2020-01-06 20:16:48 -03:00 |
|
Jaime Passos
|
a1af6b9134
|
Picture formats test
|
2020-01-06 18:22:23 -03:00 |
|
Jaime Passos
|
03245b28fd
|
Merge remote-tracking branch 'origin/master' into more-opengl-fixes
|
2020-01-05 22:04:51 -03:00 |
|
Jaime Passos
|
deee2a0d6f
|
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
|
c7794d4ce0
|
Remove unused parameter
|
2020-01-01 17:36:55 -03:00 |
|
Jaime Passos
|
03a3b02301
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-25 05:43:46 -03:00 |
|
James R
|
be063c454a
|
Fix NOPNG compiling
|
2019-12-24 11:37:37 -08:00 |
|
Jaime Passos
|
cc54163210
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-17 16:12:44 -03:00 |
|
Jaime Passos
|
141d0376a5
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-12-17 15:05:16 -03:00 |
|
Jaime Passos
|
e01eb19044
|
Sad!
|
2019-12-11 22:11:00 -03:00 |
|
Jaime Passos
|
0652ffd67f
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-12-11 21:53:47 -03:00 |
|
Jaime Passos
|
9248f12d55
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-10 23:01:10 -03:00 |
|