edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 18:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
2715 commits 1 branch 429 tags 413 MiB
Commit graph

87 commits

Author SHA1 Message Date
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2011-01-12 11:08:17 +02:00
oy 308dd0304d added Romanian translation by kneekoo 2011-01-11 01:09:46 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 1d9190fd5b Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/russian.txt
	readme.txt
	src/game/variables.h
 2011-01-06 01:49:58 +02:00
oy 64e36b5095 updated french l10n by Choupom 2011-01-05 22:13:44 +01:00
oy 6bf5c0bef2 added updated Bosnian translation by *** 2011-01-05 18:48:00 +01:00
oy 18461535fd changed time left localisation in the map download popup to allow better translations 2011-01-05 17:28:53 +01:00
oy 023763e1a4 updated localisations based on last commit 2011-01-05 12:08:38 +01:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
 2011-01-04 22:37:09 +02:00
vierkant b29b6d0bcf Difference made for disconnect and quit 2011-01-03 12:22:05 +01:00
vierkant 3f1fa001a5 Dutch translation updated. 
"seconds and minutes left" in map download in Dutch can better be translated as "left seconds and minutes'" with left in front of the time unit.
 2011-01-03 12:21:42 +01:00
Lars Funke cbc76c9247 Updated german l10n 2011-01-02 19:49:22 +01:00
GreYFoXGTi 3956c34b6d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
 2010-12-16 04:15:05 +02:00
oy 1d7df01e9a added map download progress by kaddyd 2010-12-16 01:52:29 +01:00
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
 2010-12-13 03:43:22 +02:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
GreYFoXGTi 157aafd4dd Merge branch 'master' into DDRace 
Conflicts:
	src/engine/server/server.cpp
	src/game/variables.h
 2010-12-11 23:57:41 +02:00
oy 32806bf057 added Ukrainian translation by .ua and Ivan. Closes #338 2010-12-11 21:53:46 +01:00
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
vierkant ebd45829ce Improved dutch language file. Translated more in context. 2010-11-21 18:30:33 +01:00
oy 456fc7e9b6 cleaned up last commit 2010-11-21 17:42:58 +01:00
Sijmen Schoon c2405d03b6 Improved Dutch translation 2010-11-21 17:39:54 +01: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
Choupom faee45d928 updated french localization 2010-11-21 14:07:30 +01:00
oy f62a1c3818 updated language files 2010-11-21 00:49:10 +01:00
GreYFoXGTi a764ebc1a8 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-20 11:00:41 +02:00
Łukasz D 101f1da207 Added Polish translation 2010-11-19 20:04:58 +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 fc433afd49 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-31 20:32:35 +02:00
oy eace936869 fixed an entry in some language files 2010-10-31 02:55:35 +02:00
oy 133d293490 added Finnish translation by ziltoide 2010-10-31 02:20:47 +02:00
GreYFoXGTi 4d204d642f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/console.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
 2010-10-26 00:25:36 +02:00
oy 9cf31a272a added Bosnian translation by *** 2010-10-25 22:21:05 +02:00
oy ca99bec385 added Serbian translation by DNR 2010-10-25 22:18:19 +02:00
Choupom 65be8e5750 fixed error reading localizations 2010-10-25 18:57:30 +02:00
heinrich5991 e0b0e08ded fixed german translation 2010-10-20 08:58:21 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
 2010-10-11 03:56:58 +02:00
oy b65a26fe93 fixed last commits 2010-10-11 01:06:44 +02:00
Choupom 8557d3a022 updated french translation 2010-10-11 00:32:54 +02:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03:00
GreYFoXGTi 67a5765c9f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/components/camera.cpp
	src/game/client/components/camera.h
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_layer_tiles.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-19 21:27:40 +03:00
oy 0905b7755d localised the language names. Closes #153 2010-09-16 13:32:56 +02: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
Fujnky f8b9f342d3 Fix for l10n in menus_demo.cpp and sime german l10n tweaks. 2010-06-11 15:50:47 +08:00
vierkant 8625f42e30 Dutch translation. Some small errors and the editor translations 2010-06-09 20:40:12 +08:00