edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9529 commits 1 branch 429 tags 411 MiB
Commit graph

660 commits

Author SHA1 Message Date
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def 948197b598 Only wake up server once every second if noone is connected anyway 2014-01-15 16:52:22 +01:00
def 95431199ba Less CPU for versionsrv 2014-01-15 00:02:19 +01:00
def 333efc37b0 Update 64 player server infos 2014-01-14 20:40:29 +01:00
def 7b81946dd6 oops 2014-01-09 21:08:50 +01:00
def 9112f1e526 Fix stupid bug 2014-01-09 21:08:03 +01:00
def 52e83313c8 64 players in server browse 2014-01-08 06:15:56 +01:00
def fb520d3ed4 Change server name output 2014-01-01 23:36:53 +01:00
def 863990c1cc Serverinfo 2014-01-01 14:58:39 +01:00
def 1e947dbe52 Fix: Check whether file is actually a FIFO 2014-01-01 14:08:13 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +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 71e59546aa Longer ban for network stress 2013-11-23 20:19:30 +01:00
def f876701869 no thread remove 2013-08-08 02:10:47 +02:00
def cc52c74f6f Disable fifo console on non-Unix 2013-08-06 06:45:13 +02:00
def 1a8e713e45 Disable fifo console on non-Unix 2013-08-06 06:44:53 +02:00
def bd5fd4ec6e Prevent memory leaks 2013-08-06 05:14:53 +02:00
def 05d2cb8383 Reset traffic statistics 2013-08-04 18:09:28 +02:00
def 60865b7dbf More advanced netlimit 2013-08-04 17:50:12 +02:00
def edd742177f Fix: kb/s instead of b/s 2013-08-04 04:48:38 +02:00
def a5f974bbe9 More settings for netlimit 2013-08-04 04:37:15 +02:00
def 84e7bb5658 Merge branch 'netlimit' into DDRace 2013-08-04 04:32:44 +02:00
def b51cc77189 Add sv_netlimit 2013-08-04 04:32:04 +02:00
def 7b2578b517 Only record when we're actually recording 2013-08-04 04:24:21 +02:00
def 71ba923133 Move netlimit over to regular server 2013-08-04 04:24:03 +02:00
def 6169c78a79 Close memory leaks 2013-08-03 17:22:50 +02:00
def 8720186c75 Revert "Revert "Restrict rcon output (east)"" 
This reverts commit 35cf8832a9.
 2013-07-31 01:31:53 +02:00
def 35cf8832a9 Revert "Restrict rcon output (east)" 
This reverts commit ba5b98dd1d.
 2013-07-31 01:27:29 +02:00
def ba5b98dd1d Restrict rcon output (east) 2013-07-30 23:26:30 +02:00
def 764a73e997 Fix: Allow fifo to be created 2013-07-30 03:16:02 +02:00
def 5cd69f29ac Add Fifo console for easier automation 2013-07-29 21:03:59 +02:00
def 1cee48f6c1 Can only set sv_test_cmds at start, then it stays, and determines whether gametype is DDRace (no cheats) or TestDDRace (cheats) 2013-07-23 00:15:50 +02:00
oy 313a0949b0 make sure clients are authed for map downloads 2013-02-24 18:57:23 +01:00
Magnus Auvinen 98042012a6 cleaned up warnings that clang spits out. some bugs found with it. 
Conflicts:

	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
 2013-02-24 17:54:29 +01:00
