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

590 commits

Author SHA1 Message Date
GreYFoX fa57b979fd they were flipped 
i never revised the commit @ravomavain added these tiles in, we are both mistaken for all this mess
 2012-05-05 03:44:32 +02:00
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
arionwt1997 ad0c58dbef Update 10:40 07.07.2011 by Arion WT 2011-07-07 00:39:05 -07:00
oy 2523d20b40 added update for Russian translation by Bananbl4 2011-07-07 02:03:04 +02:00
Nicolae Crefelean ba2dbd8416 Edited data/languages/romanian.txt via GitHub 2011-07-05 23:34:34 +02:00
oy 5008b5f8a5 Added update for Finnish translation by ziltoide 2011-07-05 18:31:04 +02:00
oy 7f546488ee added update for Bosnian translation by *** 2011-07-04 23:31:22 +02:00
oy 6b4080aee8 added update for Portuguese translation by Slinack 2011-07-03 00:23:26 +02:00
oy 7b6e75f451 added for Slovak translation by LimiT 2011-07-02 20:24:44 +02:00
oy 9be652170b added update for dutch translation by Syntax Error 2011-07-02 20:09:24 +02:00
TeeWorlds-org de9da10f55 Updated Czech localization by Medik & Petr 2011-07-02 10:37:05 -07:00
Choupom 199a1d8d1d updated french l10n 2011-07-02 19:23:49 +02:00
oy 165dd6b287 Merge pull request #741 from heinrich5991/languageadd_german1 
Updated German localization
 2011-07-02 03:18:49 -07:00
oy b6b33b09d9 Merge pull request #740 from heinrich5991/languageadd_norwegian0 
Added norwegian translation by MertenNor
 2011-07-02 03:17:53 -07:00
heinrich5991 a51485563a Updated German localization 2011-07-02 09:10:21 +02:00
heinrich5991 93df265a65 Added norwegian translation by MertenNor 2011-07-02 08:46:16 +02:00
Kottalizer 0cd8681961 fixed a few grammar errors as well as the untranslated strings 2011-07-01 15:34:54 -07:00
oy 18560a5e35 added Romanian translation update by kneekoo 2011-07-01 18:40:49 +02:00
oy 123eab41c8 made it possible to filter by player country in the server browser. Closes #654 2011-06-29 22:27:32 +02:00
oy b7ce39be94 added "Updated Turkish Translation" by Learath2 2011-06-27 22:23:40 +02:00
Learath2 85bf55d95e Updated Turkish Translation 2011-06-27 19:54:08 +03:00
oy fb309436b4 improved friends feature 2011-06-26 17:10:13 +02:00
GreYFoX 7ea942441b New Entities from @Fisico, Discarded tele.png because it had missing tiles 2011-06-26 02:15:23 +02:00
GreYFoX 4e98a45175 Skin pack by whis 2011-06-07 16:42:42 +02:00
Romain Labolle 38f1db1c4f Adding a checkpoint system for teleporters : 
* Player go through a Checkpoint tile (29 in tele layer)
* He fall in a Check-Teleporter tile (31 in tele layer)
* Player is teleported to the check-TO (30 in tele layer) that have the same number as the last Checkpoint.
Thus players are teleported to the last checkpoint he passed, regardless of whether he made ​​the map in the right direction or not.

Tele tileset may need some improvement.
Closes Pull Request #52
 2011-06-01 17:03:04 +02:00
GreYFoX 1d8f3fffe4 Merge branch 'master' of git://github.com/oy/teeworlds 2011-06-01 16:35:05 +02:00
Nicolae Crefelean 9f323857af Edited data/languages/romanian.txt via GitHub 2011-05-25 18:36:32 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
Isadora Queiroz 019eb146a7 update of portuguese translation 2011-05-09 17:26:02 +02:00
oy ed7af20dab added German translation update by andi103 2011-05-03 23:25:20 +02:00
oy e85c4cb5db updated language files 2011-05-02 19:31:20 +02:00
oy 96f94a3155 added German translation update by andi103 2011-05-02 19:12:27 +02:00
oy a4e5228725 added Russian translation update by BotanEgg 2011-05-02 19:07:35 +02:00
oy 26d014ad4f cleaned up last commit 2011-05-02 18:31:44 +02:00
Learath2 d2cbcbfcf4 Added turkish translation 2011-05-02 18:29:22 +02:00
oy dd05015321 added "minor fix and update of portuguese translation" by Slinack 2011-05-02 18:24:12 +02:00
oy 1bdc68318a added "Italian translation review" by Otacon 2011-05-02 18:21:08 +02:00
oy 25c2af4fa4 added "updated dutch language file" by Vijfhoek 2011-05-02 18:09:31 +02:00
oy d5e065b6c7 added tileset bugfixes by Crises 2011-05-02 18:00:02 +02:00
GreYFoX 8b5135c359 Removed Text from evil teleporter 
people should check the documentation to know what it does
p.s. @Speedy-Consoles please update the Documentation to say it also cuts the hook of the hookers
 2011-04-20 21:37:53 +02:00
oy 726bbbbdb0 added missing localisation in the demo player 2011-04-16 18:37:57 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
 2011-04-14 01:27:49 +02:00
oy 2f99b4e324 forgot to add the music file 2011-04-13 21:08:34 +02:00
oy aeec62266b added Danish translation by SnOrKilll 2011-04-13 20:19:37 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
oy 537e5fa7b6 added default keys for spectator next/previous and updated localisations 2011-04-13 17:39:26 +02:00
GreYFoX e3cc1c405e Merge branch 'master' of git://github.com/oy/teeworlds 2011-04-12 21:05:55 +02:00
oy ad5eeb14b3 added Norwegian translation by MertenNor 2011-04-12 20:35:28 +02:00
oy 62e816e847 fixed an entry within Russian translation 2011-04-12 20:31:47 +02:00
oy 0cfdd96b02 added flag for Bosnia and Herzegovina 2011-04-12 20:21:23 +02:00
oy b5070bac70 added update for Russian translation by RaZeR[RT] 2011-04-12 17:57:02 +02:00