GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: src/engine/shared/console.cpp src/game/client/components/hud.cpp src/game/client/components/scoreboard.cpp src/game/server/entities/character.cpp src/game/server/entities/projectile.cpp		2011-01-12 11:08:17 +02:00
..
character.cpp	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-12 11:08:17 +02:00
character.h	fixed /emote reset	2011-01-07 23:26:28 +01:00
door.cpp	Some Code Improvements and Compiler warnings	2010-12-07 19:44:23 +02:00
door.h	new Switch System //TODO Rendering Rotation	2010-11-14 02:39:04 +02:00
dragger.cpp	Some Code Improvements and Compiler warnings	2010-12-07 19:44:23 +02:00
dragger.h	new Switch System //TODO Rendering Rotation	2010-11-14 02:39:04 +02:00
flag.cpp	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +02:00
flag.h	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +02:00
gun.cpp	Total Noobness	2010-11-14 17:51:04 +02:00
gun.h	new Switch System //TODO Rendering Rotation	2010-11-14 02:39:04 +02:00
laser.cpp	woops	2011-01-07 20:37:21 +02:00
laser.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
light.cpp	Total Noobness	2010-11-14 17:51:04 +02:00
light.h	new Switch System //TODO Rendering Rotation	2010-11-14 02:39:04 +02:00
pickup.cpp	Merge branch 'master' of http://github.com/oy/teeworlds	2010-12-16 06:06:23 +02:00
pickup.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
plasma.cpp	Added /ShowOthers	2011-01-06 07:08:12 +02:00
plasma.h	Starting to fix Doors	2010-09-16 23:33:16 +03:00
projectile.cpp	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-12 11:08:17 +02:00
projectile.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