Commit graph

9339 commits

Author SHA1 Message Date
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
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
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
5da3b2a0e7 Fix F_StartContinue fading out incorrectly in OpenGL 2020-01-27 13:28:07 -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
fickleheart
124077f1d9 Fix the minecart angle thing 2020-01-25 19:03:15 -06:00
James R
3c5a4462c4 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
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
LJ Sonic
f49c14300c 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
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
James R
cc5fa4c685 Credit Tatsuru, he's done a bit 2020-01-24 16:38:46 -08:00
LJ Sonic
0beae26e9d Merge branch 'keep-body' into 'next'
Let clients rejoin the server without losing their status

See merge request STJr/SRB2!722
2020-01-24 18:50:03 -05:00
SteelT
ad00bc7000 Merge branch 'key-out-of-range' into 'master'
Don't set controls to keys of array bounds

See merge request STJr/SRB2!723
2020-01-24 18:45:19 -05:00
LJ Sonic
09fc88f03a Merge branch 'point-in-subsector-or-null' into 'next'
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil

See merge request STJr/SRB2!719
2020-01-24 17:08:30 -05:00
SteelT
13c00969dc Merge branch 'musicdef-versioning' into 'next'
MUSICDEF cleanup, fixes, and VERSION directive to opt into new format

See merge request STJr/SRB2!708
2020-01-24 17:06:58 -05:00
SteelT
260de0fca4 Merge branch 'player2-turn-fix-next' into 'next'
Fix "cam2_turnmultiplier" being unused in "next"

See merge request STJr/SRB2!713
2020-01-24 17:04:20 -05:00
SteelT
e47a0313d7 Merge branch 'player2-turn-fix' into 'master'
Fix "cam2_turnmultiplier"

See merge request STJr/SRB2!711
2020-01-24 17:04:06 -05:00
SteelT
03be093a38 Merge branch 'ploadflat-bruh-bruh' into 'master'
Fix P_AddLevelFlatRuntime again

See merge request STJr/SRB2!717
2020-01-24 17:00:09 -05:00
SteelT
a0d8b7ec24 Merge branch 'fix-mouse-controls-setup' into 'master'
Fix mouse in controls setup menu

See merge request STJr/SRB2!706
2020-01-24 16:58:06 -05:00
MascaraSnake
383eccd630 Merge branch 'master' into next 2020-01-24 22:37:25 +01:00
Louis-Antoine
ba0a02d2b3 Be silent when "kicking" a disconnected player
This lets the host manually remove a body if they want,
without polluting the chat with redundant messages.
2020-01-24 19:56:57 +01:00
James R
596ff92e69 Name the archive like the EXE 2020-01-23 21:06:48 -08:00
James R
f3ffc2f82b Windows is dumb so no colon
srb2win-jameds-appveyor-exename-0a41f77a2.exe
2020-01-23 20:35:53 -08:00
James R
98297f3de2 Check if this actually is a PR before using those variables 2020-01-23 20:34:26 -08:00
James R
56abe74c18 I promise I know what I'm doing 2020-01-23 20:13:57 -08:00
James R
745f4b6492 Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-0a41f77a2.exe
2020-01-23 19:58:26 -08:00
James R
0a41f77a22 Well I'm an idiot 2020-01-23 18:55:25 -08:00
James R
a5d62ef3bb Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-003f3769d.exe
2020-01-23 18:10:31 -08:00
James R
12da266baa Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-003f3769dfc531eae0071c07e45803c17fd53460.exe
2020-01-23 18:01:59 -08:00
James R
128f0757b6 Semantics 2020-01-23 13:57:39 -08:00
Louis-Antoine
a04004071b Do not spam player quit net commands 2020-01-23 19:59:41 +01:00