Commit graph

10593 commits

Author SHA1 Message Date
Jaime Passos
99c755c186 Update the Screenshot Options menu 2020-01-29 13:52:02 -03:00
Jaime Passos
5a330803ec Local Color Table for GIF movie mode 2020-01-29 13:47:55 -03:00
SteelT
3a6c7e9577 Merge branch 'dehacked-hud-fix' into 'next'
Fix missing "RINGSNUMTICS" in dehacked.c's HUD items

See merge request STJr/SRB2!733
2020-01-28 20:25:07 -05:00
LJ Sonic
48cb5a326d Merge branch 'fix-keep-body-tag' into 'next'
Only call P_CheckSurvivors() in tag gametypes

See merge request STJr/SRB2!740
2020-01-28 08:45:09 -05:00
Louis-Antoine
31ce076411 Only call P_CheckSurvivors() in tag gametypes 2020-01-28 14:02:36 +01:00
Jaime Passos
a321ec9135 no more 3dfx 2020-01-28 00:56:22 -03:00
Jaime Passos
b0ba9d22a8 i want to die 2020-01-28 00:41:41 -03:00
Jaime Passos
b6b875f934 so is the accumulation buffer (deprecated) 2020-01-28 00:33:45 -03:00
Jaime Passos
93fe6a50ac glFog is unused 2020-01-28 00:26:09 -03:00
Jaime Passos
35983c7ae5 load_shaders -> Shader_Load + Shader_SetUniforms 2020-01-28 00:20:10 -03:00
Jaime Passos
82492f353b DoScreenWipe is void 2020-01-28 00:17:07 -03:00
Jaime Passos
af7b4795b7 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos
636093a59d Fix color LUT using the wrong palette 2020-01-27 13:55:13 -03:00
Jaime Passos
28fd2380df Fix F_StartContinue fading out incorrectly in OpenGL 2020-01-27 13:28:07 -03:00
MascaraSnake
85f44fce75 Merge branch 'thingtag' into 'udmf-next'
Implement thing tags

See merge request STJr/SRB2!730
2020-01-27 02:34:24 -05:00
Jaime Passos
c87119f18f Fix shader reading yet again 2020-01-27 02:15:34 -03:00
Jaime Passos
bdd43efb25 Fix -OGLlib 2020-01-27 01:57:55 -03:00
Jaime Passos
1548a22ea9 Fix M_DrawNightsAttackMountains being broken for obvious reasons 2020-01-27 00:44:10 -03:00
Jaime Passos
1774ba22b6 Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Jaime Passos
cf7b4d826a Remove redundancy 2020-01-26 23:46:07 -03:00
Jaime Passos
7f57327ff7 "changes" not "changed" 2020-01-26 23:41:34 -03:00
Jaime Passos
46cbe63b43 Fix going big 2020-01-26 23:39:31 -03:00
Jaime Passos
2cfeaa63d2 Fix movement to accomodate to window scale changes 2020-01-26 23:34:04 -03:00
Jaime Passos
8f3855d09f Don't stop the automap (just restart it instead.) 2020-01-26 23:12:28 -03:00
Jaime Passos
dd8166ca5f Doesn't matter. 2020-01-26 22:57:14 -03:00
Jaime Passos
ba6018aea4 Optimise pixel drawing 2020-01-26 22:52:15 -03:00
Jaime Passos
d08929b3d7 Move line drawer setting to AM_Drawer 2020-01-26 22:46:57 -03:00
fickleheart
bea7ad2185 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
Monster Iestyn
ef53672deb Merge branch 'master' into next
# Conflicts:
#	src/g_game.c
2020-01-26 19:23:05 +00:00
MascaraSnake
cedfc02f19 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01:00
Zwip-Zwap Zapony
ea28304d8c Fix missing "RINGSNUMTICS" in dehacked.c
This fixes 16/20 of the HUD items in dehacked.c being off by one
(Same case as the MFE_ flags thing)
Also fixes dehacked.c mentioning "LAPS", which doesn't exist
2020-01-26 10:53:37 +01:00
Jaime Passos
aea720ef65 Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 2020-01-25 22:22:20 -03:00
Jaime Passos
9e79b337b1 Fix NOTEXTURE_NUM 2020-01-25 22:20:27 -03:00
Jaime Passos
e576c1ada1 make up for the lack of ogllog.txt 2020-01-25 22:17:39 -03:00
fickleheart
e57589b106 Fix the minecart angle thing 2020-01-25 19:03:15 -06:00
Jaime Passos
8bcdd105ce I'll put this back in here, I guess. 2020-01-25 21:57:05 -03:00
Jaime Passos
647107a220 Same deal for screen textures 2020-01-25 21:46:52 -03:00
Jaime Passos
c219a170da Stop using NextTexAvail you dunce 2020-01-25 21:37:33 -03:00
Jaime Passos
b9b1958886 make NOTEXTURE_NUM 1 2020-01-25 21:22:24 -03:00
Jaime Passos
8401e09787 remove includes 2020-01-25 21:21:44 -03:00
James R
9d9c685dad Merge branch 'appveyor-exename' into 'master'
Put the (pull request repo owner) branch and commit in Appveyor EXE names

See merge request STJr/SRB2!725
2020-01-25 19:10:12 -05:00
lachwright
65e84978fa Don't cancel Knuckles' landing animation on rising surfaces 2020-01-26 04:51:00 +08:00
lachwright
cddc4e1500 Merge branch 'next' into platform-fixes 2020-01-26 04:34:57 +08:00
lachwright
b6106ca8c5 Don't spawn glide dust for SF_NOSKID characters 2020-01-26 04:33:41 +08:00
lachwright
652a1984fe Fix P_SpawnSkidDust description 2020-01-26 03:44:10 +08:00
toaster
f90c70ebe2 Make the DMG actually *applied*. Consequence: flame will continue flying through player instead of dying in midair and dropping a flame, but this is actually desirable given the current behaviour looks kind of shitty. 2020-01-25 11:34:30 -05:00
toaster
2dd13bb2a4 Fix damagetype for Cybrak flamethrower. 2020-01-25 11:31:06 -05:00
MascaraSnake
3775e6447e Skyboxes: Remove obsolete modulo operation 2020-01-25 15:37:23 +01:00
Nev3r
842099b74d Merge branch 'credits-again' into 'next'
Credit Tatsuru

See merge request STJr/SRB2!728
2020-01-25 08:54:41 -05:00
LJ Sonic
2686ce8ad0 Merge branch 'fix-fire-shield' into 'next'
Fix fire shield being removed under lava

See merge request STJr/SRB2!729
2020-01-25 08:08:59 -05:00