Commit Graph

9513 Commits

Author SHA1 Message Date
Steel Titanium 7c83e5e420
Implement folder blacklisting 2020-01-31 16:37:55 -05:00
James R 3afc766f5e Oops 2020-01-30 23:58:35 -08:00
James R 4238003887 Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
James R 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
James R 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
James R 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
James R 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
James R 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
James R 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
James R 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
James R 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
Steel Titanium f4de193809 Fix memory leak while chat is on screen 2020-01-30 22:11:50 -05:00
lachwright 2e48539251 Merge branch 'next' into platform-fixes 2020-01-30 21:39:01 +08: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 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 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
fickleheart e57589b106 Fix the minecart angle thing 2020-01-25 19:03:15 -06: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
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
Louis-Antoine d30b48cfd1 Fix lava removing fire shield 2020-01-25 14:04:16 +01:00
MascaraSnake d947558576 Use tag instead of angle for skyboxes 2020-01-25 10:26:38 +01:00
MascaraSnake 5656d77c82 Use tag instead of angle for polyobject spawn points and anchors 2020-01-25 10:15:20 +01:00
MascaraSnake 37375972e2 Use tag field to setup vertex slopes 2020-01-25 10:01:01 +01:00
MascaraSnake 261f049f6c Add mapthing tag field (not used yet) 2020-01-25 09:52:13 +01:00
MascaraSnake d22be10050 Merge branch 'argstr-to-stringarg' into 'udmf-next'
Rename some UDMF fields whose names have different meanings in other UDMF implementations

See merge request STJr/SRB2!726
2020-01-25 03:30:38 -05:00
fickleheart 332b22a87a Move spawnsnap to Special/ignore on sector trigger
Also includes splitting the starpost logic into its own function.
2020-01-24 23:54:54 -06:00
SteelT 6c4c122925 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