oy 8ca7933653 Show user authlevel on status command. Closes #985 2013-02-24 17:46:05 +01:00
oy 865d0f7365 limit characters within player names to ascii range to prevent utf8 impersonating 2013-02-24 17:40:41 +01:00
oy 13d06e45ac fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940 2013-02-24 17:26:59 +01:00
oy ffd89938d7 fixed registering of ban commands. Closes #942 2013-02-24 17:26:30 +01:00
oy fa85cede53 reset rcon AuthTries on logout. Closes #941 2013-02-24 17:26:10 +01:00
heinrich5991 921f5f9239 fixed map downloading auth check 2013-02-16 14:37:53 +02:00
eeeee ee2647de41 turns out that Drop was needed after all :S 2012-12-23 20:10:31 +03:00
Learath2 3ececbd5f7 Fixes the last commit 2012-11-19 19:52:23 +02:00
Learath2 17140fc755 Added a config variable to control the map window.Closes #172 2012-11-14 20:34:23 +02:00
eeeee cae8c68d87 send ahead window for maps downloading. works with vanilla client. 2012-11-12 21:50:46 +02:00
oy 2a92f369fc fixed registering of ban commands. Closes #942 2012-07-04 16:54:09 +03:00
Ravomavain 52ba9eea04 remove other banmaster related code 2012-05-02 01:18:11 +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
XXLTomate dce5e8434b This fixes mute. Thanks to @heinrich5991 @Learath2 Mo2, the whole #DDRace and my dog. 2012-02-03 00:16:22 +01:00
fisted 00f580cb91 tell what port might be in use, if we cannot bind 2012-01-28 23:54:04 +01:00
XXLTomate f9e4547b31 fixing the console (2) 2012-01-28 11:14:31 +01:00
oy 4073520214 cleaned up content folder creation. Closes #845 2012-01-09 01:38:45 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy 29738552a6 made bindaddr config work for client and master too. Closes #909 2012-01-06 19:17:14 +01:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
 2012-01-01 00:11:56 +02:00
oy c975390195 made vote ban check if the ip matches an authed player 2011-12-31 12:11:48 +01:00
oy 8052ddf0ff fixed compiling 2011-12-30 19:35:57 +01:00
oy ec4bb94537 added logout command for econ 2011-12-30 19:12:31 +01:00
oy 1bb64d7534 fixed last commit 2011-12-30 00:07:17 +01:00
Learath2 81e6cf6f83 Added logout command. Closes #903 2011-12-29 23:53:07 +01:00
oy b44ee3d975 reworked ban system 2011-12-29 23:36:53 +01:00
oy 4c73eab869 fixed empty player names based on utf8 characters. Closes #904 2011-12-29 13:34:13 +01:00
eeeee 0c16a58563 enforce upper limit on minutes to prevent unix timestamp from overflowing 2011-12-14 13:47:49 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy 8e0ce38e29 fixed sv_max_client usage 2011-12-04 16:51:33 +01:00
Choupom b2a825652d added a command to unban all 2011-12-04 14:22:59 +01:00
GreYFoX b75a26eed9 Fixed the console 2011-08-26 20:03:30 +02:00
Ravomavain 47a1e2b230 Fix banmaster compilation. Fix some sign-compare warnings 2011-08-26 16:28:13 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
GreYFoX 5b27758650 Removed level stuff 
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
 2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
oy 435639636e Merge pull request #808 from SushiTee/master 
fixed a warning
 2011-08-03 13:53:18 -07:00
