GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD ... Conflicts: bam.lua src/engine/console.h src/engine/server.h src/engine/server/server.cpp src/engine/shared/config.h src/engine/shared/config_variables.h src/engine/shared/console.cpp src/engine/shared/console.h src/game/client/components/binds.cpp src/game/client/components/chat.h src/game/client/components/console.cpp src/game/client/components/console.h src/game/client/components/controls.cpp src/game/client/components/emoticon.h src/game/client/components/maplayers.cpp src/game/client/components/menus.h src/game/client/components/scoreboard.h src/game/client/components/spectator.h src/game/client/components/voting.h src/game/client/gameclient.cpp src/game/client/gameclient.h src/game/client/render.h src/game/collision.cpp src/game/editor/ed_layer_tiles.cpp src/game/gamecore.cpp src/game/gamecore.h src/game/layers.cpp src/game/layers.h src/game/mapitems.h src/game/server/entities/character.cpp src/game/server/entities/laser.cpp src/game/server/entities/laser.h src/game/server/entities/pickup.cpp src/game/server/entities/pickup.h src/game/server/entities/projectile.cpp src/game/server/gamecontext.cpp src/game/server/gamecontroller.cpp src/game/server/gamecontroller.h src/game/server/gameworld.cpp src/game/server/gameworld.h src/game/server/player.cpp src/game/variables.h		2011-04-14 01:27:49 +02:00
..
ctf.cpp	Merge branch 'master' of git://github.com/oy/teeworlds into HEAD	2011-04-14 01:27:49 +02:00
ctf.h	Merge branch 'master' of git://github.com/oy/teeworlds into HEAD	2011-04-14 01:27:49 +02:00
DDRace.cpp	Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank	2011-02-15 02:27:19 +02:00
DDRace.h	Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank	2011-02-15 02:27:19 +02:00
dm.cpp	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +02:00
dm.h	Merged Oy, Isolated Freeze from Deep Freeze	2011-02-13 19:32:06 +02:00
gamemode.h	If you Edit the Source Don't use the game mode DDRace	2011-02-08 18:35:48 +02:00
gamemode.h.official	If you Edit the Source Don't use the game mode DDRace	2011-02-08 18:35:48 +02:00
mod.cpp	Merge branch 'master' of git://github.com/oy/teeworlds into HEAD	2011-04-14 01:27:49 +02:00
mod.h	Merged Oy, Isolated Freeze from Deep Freeze	2011-02-13 19:32:06 +02:00
tdm.cpp	Merge branch 'master' of git://github.com/oy/teeworlds into HEAD	2011-04-14 01:27:49 +02:00
tdm.h	Merge branch 'master' of git://github.com/oy/teeworlds into HEAD	2011-04-14 01:27:49 +02:00