ddnet/src/game/client/components
GreYFoXGTi 526e36f8a0 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/client/components/menus.h
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/variables.h
2010-09-27 06:32:14 +03:00
..
binds.cpp End merge 2010-08-26 00:30:21 +04:00
binds.h End merge 2010-08-26 00:30:21 +04:00
broadcast.cpp copied refactor to trunk 2010-05-29 07:25:38 +00:00
broadcast.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
camera.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-19 21:27:40 +03:00
camera.h Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-19 21:27:40 +03:00
chat.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-13 07:49:01 +03:00
chat.h Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-13 07:49:01 +03:00
console.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-13 07:49:01 +03:00
console.h End merge 2010-08-26 00:30:21 +04:00
controls.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-19 21:27:40 +03:00
controls.h fixed view offset when changing from spectator to player. Closes #152 2010-09-19 16:00:46 +02:00
damageind.cpp copied refactor to trunk 2010-05-29 07:25:38 +00:00
damageind.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
debughud.cpp don't show player specific debug info when the debug graphs are shown to prevent overlapping 2010-09-12 12:55:37 +02:00
debughud.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
effects.cpp copied refactor to trunk 2010-05-29 07:25:38 +00:00
effects.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
emoticon.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-13 07:49:01 +03:00
emoticon.h Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-13 07:49:01 +03:00
flow.cpp copied refactor to trunk 2010-05-29 07:25:38 +00:00
flow.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
hud.cpp Made Personal Best/Vanilla Score Updated on game enter 2010-09-27 00:31:33 +03:00
hud.h Merging the client manually into the server 2010-08-25 17:31:49 +02:00
items.cpp changed pickup animation speed for demos according to demospeed (fixes issue 72) 2010-09-26 18:00:29 +02:00
items.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
killmessages.cpp fixed kill messages showing wrong infos 2010-06-06 17:17:43 +02:00
killmessages.h fixed kill messages showing wrong infos 2010-06-06 17:17:43 +02:00
mapimages.cpp Merging the client manually into the server 2010-08-25 17:31:49 +02:00
mapimages.h Merging the client manually into the server 2010-08-25 17:31:49 +02:00
maplayers.cpp Merge branch 'master' of http://github.com/GreYFoXGTi/teeworlds into master3 2010-09-07 07:59:51 +02:00
maplayers.h Merging the client manually into the server 2010-08-25 17:31:49 +02:00
menus.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-13 07:49:01 +03:00
menus.h Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-27 06:32:14 +03:00
menus_browser.cpp End merge 2010-08-26 00:30:21 +04:00
menus_demo.cpp fixed that it checks the current dir for demos too 2010-09-24 13:38:03 +02:00
menus_ingame.cpp added demo recording button by fujnky 2010-08-09 14:14:15 +02:00
menus_rcon.cpp End merge 2010-08-26 00:30:21 +04:00
menus_settings.cpp Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-27 06:32:14 +03:00
motd.cpp copied refactor to trunk 2010-05-29 07:25:38 +00:00
motd.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
nameplates.cpp Merging the client manually into the server 2010-08-25 17:31:49 +02:00
nameplates.h fixed some compiler errors and warnings with clang 2010-07-05 20:57:07 +02:00
particles.cpp copied refactor to trunk 2010-05-29 07:25:38 +00:00
particles.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
players.cpp when hooking a player don't use predicted values for rendering the hook. Closes #9 2010-09-08 02:54:03 +02:00
players.h fixed some compiler errors and warnings with clang 2010-07-05 20:57:07 +02:00
race_demo.cpp Merging the client manually into the server 2010-08-25 17:31:49 +02:00
race_demo.h Made Personal Best/Vanilla Score Updated on game enter 2010-09-27 00:31:33 +03:00
scoreboard.cpp revert the score board 2010-09-13 07:50:00 +03:00
scoreboard.h Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-13 07:49:01 +03:00
skins.cpp fixed that it checks the current dir for demos too 2010-09-24 13:38:03 +02:00
skins.h fixed that it checks the current dir for demos too 2010-09-24 13:38:03 +02:00
sounds.cpp fixed sound bug when using in the editor. Closes #136 2010-09-22 00:51:32 +02:00
sounds.h copied refactor to trunk 2010-05-29 07:25:38 +00:00
voting.cpp End merge 2010-08-26 00:30:21 +04:00
voting.h End merge 2010-08-26 00:30:21 +04:00