Commit graph

626 commits

Author SHA1 Message Date
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 82403b81f0 Added sv_vote_percentage
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 14:44:30 +03:00
GreYFoXGTi e061d84f20 Added Ability to Reconnect in the same place as your disconnect
Decided by sv_max_dc_restore

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 12:34:13 +03:00
GreYFoXGTi 6fbb61e985 forgot to change those strings
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 05:05:14 +03:00
Speedy Consoles 23c40f82c2 reordered server settings 2010-09-17 03:56:34 +02:00
Speedy Consoles 99e6ebc33a reworked server setting descriptions 2010-09-17 02:40:53 +02:00
GreYFoXGTi f4123cbf06 Removed sv_spamprotection and replaced it with more specific commands
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:38:39 +03:00
GreYFoXGTi cf1d6d5785 Added sv_info_change_delay
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:26:17 +03:00
GreYFoXGTi 3a968c45f6 changed sv_rcon_password_admin to sv_admin_pass...etc
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:20:58 +03:00
GreYFoXGTi 545171fe91 Added variable sv_emoticon_delay, Closes #37.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 23:20:16 +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 8e066517ad Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 05:57:34 +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 fe9e3f47a8 fixed last commit 2010-09-12 16:56:13 +02:00
Choupom 006fd711b4 made versions system for demos 2010-09-12 16:40:39 +02: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
btd 81beda6260 Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2010-09-12 00:57:44 +04:00
GreYFoXGTi 97d1acd89a revert for a fix (sendto) implemented in commits:
Commit:7f42b6225be9d0cc107f838695ba19de0e1b53d8
Commit:9c052398f4e4b185da6a59c25e678711af804d92
which is not needed in trunk tw
2010-09-11 18:10:46 +02:00
btd 7ed685ee11 Merge 2010-09-11 13:42:35 +04:00
GreYFoXGTi 4984d1b64b fixed some mistakes, Closes #23.
finished some todos.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 20:52:17 +02:00
GreYFoXGTi ddb4c2e370 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/DDRace.h
	src/engine/shared/config_variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-08 22:22:08 +02:00
btd fec294caee Fix linux compilation. Revert last changes. Add /show_other option (in menu now working) 2010-09-08 20:22:11 +04:00
GreYFoXGTi d1b3e01892 Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-07 21:49:12 +02:00
ghost 3baf522330 added the option to hide the console window on the client, too. Fixes #48 2010-09-07 19:32:33 +02:00
ghost 56c4081da4 Demo name is now showed while playing a demo file 2010-09-07 19:12:11 +02:00
GreYFoXGTi 9dda4a5a81 merging conflict mistake
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 08:09:35 +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 1fe93f4592 Reworked the Crazy Shotgun, and fixed a bug ( still needs testing )
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:47: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 15576f123a Something i forgot to do while merging from Oy
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
GreYFoXGTi 290c453a83 Removed useless config variables
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:45:35 +02:00
GreYFoXGTi ebb5636fa3 /pause no longer pauses you time by default
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:42:42 +02:00
Choupom fcfaa8389f added Remove button in demos browser (#66) 2010-09-05 17:40:51 +02:00
oy 2800832e12 add maps from maps folder to the demo as well and prevent that 0.5 demo players read the new demos 2010-09-05 17:39:55 +02:00
Choupom 0198e51fa3 made demo readable for custom map that user doesn't have (#5) 2010-09-05 16:34:39 +02:00
Choupom 3dd1ea0d8f fixed header and swap sizes in datafiles (may fixes #14) 2010-09-05 14:30:44 +02:00
Choupom 885d695f92 show map name without his folder in server info 2010-09-05 14:11:56 +02:00
oy 18632b7f5f fixed last commit 2010-09-05 14:09:55 +02:00