Steel Titanium
|
fe346bf8e0
|
Add missing break
|
2020-03-08 15:02:42 -04:00 |
|
Steel Titanium
|
9d0c959bb4
|
Merge remote-tracking branch 'origin/resend-gamestate' into netcode-tests
|
2020-03-08 14:52:19 -04:00 |
|
Steel Titanium
|
4f0c91148a
|
Merge remote-tracking branch 'origin/increase-input-buffer' into netcode-tests
|
2020-03-08 13:58:02 -04:00 |
|
Steel Titanium
|
9b42bb132e
|
Merge remote-tracking branch 'origin/fix-playernode-crash' into netcode-tests
|
2020-03-08 13:57:28 -04:00 |
|
SteelT
|
bb56aa603f
|
Merge branch 'ss-damage-fix' into 'next'
Fix Special Stages crashing upon taking damage
See merge request STJr/SRB2!839
|
2020-03-06 17:59:57 -05:00 |
|
Zipper
|
4b28e19d16
|
Update p_inter.c
|
2020-03-05 18:48:20 -05:00 |
|
Zipper
|
4d8a523da9
|
Update p_inter.c
|
2020-03-05 18:30:27 -05:00 |
|
ZipperQR
|
da9bf34175
|
fix source player being nil
|
2020-03-05 12:26:27 +03:00 |
|
SteelT
|
039aeed633
|
Merge branch 'tolflag-fix' into 'next'
Fix G_TOLFlag returning the wrong type
See merge request STJr/SRB2!834
|
2020-03-02 21:27:45 -05:00 |
|
Steel Titanium
|
10d08fc8bb
|
Merge branch 'master' into next
|
2020-03-02 15:26:01 -05:00 |
|
SteelT
|
7d14796954
|
Merge branch 'fix-ogllib' into 'master'
Fix -OGLlib
See merge request STJr/SRB2!794
|
2020-03-02 15:21:50 -05:00 |
|
Jaime Passos
|
67b8a7eb67
|
Merge remote-tracking branch 'origin/next' into tolflag-fix
|
2020-03-02 13:14:12 -03:00 |
|
Louis-Antoine
|
04a1f479be
|
Increase the length of the player input buffer
|
2020-03-02 15:36:28 +01:00 |
|
LJ Sonic
|
75e12f9d9d
|
Merge branch 'fix-io-warning' into 'next'
Fix compiler warning
See merge request STJr/SRB2!833
|
2020-03-02 07:46:46 -05:00 |
|
Louis-Antoine
|
7ba93c184f
|
Fix warning and formatting
|
2020-03-02 13:33:12 +01:00 |
|
Jaime Passos
|
70a103b9af
|
Fix G_TOLFlag returning the wrong type
|
2020-03-02 00:20:53 -03:00 |
|
LJ Sonic
|
60cd6fe986
|
Merge branch 'next' into 'resend-gamestate'
# Conflicts:
# src/d_clisrv.c
|
2020-03-01 12:35:53 -05:00 |
|
Jaime Passos
|
76bda716cd
|
Merge branch 'tol-moment' into 'next'
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
See merge request STJr/SRB2!825
|
2020-03-01 11:14:29 -05:00 |
|
LJ Sonic
|
2cace6e147
|
Merge branch 'lua-io' into 'next'
Support for Lua's I/O library
See merge request STJr/SRB2!727
|
2020-03-01 11:12:45 -05:00 |
|
Louis-Antoine
|
46d8546f49
|
Update packet names
|
2020-03-01 03:26:15 +01:00 |
|
Louis-Antoine
|
846560910d
|
Obliterate resynch
Okay, more precisely this substitutes the old resynch with
the newly added gamestate resend code.
|
2020-03-01 03:22:47 +01:00 |
|
Monster Iestyn
|
cf95837a76
|
Merge branch 'follow-is-mobj' into 'next'
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
|
2020-02-29 12:48:39 -05:00 |
|
Louis-Antoine
|
29d8389461
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
|
2020-02-29 13:43:47 +01:00 |
|
Louis-Antoine
|
4f7591a044
|
Rename packet
|
2020-02-29 13:40:15 +01:00 |
|
Louis-Antoine
|
a927d67259
|
Fix warning
|
2020-02-28 18:17:37 +01:00 |
|
Jaime Passos
|
4abe112af8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-25 22:43:15 -03:00 |
|
Jaime Passos
|
8350a8c58a
|
Merge branch 'new-color-chat-fix' into 'master'
Fix new skin colors using default chat color
See merge request STJr/SRB2!822
|
2020-02-25 20:38:36 -05:00 |
|
Jaime Passos
|
b9fb6182ac
|
Merge branch 'amycrash' into 'master'
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
See merge request STJr/SRB2!823
|
2020-02-25 20:38:15 -05:00 |
|
Jaime Passos
|
25cf369f22
|
Fix (technically functional) string comparison counting an extra character in the comparison length
|
2020-02-25 22:34:19 -03:00 |
|
Jaime Passos
|
3d7cd29eda
|
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
|
2020-02-25 22:30:34 -03:00 |
|
LJ Sonic
|
8dd4e47a35
|
Merge branch 'realmo' into 'next'
Let Lua access spectator mobjs
See merge request STJr/SRB2!756
|
2020-02-25 15:06:29 -05:00 |
|
Jaime Passos
|
fe93155578
|
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
|
2020-02-24 20:03:08 -03:00 |
|
Steel Titanium
|
ce801e1076
|
Fix new skin colors using default chat color
|
2020-02-24 16:58:19 -05:00 |
|
Jaime Passos
|
ebafd4b2c6
|
Merge branch 'spectator-is-it' into 'next'
Don't get chosen as the tagger if you're a spectator
See merge request STJr/SRB2!815
|
2020-02-23 20:37:27 -05:00 |
|
James R
|
711c8ed6b4
|
Merge branch 'console-in-menus-mk-ii' into 'master'
Console in menus again!
See merge request STJr/SRB2!797
|
2020-02-23 18:15:43 -05:00 |
|
James R
|
95b8f950b4
|
Merge branch 'nomd5-crash' into 'master'
Fix crash under NOMD5
See merge request STJr/SRB2!807
|
2020-02-23 18:15:04 -05:00 |
|
James R
|
3394102927
|
Merge branch 'exitmove-hideflags' into 'master'
Don't spawn the exitmove flags in Single Player
See merge request STJr/SRB2!813
|
2020-02-23 18:13:38 -05:00 |
|
Jaime Passos
|
94738bfd2d
|
Don't get chosen as the tagger if you're a spectator
|
2020-02-23 19:28:16 -03:00 |
|
Tatsuru
|
ff8a62819b
|
Oopsie 2
|
2020-02-22 22:36:44 -03:00 |
|
Tatsuru
|
4c00e33096
|
Oopsie
|
2020-02-22 21:14:05 -03:00 |
|
SteelT
|
0770f77371
|
Merge branch '2.2.2-prep' into 'next'
2.2.2 preparation
See merge request STJr/SRB2!811
|
2020-02-22 17:27:19 -05:00 |
|
Steel Titanium
|
03e38e9486
|
Enable use of the patch file
|
2020-02-22 16:42:24 -05:00 |
|
Steel Titanium
|
1c1163bd0f
|
Update version number to 2.2.2
|
2020-02-22 16:37:13 -05:00 |
|
Louis-Antoine
|
d19fe295e0
|
Fix buffer overrun with nodeless players
|
2020-02-22 15:08:17 +01:00 |
|
James R
|
af12f26f37
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-21 21:06:27 -08:00 |
|
James R
|
f6df71ba54
|
Fix NOMD5 compiling
|
2020-02-21 21:06:04 -08:00 |
|
James R
|
0f2b8b8b2c
|
Register servername etc. under NOMD5
This fixes crashes in the menus.
|
2020-02-21 20:04:28 -08:00 |
|
Steel Titanium
|
76f26cda24
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
SteelT
|
cfd190c453
|
Merge branch 'warp-gamedata-corruption-fix' into 'next'
Warp gamedata corruption fix
See merge request STJr/SRB2!802
|
2020-02-21 21:00:29 -05:00 |
|
SteelT
|
a1cf58cf7f
|
Merge branch 'update-copyright-year' into 'master'
Update copyright year
See merge request STJr/SRB2!801
|
2020-02-21 20:59:56 -05:00 |
|