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
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
Zwip-Zwap Zapony
f7718ea1dc
Fix "cam2_turnmultiplier"
...
In splitscreen stuff, player 2's "cam2_turnmultiplier" implementation
was wrong compared to player 1's "cam_turnmultiplier"
This commit makes player 2's multiplier work just like player 1's does
2020-01-20 16:14:20 +01:00
Confusion
db4cc87be7
Fix title screen broken when leaving during resynch
2020-01-19 17:55:22 +03:00
Louis-Antoine
4777829d45
Fix mouse in controls setup menu
2020-01-18 20:18:20 +01:00
Alam Ed Arias
b836b911a7
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
Fuck NONET
See merge request STJr/SRB2!699
2020-01-17 11:11:02 -05:00
James R
6793b03827
Dumbass NONET stuff...
2020-01-16 18:07:28 -08:00
James R
ef92934661
Merge branch 'larger-chat' into 'master'
...
Larger chat
See merge request STJr/SRB2!691
2020-01-16 20:33:09 -05:00
James R
f3b670fa20
Merge branch 'snac-bruh' into 'master'
...
Try to set a 21 character name and SIGABRT
See merge request STJr/SRB2!689
2020-01-16 20:32:58 -05:00
James R
d309bb597b
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
-bindaddr for mserv
See merge request STJr/SRB2!688
2020-01-16 20:32:49 -05:00
Alam Ed Arias
885273d103
Merge remote-tracking branch 'origin/master'
2020-01-16 20:17:05 -05:00
James R
1de00bc6bb
Merge branch 'word' into 'master'
...
Word jumping
See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
Alam Ed Arias
45139da3b5
please stop breaking clang
2020-01-16 12:05:21 -05:00
James R
77501f8d52
Merge branch 'locale-liberation' into 'master'
...
Locale liberation
Closes #113
See merge request STJr/SRB2!677
2020-01-15 23:38:40 -05:00
James R
522ef41b98
Merge branch 'extra-life-jingle' into 'master'
...
Optionally use a sound for 1-Up
See merge request STJr/SRB2!668
2020-01-15 23:38:21 -05:00
James R
c27b9ca3a8
Merge branch 'flats-in-walls-fix' into 'master'
...
Prefer textures on walls, not flats
See merge request STJr/SRB2!687
2020-01-15 23:37:41 -05:00
Louis-Antoine
fc01862eeb
bruh
2020-01-15 15:57:38 +01:00
Louis-Antoine
6d703add73
Cleanup chat code a little
2020-01-15 15:48:03 +01:00
Louis-Antoine
7459a6b4a8
Increase maximum and default chat width
2020-01-15 15:36:11 +01:00
James R
73852fc767
Update buffer for SendNameAndColor
2020-01-14 21:40:58 -08:00
James R
3ed8003a04
And free addrinfo
...
(cherry picked from commit 986c80fb13e7ae6900792de5b4b43327af7ca76c)
2020-01-14 19:33:52 -08:00
James R
e9f9c39124
Let MS_Connect use -bindaddr
...
And so now you really can host from multiple IP addresses.
(cherry picked from commit e56bf12537700af7b7fcd0d3b0e8586e41edddd1)
2020-01-14 19:33:52 -08:00
James R
f6def02b49
Load flats first so textures with the same name are prefered on walls
2020-01-13 15:21:35 -08:00
James R
3842b04bdc
Refactor R_LoadTextures into something manageable (no goto!!)
2020-01-13 15:20:50 -08:00
James R
ca723c84f4
Merge branch 'disable-titlemap-in-netgames' into 'master'
...
Disable title map when entering a netgame
See merge request STJr/SRB2!683
2020-01-13 16:47:17 -05:00
LJ Sonic
fd18f1cb7f
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node player mixups
See merge request STJr/SRB2!684
2020-01-12 15:57:20 -05:00
