Commit graph

808 commits

Author SHA1 Message Date
James R
0408572380 Merge branch 'modid' into 'next'
Put a mod name in SERVERINFO

See merge request STJr/SRB2!577
2019-12-30 15:41:08 -05:00
fickleheart
be9384ddd9 Merge branch 'master' into newcontrols
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/g_game.h
#	src/m_menu.c
2019-12-30 10:47:09 -06:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R
14fed1f644 More fine tuned versioning
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.
2019-12-25 20:52:02 -08:00
Jaime Passos
c832d26ee9 ViewpointSwitch improvements. 2019-12-23 20:22:57 -03:00
Jaime Passos
100144d4db Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
James R
8368449e6c Use a random port when connecting 2019-12-18 15:34:55 -08:00
Jaime Passos
b6b98cd464 Rankings tweaks 2019-12-18 12:36:02 -03:00
Jaime Passos
30be9e29e5 NUMGAMETYPES vs gametypecount 2019-12-18 12:30:01 -03:00
Jaime Passos
789e881abc GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos
448494e19b More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Jaime Passos
d7cb14d38e Gametype rules draft, mind the debug command 2019-12-18 01:25:57 -03:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
fickleheart
4c41bc1478 Consolidate G_BuildTiccmd 2019-12-08 13:27:11 -06:00
James R
ee07656120 memset this or the stupid masterserver (used to) show garbage bytes
Also for security I guess...
2019-12-07 15:47:18 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
20cf020458 Fix clearing maps making the Tutorial option on the SP menu crash. 2019-12-05 13:42:08 +00:00
toaster
2b2d2a8441 Correct two instances where "Zone" is forced uppercase. 2019-11-25 16:04:03 +00:00
MascaraSnake
27f99a7461 Merge branch 'infopoke' into 'master'
MS Info packet tweaks (resolves #300)

Closes #300

See merge request STJr/SRB2Internal!499
2019-11-22 15:21:41 -05:00
Jaime Passos
3a7342e06d Remove D_ProcessEvents call in G_PreLevelTitleCard 2019-11-21 02:16:09 -03:00
toaster
a76d50025b Further cleanup. 2019-11-19 20:24:44 +00:00
toaster
834a36c1ed lmao how did i forget a null terminator 2019-11-19 13:40:07 +00:00
toaster
17f2e83d4f MS Info packet tweaks.
* Report a completely uppercase map title in SERVERINFO, as per the MS previously expected (resolves #300).
* Ignore colour codes in map titles in SERVERINFO, since those now function like with console font.
* Modulo the skin number provided in PLAYERINFO by 3 in DEVELOP builds, so it's safe to test with certain characters on the MS (AS LONG AS IT'S NOT A RELEASE BUILD).
2019-11-19 13:36:33 +00:00
MascaraSnake
269b2be9f7 Merge branch 'reset-rollangle' into 'master'
Reset rollangle

See merge request STJr/SRB2Internal!494
2019-11-18 14:11:32 -05:00
Steel Titanium
b1f39e836d Better ping implementation. 2019-11-17 20:22:47 -05:00
Louis-Antoine
ca5b1297ee Show player number instead of node when someone joins 2019-11-16 01:42:02 +01:00
Louis-Antoine
175f367b9c Make the "nodes" command clearer
Because literally anyone who isn't a dev has
no idea what those fucking numbers even mean...

Before:
$nodes
00 - Sonic - 01 - 666.66.420.42:5029
01 - Tales - 00 - self
02 - Nukes - 255
03 - Ammie - 255
04 - Fangs - 255
05 - Metal - 255

After:
$nodes
00 - Sonic - node 01 - 666.66.420.42:5029
01 - Tales - node 00 - self
02 - Nukes
03 - Ammie
04 - Fangs
05 - Metal
2019-11-15 17:50:40 +01:00
Jaime Passos
d0a996349b Yeah, yeah... 2019-11-14 22:14:40 -03:00
MascaraSnake
5892de3011 Merge branch 'rotsprite_i' into 'master'
Sprite rotation (resolves #183)

Closes #183

See merge request STJr/SRB2Internal!430
2019-11-14 14:58:13 -05:00
toaster
a4efd441af * Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward).
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 17:03:02 +00:00
James R
7815b876b9 Save bans when cleared too
(Why doesn't it work for I_Quit?)
2019-11-13 17:37:53 -08:00
toaster
f7c5774b7e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
# Conflicts:
#	src/p_user.c
2019-11-12 21:56:46 +00:00
toaster
2a16cf539a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
91d2beebfa * Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
MascaraSnake
a039814673 Merge branch 'set-name-on-join' into 'master'
Set the player's name as soon as they enter the game

See merge request STJr/SRB2Internal!397
2019-10-25 15:38:21 -04:00
MascaraSnake
2004577314 Merge branch 'james-kart' into 'master'
My changes to Kart

See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
MascaraSnake
7c9c2553b2 Merge branch 'kartport_namedvalues' into 'master'
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
2019-10-25 15:32:56 -04:00
James R
465f9055aa The console sucks, so "Don't" becomes "No" :lancer: 2019-10-23 17:37:09 -07:00
James R
a763273736 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-10-22 20:14:01 -07:00
James R
4f5d32a73f "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
Louis-Antoine
209a883821 Set the player's name as soon as they enter the game 2019-10-19 17:09:18 +02:00
James
fc862c999d Bad parathesis 2019-10-19 01:48:56 -04:00
Monster Iestyn
cf75d45555 Fix missing & which I totally forgot about in writing this fix (yes this is the "compile error" everyone was talking about) 2019-10-18 13:37:42 +01:00
Monster Iestyn
7d5ebaf892 Fix sprite-related console errors that occur in netgames whenever the game attempts to synch the player's state.
Turns out the code was using P_SetMobjStateNF to "fix" the player's state ...which got things all wrong, lol.
2019-10-17 18:22:06 +01:00
Louis-Antoine
656f88ad56 Fix clients being resynched at the wrong gametic 2019-10-16 21:24:30 +02:00
toaster
8bab035279 Added some examples of cvars that can use named values.
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
2019-10-15 11:49:37 +01:00
Jaime Passos
09c9714daf Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
TehRealSalt
a5ea6a9799 Merge speed/encore scrambles into the normal cvars as an "auto" option 2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
James R
1b0ba7768c False instead of 0, a little clearer 2019-10-02 13:57:14 -07:00