ddnet/src/game/editor
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
..
ed_editor.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-10 14:36:02 +02:00
ed_editor.h Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-10 14:36:02 +02:00
ed_io.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-08 13:37:38 +02:00
ed_layer_game.cpp copied refactor to trunk 2010-05-29 07:25:38 +00:00
ed_layer_quads.cpp 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
ed_layer_tiles.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-10 14:36:02 +02:00
ed_popups.cpp Added tele, speedup, front and switch layer to the client 2010-09-30 23:36:08 +02:00