GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds ... Conflicts: src/engine/external/pnglite/pnglite.c src/engine/external/pnglite/pnglite.h src/engine/shared/config_variables.h src/game/client/components/menus_browser.cpp src/game/server/entities/character.cpp src/game/server/entities/laser.cpp src/game/server/gamecontext.cpp src/game/server/player.cpp src/game/version.h		2011-05-09 18:36:13 +02:00
..
audio	forgot to add the music file	2011-04-13 21:08:34 +02:00
countryflags	added flag for Bosnia and Herzegovina	2011-04-12 20:21:23 +02:00
editor	Removed Text from evil teleporter	2011-04-20 21:37:53 +02:00
fonts	Merge branch 'master' of http://github.com/oy/teeworlds	2010-10-30 00:48:17 +02:00
languages	update of portuguese translation	2011-05-09 17:26:02 +02:00
mapres	Merge branch 'master' of git://github.com/oy/teeworlds	2011-05-09 18:36:13 +02:00
maps	ctf2 update	2011-04-09 18:32:01 +02:00
skins	pepsi_tee.png	2010-11-02 17:23:21 +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	added new emoticons. Closes #362	2011-02-16 11:45:19 +01:00
file_icons.png	added file icons by Landil	2010-11-17 18:28:28 +01: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_buttons.png	added new friends/mute icons and buttons by Crises	2011-04-08 18:45:57 +02:00
gui_cursor.png	new cursor. thanks goes to primevil	2008-01-18 23:23:35 +00:00
gui_icons.png	made translations ready for 0.6 release and added fixed friends/mute icons	2011-04-09 18:08:11 +02:00
gui_logo.png	changed Teewars to Teeworlds text in GUI background image	2008-03-22 20:12:28 +00:00
particles.png	fixed problem with the hammer hit particle	2011-04-09 00:02:08 +02:00