GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 ... Conflicts: src/engine/console.h src/engine/server.h src/engine/server/server.cpp src/engine/shared/config_variables.h src/engine/shared/console.cpp src/engine/shared/console.h src/engine/shared/network_server.cpp src/game/client/components/console.cpp src/game/client/components/console.h src/game/client/components/menus_browser.cpp src/game/client/gameclient.cpp src/game/editor/editor.cpp src/game/editor/editor.h src/game/editor/io.cpp src/game/editor/layer_tiles.cpp src/game/editor/popups.cpp src/game/gamecore.cpp src/game/mapitems.h src/game/server/entities/character.cpp src/game/server/entities/laser.cpp src/game/server/gamecontext.cpp src/game/server/gamecontroller.cpp src/game/server/gamecontroller.h src/game/server/gamemodes/ctf.cpp src/game/server/player.cpp src/game/variables.h		2011-08-13 02:01:40 +02:00
..
background.png	merged editor over to trunk	2008-01-12 12:27:55 +00:00
checker.png	merged editor over to trunk	2008-01-12 12:27:55 +00:00
cursor.png	new cursor. thanks goes to primevil	2008-01-18 23:23:35 +00:00
desert_main.rules	added auto mapping feature by LordSkelethom	2011-07-09 01:09:06 +02:00
entities.png	New Entities from @Fisico, Discarded tele.png because it had missing tiles	2011-06-26 02:15:23 +02:00
entities_clear.png	Added a new entities_clear	2011-03-16 19:48:16 +02:00
front.png	New Entities from @Fisico, Discarded tele.png because it had missing tiles	2011-06-26 02:15:23 +02:00
grass_main.rules	added auto mapping feature by LordSkelethom	2011-07-09 01:09:06 +02:00
jungle_main.rules	added updated jungle_main rules by Landil	2011-07-13 23:09:19 +02:00
speed_arrow.png	Merging the client manually into the server	2010-08-25 17:31:49 +02:00
speedup.png	New Entities from @Fisico, Discarded tele.png because it had missing tiles	2011-06-26 02:15:23 +02:00
switch.png	enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable	2011-07-25 22:16:20 +02:00
tele.png	Adding a checkpoint system for teleporters :	2011-06-01 17:03:04 +02:00
winter_main.rules	added auto mapping feature by LordSkelethom	2011-07-09 01:09:06 +02:00