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
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
Louis-Antoine
472befd183
Replace MAX_WADPATH with plain numbers
...
This is not ideal either, but I would rather
not use a constant for something unrelated.
2020-02-21 17:31:32 +01:00
Louis-Antoine
ec5b88e79f
Fix weird comment style
2020-02-21 17:17:39 +01:00
James R
93046c5e59
Merge remote-tracking branch 'origin/master' into next
2020-02-20 17:30:50 -08:00
James R
08627752b2
Fix NOPNG compiling
2020-02-20 17:30:32 -08:00
James R
2df4717f18
Fix NO_LUA compiling
2020-02-20 17:20:50 -08:00
James R
cce5308108
Fix compiler warnings
2020-02-20 17:18:26 -08:00
James R
fb0bedf02c
Merge branch 'ogl-colorbug' into 'master'
...
Fix OpenGL "color bug"
See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R
62d943b609
Merge branch 'thin-fixed' into 'next'
...
Add more strings (and respective functions) for v.drawString().
See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
Sally Cochenour
400366802c
Make hook_FollowMobj a mobj hook instead of a player hook
...
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
2020-02-20 16:40:39 -05:00
Monster Iestyn
5c33ff0458
clarify the situation a bit more in the comments
2020-02-20 20:38:01 +00:00
Monster Iestyn
903cc311a7
move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified
2020-02-20 20:31:11 +00:00
Louis-Antoine
3502278f8a
SpaceSpaceSpaceSpace
2020-02-20 01:15:54 +01:00
James R
54794f325d
:)
2020-02-19 14:44:22 -08:00
James R
61470201f9
Regex bruh moment
2020-02-19 14:37:42 -08:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
12959ff4a9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
Louis-Antoine
20d054a679
Minor code cleanup
2020-02-19 22:37:30 +01:00