Shereef Marzouk c1b23535ff fixed typo 2011-08-02 12:14:23 +02:00
SushiTee 370b93d8e1 fixed a warning 2011-08-01 12:11:10 +02:00
oy 3209aec45f fixed compiling error on osx 2011-07-31 13:17:38 +02:00
oy 1705c90e14 fixed ban for life on the server 2011-07-31 12:43:35 +02:00
oy 9349af0085 clean up econ sockets on shutdown. Closes #804 2011-07-31 02:20:46 +02:00
oy 94bdd95957 added missing newlines at end of 2 files 2011-07-30 18:29:40 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy 0f11cf014c increased length for help string of temporary commands 2011-07-30 18:19:15 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
heinrich5991 b0fdc40959 deleted unnecessary empty files 2011-07-29 17:51:19 +02:00
heinrich5991 2ba6fbd731 added econ functionality 2011-07-29 17:51:14 +02:00
Choupom 6b2dc40570 fixed a rcon authentication issue 2011-07-20 21:49:38 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy f440944905 fixed problem with rcon authentication 2011-07-08 00:00:38 +02:00
oy e37d536fdf fixed some NETTYPE usage based on the socket state 2011-07-07 01:48:00 +02:00
oy 1ae474689d added moderator support for the remote console. #518 2011-07-05 21:54:10 +02:00
Romain Labolle 813f689957 Tune reset clean up (fix #50) 
* Removing old unused DDRaceTunesReset() function.
* Adding ResetTuning() function to reset tunes.
* Adding ResetTuning() and some settings reset (sv_hit/sv_endless_drag/sv_old_laser) to CGameContext::OnInit() which is loaded on each map load.
GreYFoX:
Repositioned the new Functions
 2011-06-01 16:43:20 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
Choupom 7f15b3ac57 fixed several stuffs 2011-05-03 19:25:11 +02:00
Choupom c2f75b0017 structs are structs, classes are classes 2011-05-03 19:23:33 +02:00
GreYFoX 0d61c87fa1 Added 0.6.0 banmaster by @heinrich5991 #31 2011-04-26 11:51:02 +02:00
GreYFoX 87dc38ee06 fixed hiding reserved slots from server browser by @heinrich5991 2011-04-20 17:04:34 +02:00
GreYFoX 768e6b9291 Added todo 2011-04-17 19:13:55 +02:00
oy 73bc6afb67 decreased the length of built in client names 2011-04-16 18:41:44 +02:00
GreYFoX a2e4e9c050 Fixed CServer::SetRconLevel 2011-04-15 05:19:11 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
 2011-04-14 01:27:49 +02:00
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts 
Added Icon by landil
alot more...
 2011-04-09 22:32:17 +02:00
oy 3fc6e2d2eb prevent empty nicknames. Closes #616 2011-04-06 17:53:05 +02:00
oy caf6e98ccb fixed server crash on "bans" command 2011-04-06 17:30:50 +02:00
oy 4ad6d2f01e fixed problem with sv_bindaddr on the server 2011-04-04 18:20:05 +02:00
oy 04a3b7be00 fixed problem with recorded demo files. Closes #570 2011-04-02 11:55:37 +02:00
heinrich5991 b6fa69cedb the server shows the disconnect reason of clients now 2011-04-01 00:05:35 +02:00
oy 2a72c0b38b added a mechanism to check for a valid standard map. Closes #132 2011-03-31 15:13:49 +02:00
oy 59d56cd332 finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233 2011-03-30 12:08:33 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
Sebastian Wojtowicz 500605cbee Server utf8 Conversion 2011-03-22 21:04:27 +02:00
oy 96808a1145 made it possible to just show the number of player slots of a server (instead of client ones). Closes #68 2011-03-20 15:33:49 +01:00
GreYFoX 45f3cf042a Fixed a login with cheats 
Renamed a constant
 2011-03-18 00:17:01 +02:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only 
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
 2011-03-16 16:27:30 +02:00
GreYFoX 16c074741f To have Cheats you must set a password and sv_register 0 
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
 2011-03-16 15:41:26 +02:00
GreYFoX cccfb09e32 Reverted Team to it's old state without leader or Strict until it's reworked 2011-03-16 15:14:25 +02:00
oy 7412fabb9c made serverinfo use clan name and country code for players 2011-03-16 12:37:41 +01:00
oy 30d9c9f4d9 made network support clan name and country code for players 2011-03-15 11:23:49 +01:00
oy 27e5a6af0d made clients sending startinfo a requirement to prevent empty player infos 2011-03-15 09:58:57 +01:00
oy 50b266086b made dbg_dumpmem and dbg_lognetwork work again 2011-03-05 11:46:24 +01:00
oy 0ae19e1339 removed support for old server infos 2011-03-04 18:14:08 +01:00
oy d9ce720387 made engine an interface 2011-02-27 15:03:57 +01:00
heinrich5991 3d0aab503f rewritten mutes 2011-02-23 23:45:31 +02:00
oy d939b84125 removed no longer needed progression browse info 2011-02-16 12:31:47 +01:00
oy b63dbfede5 fixed problems with map downloading if the map changes during download. Closes #236 2011-02-16 12:07:54 +01:00
GreYFoXGTi 604ae5286f Several Fixes and some more on the way 2011-02-14 23:34:46 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 09068d91a4 Compiler warnings 2011-02-08 18:58:36 +02:00
GreYFoXGTi 750b20f544 fixed banmaster.cfg run level 2011-02-07 08:53:41 +02:00
GreYFoXGTi d7e4153ec4 Added banmaster by heinrich5991 2011-02-07 08:25:38 +02:00
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +02:00
GreYFoXGTi 9db333dfee Re-enabled flag sending 2011-02-05 03:14:17 +02:00
GreYFoXGTi e32b52b57a don't send the DDRace flags until i change them to their final look 2011-02-01 00:45:25 +02:00
GreYFoXGTi f1b002e7fa DDRace flags for the server browser (client-sided). 
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
 2011-01-30 18:21:41 +02:00
Floff Floffsson 8c32c01653 added unmute + some minor fix 2011-01-20 22:27:54 +02:00
GreYFoXGTi 9891ab8a10 Added timer to reduce join-spam when loading a new map by Floff aka LemonFace 
removed an extra line
 2011-01-20 22:25:09 +02:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-01-20 16:10:32 +02:00
oy 7a20c313ee made some output just show up on debug 2011-01-19 15:39:04 +01:00
Floff Floffsson e0c02eb691 functioncall not needed, dunno why its there anyway 2011-01-17 14:59:21 +01:00
Floff Floffsson 3e530ac02d SetClientAuthed() moved 2011-01-17 14:59:12 +01:00
oy 40f6740742 fixed few spelling mistakes and disabled an unused command 2011-01-17 12:56:49 +01:00
GreYFoXGTi b502e6fd28 Fixed warnings and some white spaces 2011-01-12 11:10:57 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 5e841fcfae Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-12-19 15:22:31 +02:00
heinrich5991 bf62514088 added some DDRace flags for the server browser (server-sided), client-sided still needed 2010-12-19 14:11:14 +01:00
GreYFoXGTi 63961ecf1a fixed mute evasion + kick 2010-12-19 07:25:01 +02:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-12-16 06:06:23 +02:00
oy 0121f27311 fixed server crash on too many snap items. Closes #317 2010-12-16 03:29:08 +01:00
GreYFoXGTi 157aafd4dd Merge branch 'master' into DDRace 
Conflicts:
	src/engine/server/server.cpp
	src/game/variables.h
 2010-12-11 23:57:41 +02:00
Choupom cdd8184f89 fixed "Kicked by console (Kicked by vote)" drop message 2010-12-11 21:57:34 +01:00
GreYFoXGTi 4510ced422 Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace 2010-12-10 21:20:34 +02:00
GreYFoXGTi 2c51511260 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
 2010-12-10 20:58:53 +02:00
oy db9dd6b8c9 added an optional time stamp to a demo record by Batchyx 2010-12-08 00:42:32 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi 122c7954d9 Announcement Randomness 2010-12-06 04:27:35 +02:00
GreYFoXGTi 881fd901a6 added Vote comments starting with # and also made announcement comments start with # 2010-12-06 00:38:29 +02:00
GreYFoXGTi 326c46551c Resseted sv_old_laser to 0 2010-12-02 01:16:09 +02:00
GreYFoXGTi b22f6e0036 Added Announcement Comments 2010-11-29 06:21:04 +02:00
heinrich5991 73ca31d168 changed rcon command "cmdlist" nearly completly 2010-11-24 22:09:31 +01:00
GreYFoXGTi eed83bd7cb Added Announcement 2010-11-22 13:00:43 +02:00
GreYFoXGTi 2ad456433d Made File Execution Level 3, but level 4 only for autoexec.cfg at server start 
Removed TODO, because it's needed there to reset tunings on map change
 2010-11-22 10:27:13 +02:00
GreYFoXGTi bdd3af9f43 Applied CMDList Pages 2010-11-22 09:55:50 +02:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
 2010-11-22 00:26:00 +02:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi 6a40aea054 Revert "added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit." 
This reverts commit 9f8cf21c33.

Conflicts:

	src/engine/shared/config_variables.h
this commit was replaced by "clients are now dropped if they don't act as normal clients (4383e10 4383e10933)"
 2010-11-18 01:32:54 +02:00
heinrich5991 89ef2a0928 fixed CServer::ConKick because of the new victim system, fixed the victim system for cases with at least one parameter after the victim 2010-11-15 18:58:44 +01:00
heinrich5991 051172838b fixed commit with the fix of cmdlist 2010-11-12 17:56:31 +01:00
heinrich5991 c54b824a45 fixed 'cmdlist' rcon command for joining clients 2010-11-11 23:22:09 +01:00
heinrich5991 c36eb3d359 fixed a bug with "me" as victim, fixed kick function due to new victim system 2010-11-10 23:24:33 +01:00
heinrich5991 470e2773ba added system to generalize rcon commands 2010-11-07 17:08:09 +01:00
heinrich5991 6f35687e03 added system to generalize rcon commands 2010-11-07 16:29:55 +01:00
GreYFoXGTi 6dc504b995 Fixed VoteKick 2010-10-31 05:35:01 +02:00
fisted 9f8cf21c33 added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit. 2010-10-25 20:00:16 +02:00
GreYFoXGTi 4197a6ce8b Re-enabled pure tuning check, reset tunings to vanilla values, made server apply DDRace tunings on startup and map change. Closes #97. 
Revert "Now can Join Vanilla servers. Closes #96."

This reverts commit c6fda43369.

Conflicts:

	src/game/client/components/menus_settings.cpp
 2010-10-22 15:22:17 +02:00
GreYFoXGTi 6d1ec0dd62 set m_Authed on map change Closed #93. 
initialized m_Addr because i seem to have forgotten
 2010-10-19 01:36:04 +02:00
heinrich5991 4d6370d890 fixed last commit, removed debug messages 2010-10-18 20:52:29 +02:00
heinrich5991 5ab6286508 removed no longer needed else for logging, authentification with no password does not result in a ban anymore 2010-10-18 20:52:28 +02:00
heinrich5991 5c5b744490 fixed spell mistake 2010-10-18 20:52:28 +02:00
GreYFoXGTi 17408123f5 Some bug fixes 2010-10-18 20:46:00 +02:00
GreYFoXGTi fd9ad2e720 Re-Added kick/ban by lower level Protection 2010-10-17 21:45:45 +02:00
GreYFoXGTi 4ff5cd8707 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-17 12:14:40 +02:00
GreYFoXGTi caec5ada0f should fix linux compilation as reported by Mo(2) thanks Mo(2) 2010-10-16 22:28:54 +02:00
heinrich5991 de0f558ad4 send "server is full" to clients trying to join reserved slots 2010-10-16 22:16:16 +02:00
GreYFoXGTi 7f437f7245 Merge branch 'master' of http://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
 2010-10-16 22:02:34 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
 2010-10-16 21:59:59 +02:00
heinrich5991 0cd8390036 Revert "better spam protection. Closes #82. Feedback Please" 
This reverts commit daac101024.
 2010-10-14 08:42:29 +02:00
heinrich5991 d5755f8ad2 dont count reserved slots on the server for the client browser 2010-10-14 00:41:37 +02:00
heinrich5991 dc22007c24 fixed crash on dbg_msg on unauthed client trying rcon, fixed infinite loop (same event) 2010-10-14 00:35:54 +02:00
oy fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
GreYFoXGTi daac101024 better spam protection. Closes #82. Feedback Please 2010-10-12 16:13:56 +02:00
GreYFoXGTi a1935036d5 fixed my last commit 2010-10-12 09:35:09 +02:00
GreYFoXGTi 84ff10ca48 Changed rcon system a bit like the old one 2010-10-12 09:31:47 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
 2010-10-11 03:56:58 +02:00
GreYFoXGTi ed3299be05 more cleanup 2010-10-11 03:50:43 +02:00
GreYFoXGTi 040ba467bf Changed The lowest level to -1 ( has chat but no rcon ) 
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
 2010-10-11 02:39:08 +02:00
oy b65a26fe93 fixed last commits 2010-10-11 01:06:44 +02:00
GreYFoXGTi 332fb1de09 chat commands redirect to rcon and vice versa by heinrich5991 2010-10-11 00:40:07 +02:00
Choupom 7aefbca742 made so we can add the reason for a kick/ban (fixes #123) 2010-10-11 00:31:14 +02:00
GreYFoXGTi ac3ce7589a linux compilation... 2010-10-10 16:19:10 +02:00
GreYFoXGTi ef139eb73a Cleanup (Putting stuff back vanilla like) 2010-10-10 16:11:11 +02:00
btd 9de4dad6ac Server dislike this map, but dont crash. Closes #12 2010-10-09 00:08:34 +04:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi 1a5b3f5a24 Ninja sound was commented... i don't know why 
Fixed last commit
 2010-09-29 23:54:02 +03:00
GreYFoXGTi 65830a463d Fixed unsafe check for the client ID being kicked 
fixed Super Team collision with doors

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-29 23:24:28 +03:00
GreYFoXGTi 526e36f8a0 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/client/components/menus.h
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/variables.h
 2010-09-27 06:32:14 +03:00
oy 4e608965ef use a different name for connecting clients. Closes #192 2010-09-25 20:24:11 +02:00
GreYFoXGTi f4082adf50 Fixed rcon auth tries check 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 19:13:21 +03:00
GreYFoXGTi f53559dd7c Ban is always by seconds in DDRace 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 13:27:39 +03:00
GreYFoXGTi 8ad54666a9 Fix rcon auth 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 13:05:28 +03:00
GreYFoXGTi 2ba462158d Removed custom stuff that are now in vanilla tw by defaults 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-19 21:47:25 +03:00
GreYFoXGTi 67a5765c9f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/components/camera.cpp
	src/game/client/components/camera.h
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_layer_tiles.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-19 21:27:40 +03:00
oy 35e9c76940 fixed empty names of joining players in the server browser. Closes #176 2010-09-19 16:25:57 +02:00
GreYFoXGTi 4a1ad3a701 Removed Duplicate Print 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 17:42:38 +03:00
GreYFoXGTi 21b3bd89d4 oops invalid client xD 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 17:40:11 +03:00
GreYFoXGTi f657cb05a5 Enhanced Console Prints and dbg_msgs 2010-09-17 17:37:03 +03:00
GreYFoXGTi 1eb4441d14 Removed auth and added logout, helper, moder and admin 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 17:23:07 +03:00
GreYFoXGTi b73ce9b42f Implemented auth id 0 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 16:47:31 +03:00
GreYFoXGTi 6fbb61e985 forgot to change those strings 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 05:05:14 +03:00
oy 7714454829 added maximum number of tries for rcon authentication 2010-09-16 13:06:11 +02:00
GreYFoXGTi 60952805ae typo 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 18:43:17 +03:00
GreYFoXGTi 695d353d42 Fixed banning an admin with ip 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 18:39:26 +03:00
GreYFoXGTi fa379a806a Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
 2010-09-13 07:49:01 +03:00
oy 0c1261620f prevent self kick/ban in the console. Closes #50 
and fixed line endings
 2010-09-12 13:52:25 +02:00
oy d913af1ab2 renamed demorec files to demo 2010-09-12 12:16:51 +02:00
oy abf74f47f7 fixed wrong output in the ban command and added feedback to the kick command 2010-09-12 12:07:10 +02:00
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master 
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:57:38 +02:00
GreYFoXGTi db3a97c771 Small Mistake. Closes #19 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:36 +02:00
GreYFoXGTi 91d65a5e69 Added /kill 
but i couldn't make the clients have a suicide penalty for some trivial reason since i am ill.. -.-"

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 06:45:35 +02:00
Choupom 885d695f92 show map name without his folder in server info 2010-09-05 14:11:56 +02:00
btd 525e72b1dd Forgot to delete this 2010-08-25 18:39:18 +04:00
GreYFoXGTi e37992ae56 fixes after cherry picking 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-25 15:24:31 +02:00
oy 41afca6db2 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-25 01:17:02 +02:00
GreYFoXGTi 7ff7ca85ec sometimes my git just wants to commit a file no matter how many times i revert it 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 23:38:40 +02:00
GreYFoXGTi 51c6af1303 SvShotgunBulletSound 
also added protection to shotgun stucks, needs to be tested when a random crazy shotgun bullet gets stuck
loaded the score file before saving to avoid corruption
added freeze and unfreeze in rcon
added protection in some rcon commands

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 23:40:23 +02:00
GreYFoXGTi c4d60e93ba NOt needed as you can bind your own emote now 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 21:32:41 +02:00
GreYFoXGTi 999e8590e7 Fixed Ban --->All<--- System Issues 
Also it's not possible do hide the Ban message by setting the reason trying to connect too soon from rcon

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 18:06:20 +02:00
GreYFoXGTi 5a2af8f3ff re worked timer commands fixes issue #11 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 05:19:47 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
GreYFoXGTi 01cc3f4d68 Merge branch 'master' of http://github.com/oy/teeworlds 
and fixed Conflicts:
	src/engine/server/register.h
	src/game/server/gamemodes/mod.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-15 20:46:02 +03:00
btd bbd48810ad Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 19:20:39 +04:00
oy 0e36b772d4 fixed line endings in some files 2010-08-15 15:34:55 +02:00
oy d9a3cc032f updated refactor script and fixed a thing 2010-08-12 19:03:03 +02:00
oy 54f804eda2 fixed bug in servers setclientname 2010-08-12 16:12:25 +02:00
oy 7503c64237 made unpacking of net strings more strict - prevents possible malformed output 2010-08-12 15:22:07 +02:00
oy 1cde96ef79 restore empty strings in the config to their defaults on startup 2010-08-11 00:31:42 +02:00
GreYFoXGTi 60b5acbb15 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/engine/shared/storage.cpp
	src/game/server/gamecontext.cpp
Alterations:
	src/engine/shared/console.h  | made StoreCommands(,)take also the client id
	src/engine/console.h  | made StoreCommands(,)take also the client id

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-09 17:54:42 +03:00
btd 227c03cbb1 Fix mistake 2010-08-07 22:49:57 +04:00
oy 0a66e0586d fixed a small bug in the ban command 2010-08-07 20:31:36 +02:00
oy ad9b32b741 added the possibility to store commands within the console and execute them later on when everything is initialised correctly - fixes several possible startup crashes and the "Support bans in server configuration"-ticket 2010-08-07 20:22:25 +02:00
btd 84cf23203d Revert storage.h 2010-08-07 12:02:58 +04:00
oy 49cefa406b added lost logfile feature 2010-08-06 20:38:13 +02:00
oy 665205327d added lost datadir override feature 2010-08-05 20:26:03 +02:00
btd 7f65d880f3 Fix external records 2010-07-31 15:04:19 +04:00
btd 37b0f43d1c Fix strange 0 pointer bug. (very strange bug) 2010-07-31 00:16:36 +04:00
btd c280e5c5b4 Fix ban 2010-07-30 21:20:58 +04:00
btd 9c052398f4 Last changes added. All fixed. Server builded. 
Need many test before release.

Signed-off-by: btd <bardadymchik@gmail.com>
 2010-07-30 16:50:09 +04:00
btd 7f42b6225b To the last DDRace. Need a lot fix 2010-07-29 23:55:33 +04:00
GreYFoXGTi 0a9dc07d0c Fixes Issue #5 
Changed /info
Fixed anti-rainbowmod

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 17:54:04 +03:00
GreYFoXGTi a8d1c536af re-enabled the DDRace ip count check, then found it's useless tw trunk has it's own 
fixed ip 0.0.0.0 showing for the rest of the notifications in server.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 13:09:25 +03:00
GreYFoXGTi 7b5df1e1d3 Fixed Client authentication with blank password 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 12:15:55 +03:00
GreYFoXGTi 434b4aad86 The Porting of DDRace-Beta to trunk by [BlackTee] den Maps with one and two layer works properly. Laser works. Fix second game layer Re-added logs Readded the rcon commands addvote and scoring system and time Fixed Weapons 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-07-29 08:59:32 +03:00
oy 9130c91841 fixed entering a private server on a map change without password. Closes #142 2010-06-26 17:59:59 +02:00
oy ea64b0d7b3 made the console use the flagmask when looking for command (FindCommand) and removed double "No such command" console message 2010-06-18 20:32:52 +02:00
oy a5bc567e84 fixed a server register issue 2010-06-13 19:34:14 +02:00
xalduin dc3feaf42c Fixed remaining compiler warnings for gcc on Linux 2010-06-10 20:38:03 +08:00
xalduin be5e19d2bd Fixed some compiler warnings 2010-06-09 20:41:00 +08:00
oy 1c041c44a4 made unban command work with the banlist index. Closes #102 2010-06-07 14:12:06 +02:00
oy 2104835d77 update server info for connected clients if map or gametype changes. Closes #108 2010-06-07 13:34:47 +02:00
Choupom 747d972d38 fixed so we can run a map which is in a folder 2010-06-05 10:44:50 +02:00
SushiTee 0115161463 mergend stuff 2010-06-03 15:21:12 +02:00
oy 5988b9d388 - show connecting players with rcon status command 
- make it possible to limit the number of clients with the same ip that can connect to the server
 2010-06-03 14:48:32 +02:00
SushiTee c37335b115 shortened IsAuthed a bit 2010-06-02 21:33:19 +02:00
NoxNebula dd19074deb Admin-Kick-Protection 
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
 2010-06-03 03:27:34 +08:00
NoxNebula 9a5a19e7c7 Admin-Kick-Protection 
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
 2010-06-02 09:40:08 +02:00
Thomas 361380d630 *some esthetic changes 
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
 2010-05-30 12:01:11 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen feade98dae fixed so server stops recording when changing map 2009-06-15 13:04:34 +00:00
Magnus Auvinen 4bb1df3189 moved 0.5 branch to trunk 2009-05-31 09:44:20 +00:00
Magnus Auvinen 5f186c8906 fixed so the console show help for each command. not all commands have descriptions however 2009-01-24 13:12:04 +00:00
Magnus Auvinen 9d51d47cea added tab completion to the console. works for local and remote 2009-01-24 12:16:02 +00:00
Magnus Auvinen 30695c09a8 increased the number of snapshots the server will hold from 1 second to 3 2009-01-21 00:01:49 +00:00
Magnus Auvinen c491d1c537 fixed perma banning and that input timing shouldn't be vital packets 2009-01-13 18:24:42 +00:00
Alfred Eriksson 39a12060d6 removed the tuning filtering and warning. modded servers can use tuning for free. added pure server checking - ctf, dm and tdm gametypes are not allowed to have different tuning. 2009-01-11 10:40:14 +00:00
Magnus Auvinen 599708824f removed input timing from the snapshot messages and put them in a separate message so we don't loose them if the input were late 2009-01-10 10:49:17 +00:00
Magnus Auvinen b42eb55794 finished the ban support 2009-01-10 10:27:25 +00:00
Magnus Auvinen e27e2d8b2a fixed server side demo recording and some possible crashes with incorrect demos 2008-11-16 13:58:27 +00:00
Alfred Eriksson 1d3971f217 forgot some code 2008-11-11 17:24:39 +00:00
Alfred Eriksson 66bd7b81d9 fixed server side demo recording filename 2008-11-11 17:22:22 +00:00
Jack Coulter 2d065c3fdf Fixed mispelling in the error given when the server port isn't forwarded 2008-10-21 18:15:21 +00:00
Magnus Auvinen 9acb3e5e71 continued on ban support. cleaned up settings a bit. reworked the datadir autodetection. introduced engine_openfile, engine_getpath and engine_listdir. never use fs_listdir or io_open directly 2008-10-21 18:05:06 +00:00
Magnus Auvinen 164d9c637d improved network logging 2008-10-19 17:21:04 +00:00
Magnus Auvinen a91fecae92 fixed fetching of server info and corrected some spelling errors 2008-10-17 21:16:23 +00:00
Dominik Geyer 70d7cb773c added ip to (dis)connect debug messages 2008-10-17 14:27:23 +00:00
Magnus Auvinen 4484948a6d updated the demo recorder 2008-10-14 12:11:42 +00:00
Magnus Auvinen b39e58ce26 fixed ticket #486: Rcon doesn't work after map change 2008-10-08 18:24:27 +00:00
Magnus Auvinen 12472ef7f4 major update. continued on ban support. added demo recording (client and server side). added demo player. added demo menu. demos have some quirks and file size optimizations havn't been done yet. some interface tweaks 2008-10-06 18:05:01 +00:00
Dominik Geyer faa96f6d3a show if servers use non-standard tuning and let serverbrowser filter for these; ticket #393 2008-10-05 09:57:46 +00:00