GreYFoXGTi
|
46c2225d60
|
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
scripts/make_release.py
src/engine/shared/config_variables.h
|
2010-12-11 21:28:43 +02:00 |
|
oy
|
a0985314c9
|
made it possible to "recycle" auto recorded demos
|
2010-12-11 18:55:28 +01:00 |
|
|
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 |
|
|
oy
|
97a7dea152
|
added localisation updates by Sworddragon
|
2010-11-21 14:25:00 +01:00 |
|
|
oy
|
ba05ddd0f5
|
removed duplicate entry from the localisation files
|
2010-11-21 14:12:39 +01:00 |
|
|
oy
|
f62a1c3818
|
updated language files
|
2010-11-21 00:49:10 +01:00 |
|
|
GreYFoXGTi
|
4aca32ed6f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/russian.txt
|
2010-11-19 12:05:30 +02:00 |
|
|
oy
|
114649446e
|
added Russian translation by kaddyd. Closes #280
|
2010-11-18 20:30:30 +01:00 |
|
|
GreYFoXGTi
|
11f480a79b
|
Changed the Loading String to Loading DDRace Client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-08-28 19:59:24 +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 |
|