GreYFoXGTi 40d2068c70 Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: src/game/editor/ed_editor.cpp src/game/editor/ed_editor.h src/game/editor/ed_layer_tiles.cpp src/game/server/gamecontroller.cpp src/game/server/player.cpp src/game/variables.h		2010-10-10 14:36:02 +02:00
..
client	Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup	2010-10-07 15:33:48 +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	Server dislike this map, but dont crash. Closes #12	2010-10-09 00:08:34 +04:00
shared	Merge branch 'master' of http://github.com/oy/teeworlds	2010-10-10 14:36:02 +02:00
client.h	added mod system. Closes #34	2010-10-06 23:07:35 +02:00
config.h	restore empty strings in the config to their defaults on startup	2010-08-11 00:31:42 +02:00
console.h	added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8	2010-08-25 01:17:02 +02:00
demo.h	added info in the demo browser by Choupom	2010-10-09 13:27:21 +02:00
editor.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
graphics.h	added mod system. Closes #34	2010-10-06 23:07:35 +02:00
input.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
kernel.h	Total Cleanup	2010-09-30 23:28:06 +03:00
keys.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
map.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
masterserver.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
message.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
server.h	Merge branch 'master' of http://github.com/oy/teeworlds	2010-10-10 14:36:02 +02:00
serverbrowser.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
sound.h	copied refactor to trunk	2010-05-29 07:25:38 +00:00
storage.h	added mod system. Closes #34	2010-10-06 23:07:35 +02:00
textrender.h	added fixes for compiler errors and warnings by sworddragon	2010-08-24 23:44:33 +02:00