Commit graph

9554 commits

Author SHA1 Message Date
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
James R
956ae6b823 Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
James R
4f41da1d16 Merge branch 'starpost-config-additions' into 'next'
Starpost config additions

See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
James R
9409e505b0 Merge branch 'bruh2' into 'master'
Fix fuckup 2

See merge request STJr/SRB2!744
2020-02-01 21:42:21 -05:00
James R
d2038c820d Merge branch 'rotsprite-memory-leak' into 'next'
Fix memory leak when caching rotsprite

See merge request STJr/SRB2!745
2020-02-01 21:42:12 -05:00
James R
652c580f60 Merge branch 'tnt-is-laggy' into 'next'
Make flying TNTs' explosions not so laggy the first time

See merge request STJr/SRB2!746
2020-02-01 21:41:59 -05:00
James R
8c713b3467 Merge branch 'platform-fixes' into 'next'
Reset pmomz after applying it to momz

See merge request STJr/SRB2!747
2020-02-01 21:41:49 -05:00
James R
c99b9001ba Merge branch 'protect-wrists' into 'next'
Remove flight cutoff property

See merge request STJr/SRB2!748
2020-02-01 21:41:33 -05:00
James R
3a3718797f Merge branch 'file-param-error' into 'master'
Don't I_Error if non base files fail to load with -file

See merge request STJr/SRB2!678
2020-02-01 21:41:22 -05:00
James R
937f18dee7 Remove Player 0 2020-02-01 18:22:03 -08:00
James R
9192e1eade Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R
a65e8ab500 Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08: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
LJ Sonic
d7389fbd6d 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
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
Jaime Passos
5625c24c56 Merge branch 'am-line' into 'master'
Automap fixes

See merge request STJr/SRB2!735
2020-02-01 03:22:53 -05:00
Jaime Passos
49f3b67913 Merge branch 'colorlutfix' into 'master'
Fix color LUT using the wrong palette

See merge request STJr/SRB2!739
2020-02-01 03:22:26 -05:00
lachwright
17b6155df9 Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior 2020-02-01 14:49:48 +08:00
lachwright
693d4b1120 Make flight controls less bullshit 2020-02-01 14:29:49 +08:00
lachwright
51fa7c17a5 Merge branch 'next' into platform-fixes 2020-02-01 13:34:04 +08:00
Steel Titanium
2913736fc1 Only check if the directory is not empty, use strncasecmp for case insensitive comparing, and remove debug print 2020-01-31 20:21:09 -05:00
James R
c19fe1419f Remove code that does effectively nothing 2020-01-31 14:35:19 -08:00
James R
9820a7384f Reset rollangle on TNT explosion
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
2020-01-31 14:32:47 -08:00
Steel Titanium
f89a48f092 Implement folder blacklisting 2020-01-31 16:37:55 -05:00
James R
294543037d Oops 2020-01-30 23:58:35 -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
James R
4e2b16628d 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
Steel Titanium
c49d01a324 Fix memory leak while chat is on screen 2020-01-30 22:11:50 -05:00
lachwright
bb360e055a Merge branch 'next' into platform-fixes 2020-01-30 21:39:01 +08:00
Jaime Passos
7c8ef73b06 Only write a Local Color Table if the frame's palette differs from the header's palette 2020-01-29 17:31:27 -03:00
Jaime Passos
0b3aad6116 Uh 2020-01-29 13:56:39 -03:00
Jaime Passos
dac93c343f Update the Screenshot Options menu 2020-01-29 13:52:02 -03:00
Jaime Passos
5f7cf83da8 Local Color Table for GIF movie mode 2020-01-29 13:47:55 -03: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
LJ Sonic
07cb50849c 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
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