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
|
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 |
|
|
GreYFoXGTi
|
ef139eb73a
|
Cleanup (Putting stuff back vanilla like)
|
2010-10-10 16:11:11 +02:00 |
|
|
GreYFoXGTi
|
40d2068c70
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/editor/ed_layer_tiles.cpp
src/game/server/gamecontroller.cpp
src/game/server/player.cpp
src/game/variables.h
|
2010-10-10 14:36:02 +02:00 |
|
oy
|
cd95f1869e
|
added inactive player kicking. Closes #51
|
2010-10-09 19:14:42 +02:00 |
|
btd
|
227c03cbb1
|
Fix mistake
|
2010-08-07 22:49:57 +04: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 |
|
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 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|