stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-04 02:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
8649 commits 174 branches 41 tags 203 MiB
Commit graph

8649 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
700d9426d4 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
ce3a79e51a Merge branch 'bruh2' into 'master' 
Fix fuckup 2

See merge request STJr/SRB2!744
 2020-02-01 21:42:21 -05:00
James R
c46d9a1b87 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
d5ced42f06 Remove Player 0 2020-02-01 18:22:03 -08:00
James R
bf3b7fc5b0 Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R
ab8eed6efb Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08:00
Jaime Passos
77f373c903 Merge branch 'am-line' into 'master' 
Automap fixes

See merge request STJr/SRB2!735
 2020-02-01 03:22:53 -05:00
Jaime Passos
decc381698 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
3afc766f5e Oops 2020-01-30 23:58:35 -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
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
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
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
Jaime Passos
1548a22ea9 Fix M_DrawNightsAttackMountains being broken for obvious reasons 2020-01-27 00:44:10 -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
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
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
SteelT
4b1a402731 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
7d740efc78 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
72996a50bf 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
9a414ff5ab 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
4304fe91e6 Name the archive like the EXE 2020-01-23 21:06:48 -08:00
James R
70cf119a84 Windows is dumb so no colon 
srb2win-jameds-appveyor-exename-b1d931d47.exe
 2020-01-23 20:35:53 -08:00
James R
e082553f6d Check if this actually is a PR before using those variables 2020-01-23 20:34:26 -08:00
James R
6337932190 I promise I know what I'm doing 2020-01-23 20:13:57 -08:00
James R
ef2febe1e0 Use the pull request repo, branch and commit 
srb2win-jameds:appveyor-exename-b1d931d47.exe
 2020-01-23 19:58:26 -08:00
James R
b1d931d471 Well I'm an idiot 2020-01-23 18:55:25 -08:00
James R
d3315ae03c Put the abbreviated commit hash in the EXENAME for AppVeyor 
srb2win-master-a6d49eaaa.exe
 2020-01-23 18:10:31 -08:00
James R
c3f4285988 Put branch name and commit hash in EXENAME for AppVeyor builds 
srb2win-master-a6d49eaaa70be5f88c26623c7b4a2fa5a770341e.exe
 2020-01-23 18:01:59 -08:00
James R
3d9466e5f5 Semantics 2020-01-23 13:57:39 -08:00
James R
f0daea39d4 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
2373a0aa83 Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH 2020-01-21 16:47:47 -08:00
SteelT
a6d49eaaa7
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
d90c0b8fbd 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
9cd101c68d Revert "Fix Ploadflat closing the game with "Too many flats in level" error message" 
This reverts commit ea129f701c.
 2020-01-21 15:35:07 -08:00
James R
f297f4ff56 Sonic is dead again 2020-01-21 12:24:24 -08:00
James R
c347254e80 Reorder Sonic's ass so the OpenGL wipe doesn't see garbage 2020-01-21 12:23:34 -08:00
James R
dfcd058c80 (BRUH MOMENT) activettscale was -1, so do recache after it's set 2020-01-21 12:21:18 -08:00