edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-22 02:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
ddnet/src/game/client/components
History
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
2011-04-14 01:27:49 +02:00
..
binds.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
binds.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
broadcast.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02: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 Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
camera.h Merged Oy, Cleaned up, removed some useless features and code parts 2011-04-09 22:32:17 +02:00
chat.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
chat.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
console.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
console.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
controls.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
controls.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
countryflags.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
countryflags.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
damageind.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
damageind.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
debughud.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
debughud.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
effects.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
effects.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
emoticon.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
emoticon.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
flow.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
flow.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
ghost.cpp Merged Oy, Cleaned up, removed some useless features and code parts 2011-04-09 22:32:17 +02:00
ghost.h fixed all known bugs in racedemos & ghosts, including "ghost is shown when playing a demo", "ghost doesn't reset when crossing the startline 2011-02-16 10:39:26 +02:00
hud.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
hud.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
items.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
items.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
killmessages.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
killmessages.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
mapimages.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
mapimages.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
maplayers.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
maplayers.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
menus.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
menus.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
menus_browser.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
menus_demo.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
menus_ingame.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
menus_settings.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
motd.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
motd.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
nameplates.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
nameplates.h Updated copyrights 2010-11-20 21:26:06 +01:00
particles.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
particles.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
players.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
players.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
race_demo.cpp Merged Oy, Cleaned up, removed some useless features and code parts 2011-04-09 22:32:17 +02:00
race_demo.h fixed all known bugs in racedemos & ghosts, including "ghost is shown when playing a demo", "ghost doesn't reset when crossing the startline 2011-02-16 10:39:26 +02:00
scoreboard.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
scoreboard.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
skins.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
skins.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
sounds.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
sounds.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
spectator.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
spectator.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
voting.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
voting.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00