Commit graph

316 commits

Author SHA1 Message Date
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
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
TehRealSalt
674c0aec17 Merge branch 'master' into new-items 2019-10-24 10:08:37 -04: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
toaster
036c6aa829 Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew? 2019-10-16 17:38:38 +01:00
toaster
3e3ee8717f Merge retry and respawn into one command, respawn. 2019-10-16 11:38:09 +01:00
toaster
69d43435f5 Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01: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
James R
22cb7451e9 ...Also remove kartdebugamount 2019-10-07 13:35:07 -07:00
James R
803884c55a Remove kartdebugitem 2019-10-07 13:12:22 -07:00
James R
392aec38f8 Rename kartdebug_giveitem to kartallowgiveitem 2019-10-07 13:11:14 -07:00
James R
833c8e2bed Give item command 2019-10-07 12:42:08 -07:00
TehRealSalt
a5ea6a9799 Merge speed/encore scrambles into the normal cvars as an "auto" option 2019-10-03 01:48:16 -04:00
TehRealSalt
38bb44e732 Separate into k_pwrlv.c, add defines to reduce amount of magic numbers 2019-09-23 08:26:42 -04:00
TehRealSalt
77aeb4663b Merge branch 'master' into versus-record 2019-09-23 07:03:56 -04:00
Jaime Passos
24d08edf05 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-09-02 20:27:50 -03:00
Monster Iestyn
0b6a463cff Merge branch 'public_next'
# Conflicts:
#	src/config.h.in
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/doomdef.h
#	src/p_map.c
#	src/p_maputl.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
Latapostrophe
ec1272dd14 remove join passwords 2019-08-04 11:26:26 +02:00
James R
6fdfd3b90c Don't send login final hashes to everyone
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.

P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
mazmazz
14df513db6 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla 2019-06-29 17:51:30 -04:00
Sryder
622c2eac07 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/k_kart.c
2019-06-02 18:15:30 +01:00
TehRealSalt
31534fe96b Merge branch 'master' into versus-record 2019-05-29 22:23:17 -04:00
Sryder
43936013f7 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/d_netcmd.h
#	src/k_kart.c
#	src/p_setup.c
2019-05-25 12:09:47 +01:00
TehRealSalt
480d56838f Add cvars to prevent issues 2019-05-20 00:50:44 -04:00
Latapostrophe
c54cc42e74 Add command to disable followers clientside 2019-05-13 19:53:17 +02:00
wolfy852
e4af44956b Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
#	src/r_things.h
2019-05-11 02:05:58 -05:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
TehRealSalt
435862b29d finished scrambles 2019-04-26 13:34:30 -04:00
TehRealSalt
6f6bc3333f Put behind cvar 2019-04-23 01:10:16 -04:00
TehRealSalt
ea2bcb3b99 Update from master 2019-04-19 20:14:06 -04:00
James R
03c27101df "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
Wolfy
2c21b62f65 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -05:00
TehRealSalt
40093a9213 Merge branch 'master' into rings 2019-03-12 01:27:11 -04:00
fickleheart
180bc0eaee Add join password to server host menu 2019-03-09 15:00:48 -06:00
wolfy852
2dc5dde769 Merge remote-tracking branch 'remotes/origin/master' into waypoints
# Conflicts:
#	src/k_kart.c
2019-03-08 12:24:03 -06:00
TehRealSalt
74a757ad69 Merge remote-tracking branch 'kartpublic/next' into rings 2019-03-07 21:31:45 -05:00
TehRealSalt
129268121d Added rings. 2019-03-07 17:11:31 -05:00
fickleheart
b9543d18b4 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
Alam Arias
2ff308251c Merge branch 'next' into followme 2019-03-02 18:42:21 -05:00
wolfy852
6feeb1e1f0 Merge remote-tracking branch 'remotes/pub/next' into followme 2019-02-26 17:12:51 -06:00
Sally Cochenour
e81df9474f Modify a few colors
- The following colors were given either more noticeable highlights or deeper shading for better colorized WANTED poster appearance: Nickel, Black, Beige, Brown, Leather, Salmon, Red, Crimson, Pumpkin, Rosewood, Burgundy, Pinetree, Swamp, Periwinkle, Blue, Blueberry, Dusk, Purple, Lavender, and Byzantium.
- Fixed an off-looking purple tone on Ruby.
- Salmon's outline & shading was made darker, to make it slightly easier on the eyes.
- Peach recieved a complete overhaul, featuring high contrast and yellow highlights.
- Add kartdebugcolorize for taking a quick glance at all of the colorizations
2019-02-26 04:30:51 -05:00
wolfy852
da82535475 Ping kick changes + other quality of life improvements [REDO] 2019-02-15 20:51:44 -06:00
Latapostrophe
4721243ae5 I needed to commit here so I could switch branches to fix magnet hand xd 2019-02-13 10:06:52 +01:00
Sally Cochenour
2c8c994324 In-game player cap & spectator queue
Force everyone beyond a certain point to spectate -- spectators get to queue up. In response to me doing a 1v1 match, tons of people wanting to join to watch, and just relying on honor system to prevent mid-joiners. Spectators are prioritized by how long they've been waiting. I'm thinking of hijacking base SRB2's team scramble for a scramble option later.
2019-02-03 16:43:11 -05:00
Sryder
79f381ebd4 Add visual debugging mode for waypoints
Fix some compiler warnings
2019-02-02 21:35:21 +00:00
TehRealSalt
815d287cbe Final v1.0.2 commit (probably)
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
2019-01-18 04:30:38 -05:00
TehRealSalt
3246ca6b33 More finished power level
broken, can't finish
2019-01-16 14:49:42 -05:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00