Commit graph

539 commits

Author SHA1 Message Date
GreYFoX a1fa8fe706 fixed the entities_clear.png and tele.png
NOTE: dunno why we needed another from and to but maps use it now and we can't change it
2012-05-05 03:35:41 +02:00
GreYFoX 3f2126cbf3 added missing entity to clear 2012-05-03 18:20:29 +02:00
GreYFoX 6eeba714da added missing entity 2012-05-03 18:18:28 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
2012-04-12 02:09:31 +02:00
heinrich5991 bddc8c7161 added skins by MobyDog 2012-02-10 22:50:07 +01:00
oy 357be91c6b removed language files 2012-02-05 17:06:07 +01:00
Yared Hufkens c5bc44d02b Removed comment on line 473 2012-02-05 13:32:09 +01:00
Yared Hufkens 78a1ef9988 Translated untranslated strings in german and dutch lang files 2012-02-03 19:57:59 +01:00
oy 4efd65359e show notification when game is paused 2012-01-10 22:40:48 +01:00
oy ea1609a58b added missing localisations 2012-01-10 22:37:27 +01:00
oy 535324d6ed added an entry for the kill command to the controls menu. Closes #652 2012-01-08 00:20:02 +01:00
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02:00
Learath2 8e8ba26ac2 Fixed errors i've seen in Turkish translation. 2012-01-01 23:54:29 +02:00
GreYFoX 908cb57f25 New entities thanks to @Fisico 2012-01-01 04:54:40 +02:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
2011-12-05 11:32:01 +02:00
oy 318d4e24b0 updated dejavu font to 2.33 2011-12-04 19:50:43 +01:00
GreYFoX 5ebf60891c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-12-01 19:48:09 +02:00
oy f26365d097 added fix for last commit by DNR 2011-11-30 01:57:52 +01:00
EliteTee c52bf5ac3a Fixed serbian translation... 2011-11-30 01:55:30 +01:00
GreYFoX 116daa67d3 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-09-13 01:01:25 +02:00
oy ac929c0365 Merge pull request #864 from Learath2/translate-c
Minor Updates On Turkish Translation
2011-09-11 15:08:41 -07:00
Learath2 8b91036da6 Minor Updates On Turkish Translation 2011-09-07 16:59:20 +03:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams )
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
2011-09-02 20:04:18 +02:00
GreYFoX 44b636d37f Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-08-29 06:10:21 +02:00
oy a0aedd4d3b Merge pull request #848 from Learath2/translate-c
Updated Turkish Translation
2011-08-28 16:16:30 -07:00
GreYFoX d998d1a2ca Skins By Moby 2011-08-27 16:20:50 +02:00
Learath2 4dec5db9bd Updated Turkish Translation 2011-08-21 01:12:50 +03:00
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
arionwt1997 1ba57a5696 Edited by Arion WT 07.08.2011, Fixed some errors 2011-08-07 13:16:28 +03:00
Kottalizer 379e5c7378 added matiasmunk's improvements 2011-08-06 22:49:11 +02:00
oy 7e4449d05a added fix for Ukrainian translation by 404_not_found 2011-07-30 19:50:58 +02:00
oy 5c73b6afc8 added Hungarian translation by Feca 2011-07-30 19:47:01 +02:00
oy f6301181dd added Belarusian translation by arionwt1997 2011-07-30 19:20:51 +02:00
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
oy a3613605c3 added update for Polish translation by Shymwo 2011-07-21 18:54:53 +02:00
Isadora 0520363702 Improved the translation of a few strings and corrected unnecessary/wrong changes from last update. 2011-07-20 21:47:11 +02:00
oy 737b5540ad added update for Polish translation by Shymwo 2011-07-15 01:27:45 +02:00
oy e55653f1e6 added update for Spanish translation by GaBOr 2011-07-15 01:23:39 +02:00
oy b7bcba7b85 added update for Bulgarian translation by Hip-Hop_Blond 2011-07-15 01:19:13 +02:00
oy 932ac835d3 added update for Italian translation by Apmox 2011-07-15 01:09:59 +02:00
drnickxyz 5058ec732f Edited data/languages/serbian.txt via GitHub 2011-07-15 00:36:32 +02:00
HeroiAmarelo 35f17e7134 Edited data/languages/portuguese.txt via GitHub 2011-07-15 00:35:23 +02:00
TeeWorlds-org 0765c29c15 Edited data/languages/czech.txt via GitHub 2011-07-15 00:34:19 +02:00
oy 7a129caf8d added updated jungle_main rules by Landil 2011-07-13 23:09:19 +02:00
oy 5f4a5b3366 added country flags to language selectors 2011-07-12 20:33:53 +02:00
oy 38202d9736 added country flags 2011-07-12 20:23:42 +02:00
oy 4d87e9932c added Portuguese translation by HeroiAmarelo and renamed existing one to Brazilian Portuguese 2011-07-11 12:34:17 +02:00
Aline aka Ryomou Hentai Girl 12c453ab15 Portuguese language updated. 2011-07-11 11:33:42 +02:00
Alexandre f0bc14466a Edited data/languages/spanish.txt via GitHub 2011-07-11 11:30:00 +02:00
oy 7bc07b613f added auto mapping feature by LordSkelethom 2011-07-09 01:09:06 +02:00