SteelT
|
a033f482be
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04: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
|
c64e231b2b
|
Attempt to properly match Software texture blending
without messing with the original ASTBlendPixel function
|
2020-05-16 13:51:10 -03:00 |
|
|
MascaraSnake
|
09506112d7
|
Add enums to encapsulate the textmap colormap settings
|
2020-04-18 17:15:25 +02: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 |
|
|
Jaime Passos
|
26e367eb9b
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-03-07 20:43:16 -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 |
|
|
MascaraSnake
|
512c6f24a9
|
Clean up the mess that is extracolormap_t::fog
|
2020-02-16 20:19:24 +01:00 |
|
|
Jaime Passos
|
636093a59d
|
Fix color LUT using the wrong palette
|
2020-01-27 13:55:13 -03:00 |
|
|
Jaime Passos
|
f85476c723
|
Move texture stuff to its own file
|
2020-01-07 12:35:10 -03:00 |
|
|
James R
|
e0a20a733c
|
Merge branch 'gl_gifs' into 'master'
OpenGL GIF movie recording
See merge request STJr/SRB2!549
|
2019-12-24 14:44:44 -05:00 |
|
|
Jaime Passos
|
c578cee0b1
|
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
|
2019-12-12 01:39:46 -03:00 |
|
|
Jaime Passos
|
0652ffd67f
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-12-11 21:53:47 -03:00 |
|
|
Steel Titanium
|
d415cd5c6d
|
Update copyright date on source files
|
2019-12-06 13:49:42 -05:00 |
|
|
Jaime Passos
|
d467d2b229
|
GIF recording
|
2019-11-10 00:21:48 -03:00 |
|
|
Jaime Passos
|
c7d0d7b1c2
|
Flats as walls textures support, WIP, doesn't support animations yet
|
2019-11-09 01:36:53 -03:00 |
|
|
Jaime Passos
|
a22af36305
|
add r_patch.c
|
2019-10-28 15:28:42 -03:00 |
|
|
Jaime Passos
|
79e99dc471
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-10-28 14:29:10 -03:00 |
|
|
Jaime Passos
|
0cf2774129
|
remove duplicate NearestColor prototype
|
2019-10-13 19:45:35 -03:00 |
|
|
Jaime Passos
|
88d19a2d9c
|
fix holey textures
|
2019-10-13 18:37:41 -03:00 |
|
|
Jaime Passos
|
5118f8589d
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-09-28 12:14:55 -03:00 |
|
|
Jaime Passos
|
a6831aff9c
|
compile fix
|
2019-09-17 22:29:53 -03:00 |
|
|
Alam Ed Arias
|
2a33ffb7d7
|
PNG support: use png_const_bytep, so we do not drop const type
|
2019-09-17 16:18:54 -04:00 |
|
|
Jaime Passos
|
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 |
|
|
Steel Titanium
|
1bafec9f55
|
Merge branch 'ast_newstyles' into 'master'
Patch translucency styles
See merge request STJr/SRB2Internal!324
|
2019-09-11 11:57:45 -04:00 |
|
|
Jaime Passos
|
ff1fa3f92b
|
Implement all the other alpha blend styles
|
2019-09-08 13:21:00 -03:00 |
|
|
Jaime Passos
|
0cc553be5f
|
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
|
2019-09-06 19:20:45 -03:00 |
|
|
Jaime Passos
|
f68652aa66
|
I
|
2019-08-18 14:16:48 -03:00 |
|
|
Jaime Passos
|
8362710e50
|
Merge remote-tracking branch 'origin/flats' into flats-png
|
2019-06-25 16:04:24 -03:00 |
|
|
Jaime Passos
|
0af9e865f9
|
Delete R_CropFlat
|
2019-06-25 14:41:07 -03:00 |
|
|
Jaime Passos
|
02c3710211
|
hHA
|
2019-06-25 14:40:00 -03:00 |
|
|
Jaime Passos
|
39857a846a
|
PNG support
|
2019-05-26 23:37:23 -03:00 |
|
|
Jaime Passos
|
dbb1575a6d
|
Animations, better flat management.
|
2019-05-21 15:24:26 -03:00 |
|
|
Jaime Passos
|
869f1e4e8d
|
Fix warnings
|
2019-05-21 11:03:53 -03:00 |
|
|
Jaime Passos
|
714c997aac
|
Support for patches and textures to be used in place of sector flats
Still a work in progress.
|
2019-05-21 00:28:52 -03:00 |
|
|
mazmazz
|
075f28b7c8
|
WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
|
2019-01-02 01:09:15 -05:00 |
|
|
mazmazz
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
|
mazmazz
|
6824e6a359
|
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
|
2018-09-13 12:08:46 -04:00 |
|
|
mazmazz
|
133c3598a7
|
Add fadestart/fadeend/fog to R_AddColormaps
|
2018-09-12 07:07:26 -04:00 |
|
|
mazmazz
|
90aeac5058
|
Add R_CheckEqualColormaps comparison method
|
2018-09-11 22:43:12 -04:00 |
|
|
mazmazz
|
f0c11eb135
|
R_AddColormaps method
|
2018-09-11 21:03:55 -04:00 |
|
|
mazmazz
|
548f02eea1
|
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
|
2018-09-11 17:30:43 -04:00 |
|
|
mazmazz
|
5975f26177
|
Don't set sector's extra_colormap if we just made a default clone
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
|
2018-09-11 17:08:57 -04:00 |
|
|
mazmazz
|
c920827032
|
Consolidate colormap matching into R_GetColormapFromList
|
2018-09-11 15:56:21 -04:00 |
|
|
mazmazz
|
85d89287de
|
Add R_CopyColormap
|
2018-09-11 15:20:30 -04:00 |
|