Jimita the Cat
a3732678e0
Add support for flashpals in screenshots
...
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
2020-03-23 17:03:34 -07:00
Jimita the Cat
d6493c9101
dumb
...
(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
2020-03-23 16:54:18 -07:00
Jimita the Cat
60624edc1a
Add support for flashpals in screenshots
...
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
2020-03-23 16:54:17 -07:00
toasterbabe
56ac088443
Screenshots now contain the palette you're actively looking at, as opposed to the palette the game/map has! This makes sense for colorblind users being able to store their precious memories, and it matches up with how gifs palettise.
...
(cherry picked from commit 9d46ba281f
2020-03-23 16:34:59 -07:00
fickleheart
61c5005972
Reduce near renderdist to lessen visible texture distortion
2020-03-23 08:23:36 -05:00
fickleheart
09c2e4fe26
Split horizon lines for minimal distortion
2020-03-22 12:52:17 -05:00
fickleheart
6749cb89b5
Distort far edges to viewz for a flat horizon line
2020-03-22 12:28:49 -05:00
fickleheart
3bf609e819
GL horizon lines
2020-03-22 12:13:59 -05:00
Louis-Antoine
29294a53cc
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -07:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -07:00
MascaraSnake
9b76d3af6f
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Jaime Passos
876d4cd02b
Fix OpenGL
2020-03-17 15:23:13 -03:00
Monster Iestyn
c0b85396e0
Merge branch 'skins-refactor' into 'master'
...
Skins refactor
See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
MascaraSnake
46c50222ce
Merge branch 'next' into udmf-next
2020-03-15 09:57:42 +01:00
SteelT
f9912eaad5
Merge branch 'hwrflipcolchromakey' into 'master'
...
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
fickleheart
6b4a054973
Use po2 patches to fix mipmaps
2020-03-14 15:52:25 -05: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
Nev3r
63fb8f846b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Latapostrophe
207e68e55d
Merge branch 'gl-qol' into v1.2-frankeinstein
2020-03-10 20:34:20 +01:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Sally Cochenour
7174b707a1
Draw distance uses object scale
2020-03-08 00:39:21 -05:00
GoldenTails
69a9f44259
Fix spaces before someone yells at me for it
2020-03-07 21:48:40 -06:00
GoldenTails
e0f6559595
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
...
Disclaimer: I'm not actually from Florida.
2020-03-07 21:41:52 -06:00
Jaime Passos
81a57d5fac
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
Sally Cochenour
76188e89fb
Fullbright boosters
...
We no longer have to maintain this standard manually. I actually suggest making booster sectors use the lightlevel of their surrounding sectors so that only the booster itself glows.
(OGL support is commented out, since it conflicts with sal-lighting and should probably be done there)
2020-03-06 12:54:54 -05:00
James R
18aa2972e5
Merge remote-tracking branch 'origin/master' into parties-only
2020-03-05 21:41:23 -08:00
James R
253ab49c07
Merge remote-tracking branch 'origin/master' into 22shadows
2020-03-05 21:36:58 -08:00
James R
ac75b30400
r_splitscreen for opengl
2020-03-03 18:48:47 -08:00
Sally Cochenour
18637b9eb2
2.2 shadow port
2020-03-01 22:12:50 -05:00
Jaime Passos
86dd35c32b
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
623974bf88
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
0b63c2a3cc
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00
Jaime Passos
875afea599
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
2020-02-28 17:31:41 -03:00
Sally Cochenour
c7daa33bb8
Merge branch 'master' into draw-flags
2020-02-24 00:52:45 -05:00
fickleheart
6734fbc49a
Fix MD2 rollangle in reverse gravity
2020-02-23 18:44:22 -06:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
SteelT
fcb0c62bf7
Merge branch 'update-copyright-year' into 'master'
...
Update copyright year
See merge request STJr/SRB2!801
2020-02-21 20:59:56 -05:00
James R
e6dafe3002
Merge remote-tracking branch 'origin/master' into next
2020-02-20 17:30:50 -08:00
James R
aa0d40212e
Merge branch 'ogl-colorbug' into 'master'
...
Fix OpenGL "color bug"
See merge request STJr/SRB2!795
2020-02-20 19:32:34 -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
James R
ba9f866acf
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
MascaraSnake
c2311dca45
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
Monster Iestyn
41bdc91bf0
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
Jaime Passos
43abd53c55
Fix what !785 tried to fix, but correctly
2020-02-17 21:58:32 -03:00
Jaime Passos
96ab7afaca
Change the default setting of cv_grshearing to Off
2020-02-17 12:30:02 -03:00
