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
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
e1ee02c308
Fix color LUT using the wrong palette
2020-01-27 13:55:13 -03: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
Jaime Passos
aa6eecb0ec
"changes" not "changed"
2020-01-26 23:41:34 -03:00
Jaime Passos
9e84b10af4
Fix going big
2020-01-26 23:39:31 -03:00
Jaime Passos
cc5d8a3bf8
Fix movement to accomodate to window scale changes
2020-01-26 23:34:04 -03:00
Jaime Passos
34e5b13acf
Don't stop the automap (just restart it instead.)
2020-01-26 23:12:28 -03:00
Jaime Passos
a1fbf69fdb
Doesn't matter.
2020-01-26 22:57:14 -03:00
Jaime Passos
89a58888b8
Optimise pixel drawing
2020-01-26 22:52:15 -03:00
Jaime Passos
3986c28725
Move line drawer setting to AM_Drawer
2020-01-26 22:46:57 -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
lachwright
7346932122
Don't cancel Knuckles' landing animation on rising surfaces
2020-01-26 04:51:00 +08:00
lachwright
56c5132c79
Merge branch 'next' into platform-fixes
2020-01-26 04:34:57 +08: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
fickleheart
7bcb2ec0f6
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
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
