Monster Iestyn
0a4a879b96
Updated version number to 2.2.1, increment MODVERSION.
...
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
2020-02-05 19:55:40 +00:00
James R
4415fb4c75
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
James R
76c38e97dc
Merge branch 'name-stuck' into 'master'
...
Fix game hanging on server creation/splitscreen if your name is whack
See merge request STJr/SRB2!752
2020-02-03 03:49:13 -05: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
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
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
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
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
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
