edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
4363 commits 1 branch 424 tags 415 MiB
Commit graph

24 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
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server 
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-25 17:31:49 +02:00
Magnus Auvinen edf33b8a5b removed the output directory for the docs. shouldn't be in here 2008-11-08 08:26:24 +00:00
Magnus Auvinen 12472ef7f4 major update. continued on ban support. added demo recording (client and server side). added demo player. added demo menu. demos have some quirks and file size optimizations havn't been done yet. some interface tweaks 2008-10-06 18:05:01 +00:00
Magnus Auvinen 0fceb1cf1a added documentation 2008-08-05 21:37:33 +00:00
Magnus Auvinen 61bfe2d70c added doc tool 2008-08-02 08:21:29 +00:00
Magnus Auvinen a13b94f9e0 minor update 2008-07-08 09:07:21 +00:00
Magnus Auvinen f9782f628f support for external images in the map editor 2008-01-19 14:23:53 +00:00
Magnus Auvinen dd21ae1bc7 large commit. documented a bit. editor updates. general cleanup of everything 2008-01-19 10:57:25 +00:00
Magnus Auvinen e42c493d0c removed olds docs 2008-01-17 12:56:19 +00:00
Magnus Auvinen 4b098f7711 removed olds docs 2007-07-24 22:50:29 +00:00
Magnus Auvinen 2a18986c09 updated docs 2007-07-19 11:03:59 +00:00
Magnus Auvinen 08e94dd071 updated docs 2007-07-19 11:01:07 +00:00
Magnus Auvinen b684d1387e updated the mapformat to accuratly reflect the reality 2007-07-19 10:58:34 +00:00
Magnus Auvinen c6c1dcb620 updated tasks 2007-07-19 10:56:52 +00:00
Magnus Auvinen 98f34b1f81 updated tasks 2007-07-19 10:55:43 +00:00
Magnus Auvinen 27d9e6203f updated tasks 2007-07-19 10:52:47 +00:00
Magnus Auvinen 442e99262c updated tasks 2007-07-19 10:49:44 +00:00
Magnus Auvinen 45a3478c8f added economics.txt file 2007-07-18 21:09:18 +00:00
Magnus Auvinen f2611cad8b fixed so that the editor works again 2007-07-15 13:25:10 +00:00
Magnus Auvinen 07c8ff2e53 commited the tasks document 2007-07-15 10:52:24 +00:00
Magnus Auvinen 568b9f1f4a added chat, better damage indicators 2007-07-14 13:09:42 +00:00
Magnus Auvinen 34e3df3966 tasks update, started to move around stuff 2007-05-24 10:57:31 +00:00
Magnus Auvinen 9ba8e6cf38 moved docs 2007-05-22 15:06:55 +00:00