stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-24 10:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
12636 commits 174 branches 42 tags 290 MiB
Commit graph

448 commits

Author SHA1 Message Date
spherallic
3b75ef7e76 Fix warning when compiling with NONET=1 2022-03-03 12:08:15 +01:00
LJ Sonic
d77b427329 Merge branch 'adjust-max-downloadspeed' into 'next' 
Raise the maximum value of file upload speed drastically

See merge request STJr/SRB2!1665
 2021-12-02 23:57:42 +00:00
LJ Sonic
be87a84a01 Merge branch 'perfstats-averaging-rebased' into 'next' 
Perfstats averaging and refactor

See merge request STJr/SRB2!1643
 2021-12-02 23:57:26 +00:00
LZA
a3353be0dc Raise addon limit 2021-12-02 22:50:44 +00:00
LJ Sonic
ff037a8160 Remove downloadspeed cruft 2021-12-02 23:34:28 +01:00
LJ Sonic
14403737ef Raise the file upload speed drastically 2021-12-02 23:15:55 +01:00
Jaime Ita Passos
1d7061b892 Fix NONET compiling 2021-11-08 01:34:03 -03:00
Hannu Hanhi
77ecfb9cdc Perfstats averaging and refactor 2021-10-29 02:18:02 +03:00
Tatsuru
6ed063dcce Merge branch 'polish-lua-inputs' into 'next' 
Polish the Lua input library

See merge request STJr/SRB2!1598
 2021-09-11 14:59:41 +00:00
Shane Ellis
ccc71ddafc Merge branch 'addplayer' into 'next' 
Multiplayer Bot Features (aka AddPlayer)

See merge request STJr/SRB2!1383
 2021-08-25 21:38:37 +00:00
LJ Sonic
9b7263855e Prevent input.setMouseGrab from interfering with window focus 2021-08-18 20:58:13 +02:00
LJ Sonic
5340db5f67 Make gc_ constants uppercase 2021-08-15 16:15:28 +02:00
sphere
198127dd6f Merge branch 'demos-revert-netvars' into 'next' 
Revert netvars to user value after demo finishes playback

See merge request STJr/SRB2!1578
 2021-08-02 13:08:43 +00:00
Nev3r
6d76d05d62 Merge branch 'working-server-incompatibility-checks' into 'next' 
Actually tell you if the server is running an incompatible version

See merge request STJr/SRB2!1509
 2021-07-16 16:55:41 -04:00
James R
e30d4f954b Revert netvars after demo finishes playback 
(Demos do not call CL_Reset BTW.)
 2021-07-08 14:37:03 -07:00
CobaltBW
4f04097066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer 2021-06-29 14:32:46 -07:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Shane Ellis
18c47afc76 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/lua_baselib.c
#   src/r_skins.c
 2021-06-02 11:47:11 -04:00
katsy
b2ae7c79e7 make a few messages more helpful 2021-05-24 00:00:01 -05:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
James R
c13e1a74dd Reject banned players with refusereason 2021-05-10 18:10:53 -07:00
James R
8486a9386d serverinfo: enumerate refusereason 2021-05-10 18:10:16 -07:00
James R
22bfc2db78 Refactor HandleConnect refusals 
Also removed some version fields from serverconfig_pak and
clientconfig_pak. Client version will be checked with
SRB2APPLICATION and MODVERSION.

Not updating PACKETVERSION because those packets shouldn't
have been packetversion'd in the first place.
 2021-05-10 17:50:01 -07:00
James R
0edbca5e02 Actually report server version mismatches 
Incompatible servers get dropped from the server list. It
turns out the server list is also used when connecting
directly to a server. This meant that if you tried
connecting to a server that was incompatible, you'd just
get an infinite connection screen, as if the server was
completely unreachable.

Now it won't drop the server if you are directly
connecting to it. I also copied some incompatibility
messages from HandleConnect.
 2021-05-10 16:51:18 -07:00
Monster Iestyn
fa140c1eb3 Merge branch 'load-netgame-error-fixes' into 'next' 
Load netgame error fixes

See merge request STJr/SRB2!1482
 2021-05-07 17:27:19 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
LJ Sonic
f97dc1093a Merge branch 'kitchensync' into 'next' 
Attempt to resolve teleportation resync issue

See merge request STJr/SRB2!1490
 2021-04-30 20:39:11 -04:00
katsy
815db01438 adjust cooldown to 5 seconds (bandage fix for 2.2.9) 2021-04-30 20:30:35 -04:00
katsy
858cb98e57 attempt to resolve teleportation resync issue 2021-04-30 17:26:09 -05:00
Monster Iestyn
b8ba2c5b70 Merge branch 'next' into load-netgame-error-fixes 
# Conflicts:
#	src/d_clisrv.c
 2021-04-28 18:08:48 +01:00
LJ Sonic
cd4cfba500 Delete faulty return 2021-04-26 21:10:32 +02:00
Monster Iestyn
34fa977192 move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail 2021-04-26 19:07:11 +01:00
X.organic
0cbf9a791b
Fix indentation in MOBJCONSISTANCY conditional 2021-02-16 23:27:44 +01:00
X.organic
90611ed547
Fix MOBJCONSISTANCY and make it optional in DEBUGMODE 
MOBJCONSISTANCY checks confined to gamestate GS_LEVEL. DEBUGMODE
no longer implicitly enables them, making it netgame-compatible.
 2021-02-16 21:36:28 +01:00
LJ Sonic
97daba68d0 Enable rejointimeout by default 2021-02-15 16:24:30 +01:00
CobaltBW
a2fce68f14 Specialized Lua function for bot removal 2021-01-23 17:01:48 -08:00
Shane Ellis
9bbebcbe9e Update d_clisrv.c 2021-01-15 17:55:14 -05:00
Shane Ellis
93562b782e Revert "Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player…" 
This reverts commit 079fe9ba7e
 2021-01-15 22:50:20 +00:00
Shane Ellis
079fe9ba7e Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player instances (e.g. player bots) 2021-01-15 17:08:16 -05:00
James R
7b6675178e Merge branch 'oldguards' into 'next' 
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
 2020-12-12 17:34:04 -05:00
James R
93e4f43e4b Hooklib macros names -> uppercase + documentation 2020-12-12 03:16:30 -08:00
James R
9ddeb5f589 Resolve GameQuit hook conflicts 2020-12-12 02:05:21 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
James R
9ea969b62d Merge branch 'gamequit-argument' into 'next' 
Send a `quitting` argument to the GameQuit Lua hook.

See merge request STJr/SRB2!1276
 2020-12-10 15:25:52 -05:00
James R
a5d228773d Merge branch 'reload-bans' into 'next' 
Fix reloadbans clearing ban.txt and clearbans not actually saving the changes

See merge request STJr/SRB2!1215
 2020-12-10 14:28:13 -05:00
James R
e0a307da15 Merge branch 'next' into hooklib-refactor 2020-12-10 03:09:24 -08:00
James R
2ab71571aa Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
James R
8d382e49fb Big Large Lua Hooklib Refactor 
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
 2020-12-10 00:36:41 -08:00
James R
e7883f3f8e That moment when you see HAVE_BLUA crawl back from the grave 
This would mean MapChange hasn't been firing for demos ...since 2.2.5.
 2020-12-10 00:36:14 -08:00
GoldenTails
119d2e9e37 Remove the rest of the Playing() checks for GameQuit hook 2020-11-29 16:53:29 -06:00