GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: src/engine/shared/console.cpp src/game/client/components/hud.cpp src/game/client/components/scoreboard.cpp src/game/server/entities/character.cpp src/game/server/entities/projectile.cpp		2011-01-12 11:08:17 +02:00
..
client.cpp	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-12 11:08:17 +02:00
client.h	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-04 22:37:09 +02:00
graphics.cpp	show error message for all content that could not be loaded. Closes #257	2011-01-06 22:18:19 +01:00
graphics.h	made it possible to automatically take game over screenshots. Closes #339	2010-12-12 16:48:13 +01:00
input.cpp	added cleaner exit on quit event by Choupom	2010-12-11 22:04:50 +01:00
input.h	added cleaner exit on quit event by Choupom	2010-12-11 22:04:50 +01:00
keynames.h	Updated copyrights	2010-11-20 21:26:06 +01:00
sound.cpp	show error message for all content that could not be loaded. Closes #257	2011-01-06 22:18:19 +01:00
sound.h	Updated copyrights	2010-11-20 21:26:06 +01:00
srvbrowse.cpp	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +02:00
srvbrowse.h	Updated copyrights	2010-11-20 21:26:06 +01:00
text.cpp	fixed cut off broadcast. Closes #398	2011-01-09 23:25:07 +01:00