ddnet/src/game/client/components
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
..
binds.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
binds.h Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
broadcast.cpp hide broadcast when motd is active. Closes #420 2011-01-17 13:46:59 +01:00
broadcast.h made broadcast text a bit smaller and cut it off if it's bigger than the screen. Closes #313 2010-12-16 03:17:16 +01:00
camera.cpp Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
camera.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
chat.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
chat.h Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
console.cpp -fixed compiler warnings 2011-01-26 14:45:44 +02:00
console.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
controls.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
controls.h release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +01:00
damageind.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
damageind.h Updated copyrights 2010-11-20 21:26:06 +01:00
debughud.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
debughud.h Updated copyrights 2010-11-20 21:26:06 +01:00
effects.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
effects.h Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
emoticon.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
emoticon.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
flow.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
flow.h Updated copyrights 2010-11-20 21:26:06 +01:00
ghost.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
ghost.h Checked and updated Ghost and Autorecord from Racemod updates, by Redix and Sushi Tee 2011-02-11 08:01:10 +02:00
hud.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
hud.h New Broadcast/Timer System 2010-11-30 04:24:15 +02:00
items.cpp Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
items.h Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
killmessages.cpp added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
killmessages.h Updated copyrights 2010-11-20 21:26:06 +01:00
mapimages.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
mapimages.h Updated copyrights 2010-11-20 21:26:06 +01:00
maplayers.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
maplayers.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
menus.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
menus.h Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
menus_browser.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
menus_demo.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
menus_ingame.cpp Checked and updated Ghost and Autorecord from Racemod updates, by Redix and Sushi Tee 2011-02-11 08:01:10 +02:00
menus_settings.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
motd.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
motd.h Updated copyrights 2010-11-20 21:26:06 +01:00
nameplates.cpp Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
nameplates.h Updated copyrights 2010-11-20 21:26:06 +01:00
particles.cpp fixed client crash when there are lots of particles. Closes #105 2010-11-24 01:08:51 +01:00
particles.h Updated copyrights 2010-11-20 21:26:06 +01:00
players.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
players.h Updated copyrights 2010-11-20 21:26:06 +01:00
race_demo.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
race_demo.h Checked and updated Ghost and Autorecord from Racemod updates, by Redix and Sushi Tee 2011-02-11 08:01:10 +02:00
scoreboard.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
scoreboard.h Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
skins.cpp cleaned up skin initialisation 2011-02-13 13:58:59 +01:00
skins.h cleaned up skin initialisation 2011-02-13 13:58:59 +01:00
sounds.cpp Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
sounds.h Updated copyrights 2010-11-20 21:26:06 +01:00
voting.cpp Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
voting.h Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00