Commit graph

196 commits

Author SHA1 Message Date
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
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 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 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
btd bbd48810ad Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 19:20:39 +04: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