68f4d415fe
Merge remote-tracking branch 'origin/next' into sal-oglshaderport
2020-02-01 23:02:15 -03:00
828961264e
Update w_wad.c
2020-02-01 22:50:52 -03:00
59cc097d94
Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
2020-02-01 22:26:40 -03:00
65da251a2f
Fix ACZ fence texture
2020-02-01 22:25:48 -03:00
bd6438dda1
Merge branch 'fix-splitscreen' into 'next'
...
Fix splitscreen player being unable to move
See merge request STJr/SRB2!749
2020-02-01 16:18:40 -05:00
7dd0f2b808
Fix splitscreen player being unable to move
2020-02-01 20:19:39 +01:00
d2bfc673a9
Distance orbital camera appropriately when gr_shearing is enabled
2020-02-01 17:01:27 +08:00
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
aad4b6f8a1
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
6528b4a0f8
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
d7fcd3384a
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
d1e954ec9c
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
56839f428d
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
8297dbd373
Merge branch 'ntsatkbgfix' into 'master'
...
Fix M_DrawNightsAttackMountains integer overflow
See merge request STJr/SRB2!737
2020-01-31 02:33:53 -05:00
4e9fb2de7d
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
8815b9f326
Merge branch 'chat-memory-leak-fix' into 'master'
...
Fix memory leak while chat is on screen
See merge request STJr/SRB2!743
2020-01-31 02:33:48 -05:00
f4de193809
Fix memory leak while chat is on screen
2020-01-30 22:11:50 -05:00
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
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
31ce076411
Only call P_CheckSurvivors() in tag gametypes
2020-01-28 14:02:36 +01:00
a321ec9135
no more 3dfx
2020-01-28 00:56:22 -03:00
b0ba9d22a8
i want to die
2020-01-28 00:41:41 -03:00
b6b875f934
so is the accumulation buffer (deprecated)
2020-01-28 00:33:45 -03:00
93fe6a50ac
glFog is unused
2020-01-28 00:26:09 -03:00
35983c7ae5
load_shaders -> Shader_Load + Shader_SetUniforms
2020-01-28 00:20:10 -03:00
82492f353b
DoScreenWipe is void
2020-01-28 00:17:07 -03:00
af7b4795b7
port pfnUpdateTexture
2020-01-28 00:16:38 -03:00
28fd2380df
Fix F_StartContinue fading out incorrectly in OpenGL
2020-01-27 13:28:07 -03:00
c87119f18f
Fix shader reading yet again
2020-01-27 02:15:34 -03:00
bdd43efb25
Fix -OGLlib
2020-01-27 01:57:55 -03:00
1548a22ea9
Fix M_DrawNightsAttackMountains being broken for obvious reasons
2020-01-27 00:44:10 -03:00
1774ba22b6
Fix title card not showing up at all if focus lost
2020-01-26 23:50:36 -03:00
cf7b4d826a
Remove redundancy
2020-01-26 23:46:07 -03:00
ef53672deb
Merge branch 'master' into next
...
# Conflicts:
# src/g_game.c
2020-01-26 19:23:05 +00:00
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
aea720ef65
Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
2020-01-25 22:22:20 -03:00
9e79b337b1
Fix NOTEXTURE_NUM
2020-01-25 22:20:27 -03:00
e576c1ada1
make up for the lack of ogllog.txt
2020-01-25 22:17:39 -03:00
e57589b106
Fix the minecart angle thing
2020-01-25 19:03:15 -06:00
8bcdd105ce
I'll put this back in here, I guess.
2020-01-25 21:57:05 -03:00
647107a220
Same deal for screen textures
2020-01-25 21:46:52 -03:00
c219a170da
Stop using NextTexAvail you dunce
2020-01-25 21:37:33 -03:00
b9b1958886
make NOTEXTURE_NUM 1
2020-01-25 21:22:24 -03:00
8401e09787
remove includes
2020-01-25 21:21:44 -03:00
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
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
2dd13bb2a4
Fix damagetype for Cybrak flamethrower.
2020-01-25 11:31:06 -05:00
842099b74d
Merge branch 'credits-again' into 'next'
...
Credit Tatsuru
See merge request STJr/SRB2!728
2020-01-25 08:54:41 -05:00
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
d30b48cfd1
Fix lava removing fire shield
2020-01-25 14:04:16 +01:00
Jaime Passos