GreYFoXGTi
|
5d9ee1736e
|
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
|
2010-11-22 00:26:00 +02:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
oy
|
0e36b772d4
|
fixed line endings in some files
|
2010-08-15 15:34:55 +02:00 |
|
btd
|
9c052398f4
|
Last changes added. All fixed. Server builded.
Need many test before release.
Signed-off-by: btd <bardadymchik@gmail.com>
|
2010-07-30 16:50:09 +04:00 |
|
GreYFoXGTi
|
f41d4851d2
|
Cleanup a bit and modified the binary name
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
|
2010-07-29 10:40:27 +03:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Magnus Auvinen
|
7c0413ebac
|
added some modding comments
|
2009-01-11 13:23:40 +00:00 |
|
Alfred Eriksson
|
9a65b577ad
|
added mod gamemode
|
2009-01-11 09:29:15 +00:00 |
|