GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: data/languages/german.txt src/game/client/components/scoreboard.cpp src/game/editor/ed_layer_tiles.cpp src/game/server/entities/character.cpp src/game/server/gamecontext.cpp src/game/server/gamecontroller.cpp src/game/variables.h		2011-01-04 22:37:09 +02:00
..
entities	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-04 22:37:09 +02:00
gamemodes	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-04 22:37:09 +02:00
score	Some Code Improvements and Compiler warnings	2010-12-07 19:44:23 +02:00
ddracecommands.cpp	dunno who added this or why!	2010-12-24 17:02:02 +02:00
entity.cpp	Updated copyrights	2010-11-20 21:26:06 +01:00
entity.h	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
eventhandler.cpp	fixed server crash on too many snap items. Closes #317	2010-12-16 03:29:08 +01:00
eventhandler.h	Updated copyrights	2010-11-20 21:26:06 +01:00
gamecontext.cpp	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-04 22:37:09 +02:00
gamecontext.h	added some DDRace flags for the server browser (server-sided), client-sided still needed	2010-12-19 14:11:14 +01:00
gamecontroller.cpp	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-04 22:37:09 +02:00
gamecontroller.h	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
gameworld.cpp	Merge branch 'master' into DDRace	2010-12-12 04:32:40 +02:00
gameworld.h	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
player.cpp	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-04 22:37:09 +02:00
player.h	added configurable time between pauses, to reduce spam	2010-12-16 10:05:20 +01:00
score.h	Total IP Scoring Annihilation ( doesn't make sense ), please test this, also delete the old records	2010-11-04 20:10:51 +02:00
teams.cpp	Added Ability to Restart the race in a team after you have finished <br/>	2010-12-19 05:48:16 +02:00
teams.h	Added Ability to Restart the race in a team after you have finished <br/>	2010-12-19 05:48:16 +02:00