ddnet/src/game/server/gamemodes
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
2013-12-26 18:02:22 +01:00
..
ctf.cpp Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 2013-12-26 18:02:22 +01:00
ctf.h Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-13 02:01:40 +02:00
DDRace.cpp Change name to DDRaceNetwork 2013-07-31 19:08:07 +02:00
DDRace.h Increasing the Readability on primitive editors of DDRace Specific files (All files that does not exist in oy/teeworlds) 2011-12-25 15:51:47 +02:00
dm.cpp Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-13 02:01:40 +02:00
dm.h Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
gamemode.h DDRaceNetwork -> DDraceNetwork 2013-08-13 18:32:33 +02:00
mod.cpp Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-13 02:01:40 +02:00
mod.h Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
tdm.cpp Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 2013-12-26 18:02:22 +01:00
tdm.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00