Commit graph

10 commits

Author SHA1 Message Date
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-08-13 02:01:40 +02:00
Magnus Auvinen 4739966e14 larger restructure to improve security 2008-02-24 16:03:58 +00:00
Magnus Auvinen a2566b3ebd cleaned up code structure a bit 2007-12-15 10:24:49 +00:00
Magnus Auvinen 3e23392105 added check in the data compilers so it verifies pointer, float and long sizes when loading the container 2007-08-22 21:27:01 +00:00
Magnus Auvinen 7703137618 added pickup sounds for the weapons 2007-08-03 06:35:35 +00:00
Magnus Auvinen 52c987bfd7 fixed so that the .dat-files are compiled into the exes 2007-07-24 23:46:29 +00:00
Magnus Auvinen 9e4aea97bd lots of cool new features :D new master server 2007-07-21 18:07:27 +00:00
Johan Althoff 7acef9eb86 fixed errors in the data compiler 2007-07-13 21:56:08 +00:00
Magnus Auvinen 7946d6ac50 removed some debug spam from the data compiler 2007-07-13 13:41:11 +00:00
Magnus Auvinen 125d04e51f large rewrite and code cleanup 2007-07-13 13:40:04 +00:00