edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 10:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
ddnet/src/engine
History
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
..
client made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
docs updated the demo recorder 2008-10-14 12:11:42 +00:00
external Merging the client manually into the server 2010-08-25 17:31:49 +02:00
server made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
shared made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
client.h Updated copyrights 2010-11-20 21:26:06 +01:00
config.h Updated copyrights 2010-11-20 21:26:06 +01:00
console.h made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
demo.h Updated copyrights 2010-11-20 21:26:06 +01:00
editor.h Updated copyrights 2010-11-20 21:26:06 +01:00
graphics.h Updated copyrights 2010-11-20 21:26:06 +01:00
input.h Updated copyrights 2010-11-20 21:26:06 +01:00
kernel.h Updated copyrights 2010-11-20 21:26:06 +01:00
keys.h Updated copyrights 2010-11-20 21:26:06 +01:00
map.h Updated copyrights 2010-11-20 21:26:06 +01:00
masterserver.h Updated copyrights 2010-11-20 21:26:06 +01:00
message.h Updated copyrights 2010-11-20 21:26:06 +01:00
server.h made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
serverbrowser.h Updated copyrights 2010-11-20 21:26:06 +01:00
sound.h Updated copyrights 2010-11-20 21:26:06 +01:00
storage.h Updated copyrights 2010-11-20 21:26:06 +01:00
textrender.h Updated copyrights 2010-11-20 21:26:06 +01:00