Commit graph

289 commits

Author SHA1 Message Date
Dennis Felsing fabd559746 Clamp Spectator ID 2018-12-11 09:23:12 +01:00
Ryozuki dc4179b056 it's safe to delete a null pointer 2018-08-24 20:02:23 +02:00
bors[bot] ebb9481857 Merge #1157 #1160
1157: Add a way to call for external moderator help r=Learath2 a=heinrich5991

This is done by HTTP POSTing to a location specified by
`sv_modhelp_url`. We also provide a `src/modhelp/server.py` which can
use theses POSTs to forward them to Discord servers.

The POST contains a JSON object payload, with the keys `"port"` which
contains the server port, `"player_id"` which contains the calling
player's client ID, `"player_name"` which contains the calling player's
nick and `"message"` which is the user-specified message.

Make JSON-escaping function public, add tests and fix bugs uncovered by
these tests.

Supersedes #1129.

1160: Fix warning about incompatible function pointers r=Learath2 a=heinrich5991

This comes at the cost of one allocation per started thread. This should
be okay because we're about to invoke a syscall anyway.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-06-24 14:12:48 +00:00
heinrich5991 7b76208431 Use m_ModhelpTick to store the last modhelp action
This addresses @Learath2's comment.
2018-06-24 11:15:16 +02:00
heinrich5991 57e26450b2 Unify spelling of Modhelp
Since the command name is `/modhelp` it should be written `Modhelp` in
camel case.
2018-06-24 11:03:18 +02:00
heinrich5991 c739aef60e Some style fixes 2018-06-19 14:28:53 +02:00
ZombieToad 99d0360947
fix pause messages
they were reversed
2018-06-14 22:41:28 +01:00
Dennis Felsing f8a00ad8af
Merge pull request #1000 from Ryozuki/pr_modhelp_chat_cmd
Add /modhelp chat command
2018-04-03 10:21:01 +02:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
def c73e2a7ba8 New year is on January 1, not February 1 2018-02-01 20:22:18 +01:00
heinrich5991 a744fe53a2 Remove CPlayer::m_Authed
This can't get out of sync now.
2018-01-27 23:13:17 +01:00
Ryozuki 79fedff12d add /modhelp chat command 2018-01-21 01:32:55 +01:00
Ryozuki d6eb604718 add rcon moderate mode 2018-01-05 15:23:08 +01:00
def 03fa475b5e Implement /pause [name] and /spec [name] 2017-09-18 19:12:01 +02:00
def 0a09af4b33 str_format instead of sprintf 2017-09-03 09:01:25 +02:00
def 862e26dd08 Clean up time handling a bit 2017-09-03 08:48:21 +02:00
def 4c98c4bdd6 typo 2017-07-23 21:34:36 +02:00
def 79d29b1e31 Fix: Finish score should always show the fastest time 2017-07-23 21:33:55 +02:00
Dennis Felsing bcb30c860e Merge pull request #761 from Learath2/dd_pr_vanillapause
Can't spectate yourself when /pause'd
2017-07-09 23:15:57 +02:00
def 46cedf3a8c Compiler warnings 2017-07-09 10:27:58 +02:00
eeeee 9b6699d3b8 remove casts to CServer
improving encapsulation by going through the interface instead of including engine/server/server.h
2017-06-05 20:51:12 -07:00
Learath2 6a6666abc4 Keep pause state when killed 2017-05-24 22:30:28 +02:00
Learath2 cf81ef8ce6 Can't spectate yourself when /pause'd 2017-05-19 00:21:01 +02:00
def c1c2c1575f Fix some vanilla pause issues 2017-05-18 23:52:54 +02:00
def a7ee59804b Reverse... 2017-05-16 17:52:29 +02:00
Dennis Felsing 666d1585b7 Fix crash on invalid pause state in save 2017-05-16 17:02:28 +02:00
Learath2 b4b5d6cc9e /pause'd players stay in player list 2017-05-15 13:56:54 +02:00
Dennis Felsing 278b17b460 Merge pull request #721 from Learath2/dd_pr_pause
Rework the pause system
2017-05-14 11:55:09 +02:00
Learath2 c1a4a95d61 Add ratelimiting and config options for invite 2017-04-24 14:04:50 +02:00
Learath 95690a1cf7 Reimplement sv_pause_frequency 2017-04-09 01:16:48 +02:00
Learath 5626259b27 Rework pause. Fixes force_pause 2017-04-09 00:20:41 +02:00
necropotame b6548aa8cf Fix wrong code convension, add enum for timer display type 2017-02-28 07:31:24 +01:00
necropotame 4cfe96801b Send the race time using warmup timer 2017-02-28 07:31:24 +01:00
heinrich5991 c08206dd96 Don't show player HUD during /pause for vanilla clients 2016-09-20 21:40:40 +02:00
def 3c54f443b2 Make sv_join_vote_delay work for /map votes and make the number of seconds configurable 2016-05-20 20:05:47 +02:00
Ryozuki 82d2a994ed Fixed cl_showping (now cl_showpred) 2016-05-05 18:07:00 +02:00
Ryozuki 5c7856ee59 Added cl_showping 2016-05-03 16:06:10 +02:00
H-M-H e39829ef7c killer of locked team will get strong hook on respawn 2016-03-04 22:55:12 +01:00
H-M-H 42a68636b5 tweaked respawndelay a bit 2016-02-02 21:14:46 +01:00
H-M-H cb1c63c652 Merge pull request #410 from heinrich5991/pr_ddnet_join_vote_delay
Add sv_join_vote_delay
2016-01-29 12:58:05 +01:00
def 0a49428e21 Veto considers time on server not in current race 2016-01-27 02:14:46 +01:00
heinrich5991 90ba4c5986 Make join vote delay the default 2016-01-22 17:44:53 +01:00
heinrich5991 957844e234 Add comment about when sv_join_vote_delay doesn't apply 2016-01-21 00:09:11 +01:00
heinrich5991 384668928b Add sv_join_vote_delay
This is a new delay that specifies how many seconds you have to wait
before making your first vote. In case the server was only recently
filled (e.g. by a map change or if people start joining an empty
server), this delay is disabled (in the first case, because it's normal
to join after a map change, in the second case because you might have
joined the empty server to vote for a different map).
2016-01-19 23:52:28 +01:00
def 727ea434d4 Increase magic number a bit until we assume client is not DDNet 2015-08-07 03:26:50 +02:00
def b3592380d1 Re-enable broadcast for old DDNet client version 2015-07-04 14:12:49 +02:00
def 87ebb2f03e Defer character kill from thread to prevent race conditions 2014-12-07 03:42:43 +01:00
def 93d0f43a6a Broadcast about DDNet client delayed a bit (fixes #72) 2014-11-25 20:33:21 +01:00
east 630fd4fa07 sending vote options balanced 2014-10-26 19:39:42 +01:00
def 5cb861c331 Disable old client display for now since it's not working with dummy 2014-10-12 18:49:46 +02:00
def 3ff6b951c1 Configurable messages 2014-10-12 12:51:54 +02:00
def 517f1a80ea Add notification for old client 2014-10-12 12:49:44 +02:00
def fda12b88bf Make sv_client_suggestion optional 2014-10-12 11:35:36 +02:00
def 6333583141 Display message about DDNet client to players not using it 2014-10-12 11:33:36 +02:00
def 3804c16f02 Fix a bunch of crashes on server demo recording 2014-09-26 03:20:47 +02:00
def 741cf8f8c7 Cleanup & Halloween event 2014-09-18 12:14:00 +02:00
def 4473fd504b Indentation 2014-08-31 14:12:03 +02:00
def f1e4700ae8 Add a timeout protection message 2014-08-17 05:04:37 +02:00
def 2980bd77e8 Add /specteam 2014-08-09 19:53:38 +02:00
def f859f350ca Kind of working with timeout code 2014-08-09 17:25:29 +02:00
def 4af575654b Kind of working 2014-08-09 14:50:51 +02:00
def 145f0434f5 Add /save by the glorious HMH 2014-07-26 14:46:31 +02:00
def e69987cc93 Hopefully fix spectating 2014-06-22 15:16:34 +02:00
def 4c87cedd4d Better make sure that something exists before using it 2014-05-19 01:57:52 +02:00
def 7133545e1a Formatting 2014-04-18 14:50:15 +02:00
HMH 4a8011ced4 determine tunings to send with the players viewpos 2014-04-18 14:43:33 +02:00
def e6052ed411 add sv_pause_messages 2014-03-26 14:21:49 +01:00
HMH f2c8134bd2 send correct tunings to spectators 2014-03-23 17:10:49 +01:00
def 0e15c22639 More sensitive afk detection 2014-02-21 18:27:00 +01:00
def 17102bdf09 Still have to keep crashmeplx 2014-02-13 19:53:30 +01:00
def 4321e80c4d style 2014-02-12 13:28:07 +01:00
def 7804f9314d Hopefully fix a bunch of locked team bugs 2014-02-08 14:33:42 +01:00
def 823a04333a Add /showall 2014-02-02 19:56:10 +01:00
def 0be802c005 Fix: Even show correct team if there was a locked team before 2014-02-02 11:10:00 +01:00
def caa1f15d12 Fix possible crashes 2014-01-30 16:54:58 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def 6126ad50c4 Fix range of team related bugs by actually removing people from team when they spectate 2014-01-11 15:19:34 +01:00
def 2af9d9f423 Switchable ninjajetpack 2014-01-11 13:59:20 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def b6f8156e1f New fix for solo maps with switches 2013-12-28 16:27:47 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
2013-12-26 18:02:22 +01:00
def 70a0774453 Add /dnd 2013-12-22 18:30:13 +01:00
def 0b70f874dc Add sv_team 3 (forced random team for you, useful for solo ddrace) 2013-12-19 23:04:01 +01:00
def db1304b597 Fix Null Pointer bug 2013-11-16 02:36:04 +01:00
def eba45c4f0a Add /lock 2013-11-16 00:44:49 +01:00
def 295a1aaa50 Code cleanup 2013-11-14 16:26:25 +01:00
def 582562ed1e Remove useless code 2013-11-09 00:07:57 +01:00
def 1b49f5fab0 Keep solo after map change 2013-10-22 17:04:54 +02:00
def 34e568f41b Add converse command 2013-10-18 11:42:35 +02:00
def a2c7feda17 Add afk vote timer 2013-08-18 03:27:30 +02:00
def ccc777f792 Max 4 commands per second 2013-08-10 04:21:20 +02:00
oy ffa93a007c fixed a bug with spectating a player 2013-02-24 17:24:12 +01:00
Learath2 c55cae6492 Reduced length of new year event to 2 days. 2012-12-23 19:53:57 +02:00
eeeee 1c8c20c93e added sv_events 2012-12-23 19:47:47 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
2012-04-12 02:09:31 +02:00
Learath2 44d34b0033 Fixed paused players getting afk kicks. 2012-04-11 14:41:02 +02:00
Learath2 50b2d85abb Fixed according the comment of GreYFoX. 2012-02-14 22:38:06 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
SushiTee 1e602bf31b fixed showing player spawn effect only to players who should see 2012-02-05 14:48:09 +01:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00