James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
James R
4c7400b27e
Merge branch 'save-netvars' into 'next'
...
Save netvars
See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
James R
975e042d66
Merge branch 'addfile-vararg' into 'next'
...
Give the addfile command variable argument support.
See merge request STJr/SRB2!1176
2020-10-12 18:32:20 -04:00
GoldenTails
33d026ed5a
Futureproof against strict buildbots.
2020-10-12 17:14:32 -05:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
James R
b088aad169
Add CV_NETVAR to server affecting cvars
...
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
2020-10-09 15:23:16 -07:00
James R
e9d8166e3b
Add CV_SAVE to netvars
...
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime
tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
2020-10-09 15:06:09 -07:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
GoldenTails
3514ecdec8
Update help message to mention supported file extensions, and change the description to "Load add-ons"
2020-10-06 03:37:23 -05:00
GoldenTails
f289999ce3
Add warning when files are skipped due to being previously processed.
2020-10-04 21:03:29 -05:00
GoldenTails
79861c1a98
Give the addfile command variable argument support.
2020-10-04 21:02:20 -05:00
James R
e42eb9aba8
Revert "Warn when going to OpenGL from the menu"
...
This reverts commit 3883d44bb55c1b3baf18
2020-10-02 15:37:23 -07:00
James R
c0abb2ca09
Don't let players change their name more than five times per minute
...
(ported 29488856604e9d006c37
2020-09-22 12:04:28 -07:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
Steel Titanium
058b41a834
Port netticbuffer from Kart
2020-07-19 15:24:27 -04:00
James R
71189da020
Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master'
...
Adds the branch name into the version command printout when outside of DEVELOP mode.
See merge request STJr/SRB2!981
2020-07-11 01:48:38 -04:00
GoldenTails
0fbcd7a5d2
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with
2020-06-27 10:56:15 -05:00
Zachary McAlpin
fbe3c1a122
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-25 10:31:55 -05:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
Zachary McAlpin
1b831c0bbe
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-11 15:02:31 -05:00
GoldenTails
663fcf5e61
Adds the branch name into the version command printout when outside of DEVELOP mode.
...
Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...
2020-06-06 04:12:27 -05:00
LJ Sonic
05e8d12427
Merge branch 'next' into 'better-download'
...
# Conflicts:
# src/sdl/i_system.c
# src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
Zachary McAlpin
8826eeeeb9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-29 15:32:59 -05:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Louis-Antoine
15d6a254e1
Add a command to list current file transfers
2020-05-20 00:24:53 +02:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Zachary McAlpin
81f651a81e
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-09 00:05:05 -05:00
Louis-Antoine
ccf4bbe194
Add a minimum delay between connections
2020-04-24 14:05:15 +02:00
Zachary McAlpin
b6a2c21db7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
James R
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
SteelT
2e25a5b56d
Merge branch 'viewpointswitch-fix' into 'next'
...
Fix incorrect newdisplayplayer in forced ViewpointSwitch
See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
LJ Sonic
21cb05b1f7
Merge branch 'fix-playernode-crash' into 'next'
...
Fix buffer overrun with players with no associated node
See merge request STJr/SRB2!810
2020-03-15 15:36:45 -04:00
Zachary McAlpin
564ecf4f0f
Check if you are playing a game then execute `LUAh_GameQuit` if you are in Command_quit_f and Command_ExitGame_f
2020-03-15 10:34:43 -05:00
Zachary McAlpin
9ca79b4d8b
Since exitgame shuts down the server if you are running a dedicated server I may as well allow the hook to run for the dedicated server as well
2020-03-15 00:54:06 -05:00
Zachary McAlpin
38d7ad3e6a
Let's just call LUAh_GameQuit in Command_ExitGame_f during its execution if you are in game and are not a dedicated server
2020-03-15 00:28:41 -05:00
Zachary McAlpin
586c05389d
Revert "Call LUAh_GameQuit in Command_ExitGame_f"
...
This reverts commit 57dc2df60a
2020-03-12 22:31:48 -05:00
Zachary McAlpin
8b440bdafb
Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game"
...
This reverts commit 39934f1844
2020-03-12 22:31:39 -05:00
Zachary McAlpin
39934f1844
Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game
2020-03-12 20:51:16 -05:00
Zachary McAlpin
57dc2df60a
Call LUAh_GameQuit in Command_ExitGame_f
2020-03-12 20:15:21 -05:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
LJ Sonic
e0f3a5b8f5
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
Jaime Passos
ea756fd557
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
9d0e3465f9
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
d5f6e5fcc6
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Jaime Passos
48a9ea8d0e
Turn players IT if they join the game after the hide time in tag gametypes
...
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
Jaime Passos
1b9a6fed3e
Same here
2020-02-23 16:46:45 -03:00
