GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: .gitignore src/game/client/gameclient.cpp src/game/editor/ed_editor.cpp src/game/server/gamecontext.cpp src/game/server/gamecontext.h & Cleaned it up		2011-01-06 23:32:19 +02:00
..
entities	Added /ShowOthers	2011-01-06 07:08:12 +02:00
gamemodes	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +02:00
score	Some Code Improvements and Compiler warnings	2010-12-07 19:44:23 +02:00
ddracecommands.cpp	Revert "dunno who added this or why!", i seem to have confused Spectator/In-Game with teams system	2011-01-06 15:49:05 +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-06 23:32:19 +02:00
gamecontext.h	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-06 23:32:19 +02:00
gamecontroller.cpp	fixed warnings	2011-01-06 14:21:44 +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	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +02:00
gameworld.h	Cleaned up & Re-arranged stuff	2011-01-06 05:46:10 +02:00
player.cpp	Added /ShowOthers	2011-01-06 07:08:12 +02:00
player.h	Added /ShowOthers	2011-01-06 07:08:12 +02: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	fixed warnings	2011-01-06 14:21:44 +02:00
teams.h	Code Style of some files converted from K&R to BSD/Allman	2011-01-06 07:30:19 +02:00