Commit graph

147 commits

Author SHA1 Message Date
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
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