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
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
..
components Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
animstate.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
animstate.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
component.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
gameclient.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
gameclient.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
lineinput.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
lineinput.h added auto completion of nicknames and highlighted nicknames in chat. Closes #218 2010-12-16 02:31:12 +01:00
render.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
render.h Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
render_map.cpp Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 2011-04-14 01:27:49 +02:00
ui.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
ui.h added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00