GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: src/engine/shared/config.h src/engine/shared/config_variables.h src/game/client/gameclient.cpp src/game/server/entities/character.cpp src/game/server/gamecontext.cpp src/game/server/gamecontext.h		2011-01-24 14:06:55 +02:00
..
client	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-20 16:10:32 +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	added unmute + some minor fix	2011-01-20 22:27:54 +02:00
shared	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-24 14:06:55 +02:00
client.h	added an error popup on startup when the sound couldn't be initialised. Closes #425	2011-01-17 13:28:15 +01:00
config.h	Updated copyrights	2010-11-20 21:26:06 +01:00
console.h	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +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	made it possible to automatically take game over screenshots. Closes #339	2010-12-12 16:48:13 +01:00
input.h	added cleaner exit on quit event by Choupom	2010-12-11 22:04:50 +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	added some DDRace flags for the server browser (server-sided), client-sided still needed	2010-12-19 14:11:14 +01: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	added Storage function to move/rename files by Batchyx	2010-12-08 00:09:18 +01:00
textrender.h	Updated copyrights	2010-11-20 21:26:06 +01:00