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
..
build.py	Temporarily removed crash features til it's fixed, made version 1.071a	2011-04-12 03:52:01 +02:00
check_header_guards.py	added "fixed some header guards and added a script to fix them all!" by Choupom	2011-04-13 20:22:10 +02:00
cmd5.py	Merge branch 'master' of git://github.com/oy/teeworlds into HEAD	2011-04-14 01:27:49 +02:00
compiler.py	larger restructure to improve security	2008-02-24 16:03:58 +00:00
copyright.py	Added/fixed directory changing	2011-04-03 22:33:47 +02:00
count_source.sh	updated the demo recorder	2008-10-14 12:11:42 +00:00
dat2c.py	fixed so that the .dat-files are compiled into the exes	2007-07-24 23:46:29 +00:00
font_converter.py	renamed everything. added the new license	2008-03-22 18:40:27 +00:00
font_installer.sh	font cleanup	2008-01-19 16:49:24 +00:00
gen_keys.py	copied refactor to trunk	2010-05-29 07:25:38 +00:00
linecount.sh	major engine cleanup. dependency on baselib removed. engine is now C code (not ansi tho). some other cruft removed aswell	2007-08-22 07:52:33 +00:00
make_docs.sh	minor update	2008-07-08 09:07:21 +00:00
make_release.py	Mac make_release changes	2011-04-13 01:35:13 +02:00
make_src.py	updated build scripts	2009-01-11 12:35:37 +00:00
mass_server.py	upgraded the master server code so it can handle more servers	2008-11-15 13:29:56 +00:00
netobj.py	loads of minor fixes here and there. fixed invalid corrections and stuff like that	2008-03-17 22:36:03 +00:00
nicks.txt	added nicks.txt	2007-10-08 10:59:53 +00:00
png.py	move even more stuff	2007-05-22 15:06:15 +00:00
process_blame.py	more stuff :)	2008-04-27 05:59:38 +00:00
refactor_count.py	updated refactor script and fixed a thing	2010-08-12 19:03:03 +02:00
SDL_keysym.h	added SDL support	2008-10-20 17:47:42 +00:00
tw_api.py	improved the prediction timer to handle crappy connections better	2009-01-21 00:05:07 +00:00
update_localization.py	added Python 2.5 - Python 3.2 support by Sworddragon	2011-01-29 18:55:21 +01:00