Commit graph

8650 commits

Author SHA1 Message Date
Alam Ed Arias
9983ea49cc Z_Zone: fixup Valgrind support 2020-02-09 10:35:23 -05: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
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
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
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
James R
294543037d Oops 2020-01-30 23:58:35 -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
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
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
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
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
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
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
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
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
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
James R
a127045d98 Don't set controls to keys out of array bounds
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
2020-01-22 22:19:00 -08:00
James R
f906a7bcce Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH 2020-01-21 16:47:47 -08:00
SteelT
003f3769df Merge pull request #447 from ConfusionAlphaX/local-resynch-fix
Fix title screen broken when leaving during resynch
2020-01-21 19:09:15 -05:00
James R
08ba4ece8e Don't check "Too many flats in level" with P_AddLevelFlatRuntime
Also moved the debug down in case anyone uses that.
2020-01-21 15:35:07 -08:00
James R
4e5644335a Revert "Fix Ploadflat closing the game with "Too many flats in level" error message"
This reverts commit 51c7074247.
2020-01-21 15:35:07 -08:00
James R
ed6ca997e2 Sonic is dead again 2020-01-21 12:24:24 -08:00
James R
47b0381c99 Reorder Sonic's ass so the OpenGL wipe doesn't see garbage 2020-01-21 12:23:34 -08:00