SteelT
|
6a168ac5e9
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04:00 |
|
Jaime Passos
|
10189ecdc0
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-21 22:25:00 -03:00 |
|
Nev3r
|
d57d2959e0
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-12 14:59:38 +02:00 |
|
Jaime Passos
|
1b81e81c56
|
Attempt to properly match Software texture blending
without messing with the original ASTBlendPixel function
|
2020-05-16 13:51:10 -03:00 |
|
MascaraSnake
|
c1dff185bf
|
Add enums to encapsulate the textmap colormap settings
|
2020-04-18 17:15:25 +02: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 |
|
Jaime Passos
|
81a57d5fac
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-03-07 20:43:16 -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 |
|
MascaraSnake
|
4c4596a45f
|
Clean up the mess that is extracolormap_t::fog
|
2020-02-16 20:19:24 +01:00 |
|
Jaime Passos
|
e1ee02c308
|
Fix color LUT using the wrong palette
|
2020-01-27 13:55:13 -03:00 |
|
Jaime Passos
|
96340ac80c
|
Move texture stuff to its own file
|
2020-01-07 12:35:10 -03:00 |
|
James R
|
cb9db74044
|
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
|
740f095219
|
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
|
2019-12-12 01:39:46 -03:00 |
|
Jaime Passos
|
3c9cc53185
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-12-11 21:53:47 -03:00 |
|
Steel Titanium
|
a5cdb0a4b3
|
Update copyright date on source files
|
2019-12-06 13:49:42 -05:00 |
|
Jaime Passos
|
e32238f0b5
|
GIF recording
|
2019-11-10 00:21:48 -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
|
1c46be78af
|
add r_patch.c
|
2019-10-28 15:28:42 -03:00 |
|
Jaime Passos
|
116fb2639e
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-10-28 14:29:10 -03:00 |
|
Jaime Passos
|
0881c8542a
|
remove duplicate NearestColor prototype
|
2019-10-13 19:45:35 -03: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
|
f5b7c9951f
|
compile fix
|
2019-09-17 22:29:53 -03:00 |
|
Alam Ed Arias
|
e969ef8930
|
PNG support: use png_const_bytep, so we do not drop const type
|
2019-09-17 16:18:54 -04: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 |
|
Steel Titanium
|
2339d60276
|
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
|
87f0013831
|
Implement all the other alpha blend styles
|
2019-09-08 13:21:00 -03:00 |
|
Jaime Passos
|
b28af03b1c
|
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
|
2019-09-06 19:20:45 -03:00 |
|
Jaime Passos
|
402012e973
|
I
|
2019-08-18 14:16:48 -03:00 |
|
Jaime Passos
|
c32e1d2f96
|
Merge remote-tracking branch 'origin/flats' into flats-png
|
2019-06-25 16:04:24 -03:00 |
|
Jaime Passos
|
48c1fcd731
|
Delete R_CropFlat
|
2019-06-25 14:41:07 -03:00 |
|
Jaime Passos
|
9cc870931a
|
hHA
|
2019-06-25 14:40:00 -03:00 |
|
Jaime Passos
|
75165ebb28
|
PNG support
|
2019-05-26 23:37:23 -03:00 |
|
Jaime Passos
|
62547b2a49
|
Animations, better flat management.
|
2019-05-21 15:24:26 -03:00 |
|
Jaime Passos
|
83bef14a5a
|
Fix warnings
|
2019-05-21 11:03:53 -03:00 |
|
Jaime Passos
|
775b64f540
|
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
|
81352aece1
|
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
|
c91b2b4456
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
mazmazz
|
031bc8f4d7
|
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
|
2018-09-13 12:08:46 -04:00 |
|
mazmazz
|
c99f4319ec
|
Add fadestart/fadeend/fog to R_AddColormaps
|
2018-09-12 07:07:26 -04:00 |
|
mazmazz
|
8e4d87a739
|
Add R_CheckEqualColormaps comparison method
|
2018-09-11 22:43:12 -04:00 |
|
mazmazz
|
86e619e1bf
|
R_AddColormaps method
|
2018-09-11 21:03:55 -04:00 |
|
mazmazz
|
41735f1da8
|
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
|
2018-09-11 17:30:43 -04:00 |
|
mazmazz
|
9869e13eda
|
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
|
186a75b7d3
|
Consolidate colormap matching into R_GetColormapFromList
|
2018-09-11 15:56:21 -04:00 |
|
mazmazz
|
14d7057bf9
|
Add R_CopyColormap
|
2018-09-11 15:20:30 -04:00 |
|