def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace ... Conflicts: bam.lua data/languages/index.txt src/engine/server/server.cpp src/engine/shared/network_server.cpp src/game/client/components/chat.cpp src/game/client/components/menus_settings.cpp src/game/server/entities/character.cpp src/game/server/gamecontext.cpp src/game/version.h		2013-12-26 18:02:22 +01:00
..
client	Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace	2013-12-26 18:02:22 +01:00
editor	Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace	2013-12-26 18:02:22 +01:00
server	Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace	2013-12-26 18:02:22 +01:00
collision.cpp	New mapping entity: Specify number of jumps	2013-08-24 01:03:45 +02:00
collision.h	New teleport entities	2013-08-13 04:59:25 +02:00
ddracecommands.h	Add support to teleport others, not just yourself	2013-07-29 21:25:10 +02:00
gamecore.cpp	TeleOuts as pointer; Hopefully fixes Visual Studio crash	2013-12-12 14:35:01 +01:00
gamecore.h	TeleOuts as pointer; Hopefully fixes Visual Studio crash	2013-12-12 14:35:01 +01:00
layers.cpp	Version 1.091a	2011-08-31 12:10:15 +02:00
layers.h	Version 1.091a	2011-08-31 12:10:15 +02:00
localization.cpp	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
localization.h	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
mapitems.h	Add jetpack tile	2013-11-22 15:10:55 +01:00
teamscore.cpp	Increasing the Readability on primitive editors of DDRace Specific files (All files that does not exist in oy/teeworlds)	2011-12-25 15:51:47 +02:00
teamscore.h	Add sv_team 3 (forced random team for you, useful for solo ddrace)	2013-12-19 23:04:01 +01:00
tuning.h	Fix: Don't change tune parameters	2013-12-23 20:33:01 +01:00
variables.h	Add: Set Ping to any value you want	2013-12-18 16:54:20 +01:00
version.h	Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace	2013-12-26 18:02:22 +01:00
voting.h	Fix: team 0 doesn't count players	2013-08-01 22:27:19 +02:00