ddnet/data
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:57:38 +02:00
..
audio softer hook sound 2009-01-24 11:06:16 +00:00
editor Corrected a tile background 2010-08-30 19:41:09 +02:00
fonts Merging the client manually into the server 2010-08-25 17:31:49 +02:00
languages Changed the Loading String to Loading DDRace Client 2010-08-28 19:59:24 +02:00
mapres ... 2010-08-31 09:12:32 +02:00
maps ... 2010-08-31 09:12:32 +02:00
skins fixed the ninja rendering 2008-03-10 19:36:05 +00:00
arrows.png Merging the client manually into the server 2010-08-25 17:31:49 +02:00
blob.png new menu background, much more relaxing 2008-09-23 11:58:12 +00:00
browse_icons.png added /!\ icon for impure servers 2009-01-11 12:35:03 +00:00
console.png flashified the console 2008-02-10 01:48:39 +00:00
console_bar.png redone the input system so you can know do keybindings with say etc 2008-03-01 20:03:04 +00:00
debug_font.png optimized pngs 2007-05-27 00:58:24 +00:00
demo_buttons.png Improved demo player another bit. 2010-09-04 16:23:20 +02:00
emoticons.png renamed from chatbubbles.png 2007-08-14 20:23:24 +00:00
game.png GFX: cut away redundant AA on 90° lines, fixed some border leaks (shotty <--> pistol) 2008-11-16 17:38:11 +00:00
gui_cursor.png new cursor. thanks goes to primevil 2008-01-18 23:23:35 +00:00
gui_logo.png changed Teewars to Teeworlds text in GUI background image 2008-03-22 20:12:28 +00:00
particles.png large update. cleaned up some code. added new effects for almost everything 2008-01-29 21:39:41 +00:00