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
2867 commits 1 branch 424 tags 415 MiB
Commit graph

373 commits

Author SHA1 Message Date
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
 2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
Choupom 7ef9c0e7be fixed french translation 2011-02-13 12:24:15 +01:00
oy b8e3795bfa added update for French translation by clecle226 2011-02-12 23:43:59 +01:00
oy d12db45c48 added editor function to construct different game tiles from a layer. Closes #460 2011-02-12 19:10:45 +01:00
root 20f186b0d2 Updated german translation 2011-02-09 12:54:50 +01:00
oy f5de59451a fixed a french translation and disarrangement 2011-02-09 12:37:19 +01:00
clecle226 4ba5980204 added translation 2011-02-09 12:28:39 +01:00
oy 6d9d92f418 added update for Romanian translation by kneekoo 2011-02-09 12:23:47 +01:00
GreYFoXGTi 3da1860654 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
 2011-02-04 18:54:54 +02:00
GreYFoXGTi 984d10970e Localization and Cooler Browser Filter 2011-01-31 00:30:53 +02:00
vierkant 55cc93f4af Rearranged alphabetically 2011-01-29 18:40:53 +01:00
vierkant f6a467094c Dutch language file update 2011-01-29 18:40:28 +01:00
GreYFoXGTi 5b51295185 Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches 
fixed the freeze command

Added Freeze Tile to switch layer to set freeze tile custom delay

Added sv_freeze_delay to control default freeze time delay
 2011-01-25 12:05:53 +02:00
GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
 2011-01-24 14:06:55 +02:00
oy 53a0f9e78b added Spanish translation by ReGnuM 2011-01-23 17:54:37 +01:00
oy 12e29d7efd fixed Italian language file 2011-01-23 17:54:12 +01:00
Carmine c7ddd5f8ed update italian translation 2011-01-23 17:54:06 +01:00
heinrich5991 fbe1f9cedf updated german localization, fixed one too big string 2011-01-23 17:53:42 +01:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-01-20 16:10:32 +02:00
oy 9c5477a6e8 added romanian translation update by kneekoo 2011-01-18 18:26:02 +01:00
oy bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01:00
Floff Floffsson 645f31141d deepfreeze tiles 2011-01-17 00:38:24 +02:00
GreYFoXGTi 9c66a2d54c Endless Hook Tile for ingameplay by Floff aka LemonFace 2011-01-17 00:13:21 +02:00
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 c97105a113 fixed missing tile from Fisico 2010-12-12 01:16:39 +02:00
GreYFoXGTi a25bbce836 New Entities by Fisico, I split them and reworked into separate files 2010-12-12 01:05:11 +02: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 af6f96bc7e Added Tile for the new Map Config 2010-12-02 00:45:36 +02:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +02: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