Commit graph

8235 commits

Author SHA1 Message Date
Jaime Passos
402b63ed77 Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport 2020-02-03 01:17:26 -03:00
Sally Cochenour
a063ffed2e Remove blend to black 2020-02-02 07:28:31 -05:00
Sally Cochenour
6b6c4ec517 Drop shadows closer to software 2020-02-02 07:28:31 -05:00
Sally Cochenour
8ee1cc9209 FIX COLOR BUG 2020-02-02 07:28:31 -05:00
Jaime Passos
e56273f909 Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
Jaime Passos
d1a755664c Update w_wad.c 2020-02-01 22:50:52 -03:00
Jaime Passos
007b79fc27 Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 2020-02-01 22:26:40 -03:00
Jaime Passos
434ffb2812 Fix ACZ fence texture 2020-02-01 22:25:48 -03:00
Louis-Antoine
74b34ef340 Fix splitscreen player being unable to move 2020-02-01 20:19:39 +01:00
lachwright
529bcdc366 Distance orbital camera appropriately when gr_shearing is enabled 2020-02-01 17:01:27 +08:00
James R
ff2ec925ee Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
James R
020751fdc1 Merge branch 'i-can-see-myself' into 'master'
Don't draw yourself in first person!

See merge request STJr/SRB2!697
2020-01-31 02:34:11 -05:00
James R
1d8d20d915 Merge branch 'opengl-skipintro-sigabrt' into 'master'
Fix crash when using -skipintro and the renderer is set to OpenGL from config

See merge request STJr/SRB2!714
2020-01-31 02:34:08 -05:00
James R
ee35b1cf3b Merge branch 'cybrak_flamedmg' into 'next'
Fix damagetype for Cybrak flamethrower.

See merge request STJr/SRB2!731
2020-01-31 02:34:05 -05:00
James R
ebd53ace47 Merge branch 'angle-clamp' into 'master'
Fix the minecart angle thing in netgames

Closes #69

See merge request STJr/SRB2!732
2020-01-31 02:33:59 -05:00
James R
510ed5353d Merge branch 'ttfixes2' into 'next'
Fix title card not showing up at all if focus lost

See merge request STJr/SRB2!736
2020-01-31 02:33:57 -05:00
James R
f8cccef6c3 Merge branch 'ntsatkbgfix' into 'master'
Fix M_DrawNightsAttackMountains integer overflow

See merge request STJr/SRB2!737
2020-01-31 02:33:53 -05:00
James R
0c614dbd90 Merge branch 'startcontinue' into 'master'
Fix F_StartContinue fading out incorrectly in OpenGL

See merge request STJr/SRB2!738
2020-01-31 02:33:51 -05:00
Steel Titanium
c49d01a324 Fix memory leak while chat is on screen 2020-01-30 22:11:50 -05:00
SteelT
b4809e2e43 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
Louis-Antoine
38e048466f Only call P_CheckSurvivors() in tag gametypes 2020-01-28 14:02:36 +01:00
Jaime Passos
e5ca7039cf no more 3dfx 2020-01-28 00:56:22 -03:00
Jaime Passos
933e690da3 i want to die 2020-01-28 00:41:41 -03:00
Jaime Passos
d31bfb5363 so is the accumulation buffer (deprecated) 2020-01-28 00:33:45 -03:00
Jaime Passos
43ecd55863 glFog is unused 2020-01-28 00:26:09 -03:00
Jaime Passos
64f1f2a7f8 load_shaders -> Shader_Load + Shader_SetUniforms 2020-01-28 00:20:10 -03:00
Jaime Passos
da45526b63 DoScreenWipe is void 2020-01-28 00:17:07 -03:00
Jaime Passos
85f016e4d8 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos
5da3b2a0e7 Fix F_StartContinue fading out incorrectly in OpenGL 2020-01-27 13:28:07 -03:00
Jaime Passos
6f60fd2a64 Fix shader reading yet again 2020-01-27 02:15:34 -03:00
Jaime Passos
444d50c5f8 Fix -OGLlib 2020-01-27 01:57:55 -03:00
Jaime Passos
ada3f58d25 Fix M_DrawNightsAttackMountains being broken for obvious reasons 2020-01-27 00:44:10 -03:00
Jaime Passos
cfafdf7bed Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Jaime Passos
447ee1a04c Remove redundancy 2020-01-26 23:46:07 -03:00
Monster Iestyn
eca4bc63da Merge branch 'master' into next
# Conflicts:
#	src/g_game.c
2020-01-26 19:23:05 +00:00
Zwip-Zwap Zapony
ff57802823 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
c80d7a2430 Fix NOTEXTURE_NUM 2020-01-25 22:20:27 -03:00
Jaime Passos
6df32ce34d make up for the lack of ogllog.txt 2020-01-25 22:17:39 -03:00
fickleheart
124077f1d9 Fix the minecart angle thing 2020-01-25 19:03:15 -06:00
Jaime Passos
ec5da2966b I'll put this back in here, I guess. 2020-01-25 21:57:05 -03:00
Jaime Passos
f6b9b14c21 Same deal for screen textures 2020-01-25 21:46:52 -03:00
Jaime Passos
3efd1f3f6d Stop using NextTexAvail you dunce 2020-01-25 21:37:33 -03:00
Jaime Passos
5228b0b9fe make NOTEXTURE_NUM 1 2020-01-25 21:22:24 -03:00
Jaime Passos
8345d7b99c remove includes 2020-01-25 21:21:44 -03:00
toaster
6d3f0c6a90 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
46d217b731 Fix damagetype for Cybrak flamethrower. 2020-01-25 11:31:06 -05:00
Nev3r
242b5b0168 Merge branch 'credits-again' into 'next'
Credit Tatsuru

See merge request STJr/SRB2!728
2020-01-25 08:54:41 -05:00
Louis-Antoine
e04596d611 Fix lava removing fire shield 2020-01-25 14:04:16 +01:00
SteelT
0cba39d7a4 Merge branch 'opengl-garbage-fade' into 'master'
Fix garbage fade on Sonic's ass in OpenGL

See merge request STJr/SRB2!715
2020-01-25 00:51:07 -05:00
James R
87a278ad02 Signed is unsigned, cool 2020-01-24 16:44:53 -08:00