Sally Coolatta
2af75a2bd1
Fix merge conflicts
2021-01-11 00:06:34 -05:00
Sally Coolatta
a14cf1f029
Merge branch 'master' into new-menus
2021-01-10 21:31:09 -05:00
SteelT
151acf4f68
Replace BACKUPTICS with TICQUEUE
...
Seems to help with the very frequent timeouts. Still weird issues with node/netcmd being resent or something...
2021-01-10 15:12:44 -05:00
Latapostrophe
3cd4c87df5
Weaker tumble, some effects + tumble on spring panel fail
2021-01-09 21:58:35 +01:00
Sally Coolatta
cfda66103d
Merge branch 'master' into just-tumble
2021-01-06 23:02:51 -05:00
Latapostrophe
fe4d9ce889
New trick panel shit (but only the gameplay part)
2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb
Merge conflicts
2021-01-06 18:33:42 +01:00
Sally Coolatta
350a8bd5c4
We can bring this back now
2020-11-18 17:24:03 -05:00
Sally Coolatta
14b379fd27
Cherry-pick 4eb69a664
2020-11-16 19:52:26 -05:00
Sally Coolatta
4d881f3279
Merge branch 'master' into battle-rethink
2020-11-16 03:09:13 -05:00
Sally Coolatta
827a1b5fca
Refactor stealing & destroying bumpers
...
- Prevents being able to farm extra bumpers off of karma players
- Paves the way for bumper destroy animation later
2020-11-15 06:25:38 -05:00
James R
ed96a8b432
Don't request hole punch to self, and don't register local server for hole punching
2020-11-12 17:31:16 -08:00
James R
c8d4ef64f9
Hole punching
2020-11-12 17:08:34 -08:00
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Sally Coolatta
37567de6c0
Merge branch 'master' into mis-gentlemens-packets
2020-11-10 20:34:13 -05:00
Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
Sally Coolatta
0e28470228
Merge master
2020-11-08 02:34:24 -05:00
Sal
307a8aa778
Merge branch 'http-downloads-auth' into 'master'
...
Command for http downloads with basic auth
See merge request KartKrew/Kart-Public!233
2020-11-03 13:04:43 -05:00
Sally Coolatta
3d7a2b8c95
Set cl_packetmissed = true when dropping a packet due to gentlemens
...
This might be dumb enough to work? :)
2020-11-02 18:10:59 -05:00
Sally Coolatta
4a9a438270
Dummy out wanted system
...
- Remove WANTED hud item
- Person in 1st place is the bonus points giver
- Sort players by Emeralds > Bumpers > Points
2020-11-02 03:51:16 -05:00
Sally Coolatta
ed6787ae4d
remove lj's thing
2020-10-25 14:42:23 -04:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
ddf466d61f
Fix compile errors
2020-10-24 19:52:09 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
0969ca1af9
Karma bombs rework
...
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Sally Coolatta
7ce53ac104
Add blue spheres
...
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04:00
Louis-Antoine
bd9a89c82a
Kick clients that fail to catch up with server gamelogic
2020-10-21 20:25:29 +02:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04: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
2a316e49e5
Revert netvars after leaving a netgame
2020-10-06 23:32:11 -07:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
James R
186cdea8d5
Reset asksent before CL_ASKJOIN
...
It gets pushed forward for ASKINFO.
2020-09-30 12:42:53 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
Lachlan Wright
b37d6ba94d
Merge branch 'name-change-spam' into 'next'
...
Don't let players change their name more than five times per minute
See merge request STJr/SRB2!1155
2020-09-25 09:36:39 -04:00
Lachlan Wright
1ec61bb8f4
Merge branch 'clarity' into 'next'
...
Add-on clarity from Kart
See merge request STJr/SRB2!1153
2020-09-25 09:33:04 -04:00
Lachlan Wright
9f58d6f053
Merge branch 'snake-fixes' into 'next'
...
Fix bonus items sometimes overriding apples in Snake minigame
See merge request STJr/SRB2!1134
2020-09-25 09:23:33 -04:00
Lachlan Wright
0060bac482
Merge branch 'more-stats' into 'next'
...
Add tic and UI times to render stats
See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04: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
toaster
2e922a3673
Null out the messages Sal added while trying to fix the thing
2020-09-22 13:21:24 +01:00
toaster
e053fd249b
Game works now
2020-09-22 13:19:35 +01:00
Sally Coolatta
ef8f2e6fa4
Minor touchups to netcode
2020-09-22 01:53:28 -04:00
Sally Coolatta
99a1bacb81
Turning code overhaul
...
Packet drops are still broken, but at least netgames are playable now.
2020-09-22 00:35:44 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
Zippy_Zolton
bf857e1c59
Add-on clarity from Kart
2020-09-20 13:07:28 -05:00
SteelT
d8bcc13fec
Merge branch 'master' into trick-panels
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/k_kart.c
# src/p_user.c
2020-09-18 00:54:45 -04:00
James R
15cb3202e2
Merge branch 'master-server-2' into 'next'
...
Master Server 2
See merge request KartKrew/Kart-Public!224
2020-09-12 20:25:42 -04:00
