4 commits

Author	SHA1	Message	Date
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
oy	0e36b772d4	fixed line endings in some files	2010-08-15 15:34:55 +02: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
Magnus Auvinen	72c06a2589	copied refactor to trunk	2010-05-29 07:25:38 +00:00