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

853 commits

Author SHA1 Message Date
def f7c606c649 Fix entities_clear and make unfreeze sun symbol (by Saavik) 2015-03-14 14:23:21 +01:00
timgame 1c6c3716ce fixed 1px offsets 2015-03-12 19:38:13 +01:00
timgame 7594c9a594 added ddmax-freeze tileset with automapper 2015-03-11 16:30:42 +01:00
def 91756cc529 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2015-03-10 22:57:52 +01:00
def 05970cc2e2 Add BONUS tile, opposite of PENALTY (for Saavik's new map) 2015-03-10 22:57:40 +01:00
timgame ca378e7782 updatet unhookable automappers 2015-03-06 17:00:14 +01:00
timgame 6188b16e5e added tile -1 and updated grass automappers 2015-03-04 16:03:52 +01:00
def dd588d25e3 More automapper rules for grass_main(_0.7) (by hi_leute_gll) 2015-02-21 16:26:48 +01:00
def 0a7745a28c 2 more tiles for grass_main_0.7 (by Soreu) 2015-02-21 16:26:27 +01:00
def 4a1d1422b5 Add generic_unhookable (+0.7) rules by hi_leute_gll 2015-02-12 18:51:07 +01:00
def 883cd3d7d3 Adaptation to work with DDNet 2015-01-19 22:19:27 +01:00
def 72b72b8b61 Fix of water mapres (by Soreu, found by hi_leute_gll) 2015-01-19 22:14:50 +01:00
timgame 2ee0ca0648 added refill jumps tile and cleaned tile detection 2015-01-19 22:14:49 +01:00
def 91dfe9fd1b Add water tileset (by Soreu) 2014-12-25 16:32:36 +01:00
def 57d8734fce Add better hookable entity (by Soreu) 2014-12-25 16:31:19 +01:00
def 85169941b4 Fix round-tiles (by Soreu) 2014-12-03 19:45:10 +01:00
def 97fc1ad003 New entities for better visibility of hookables 2014-11-23 21:40:18 +01:00
Rafael Ferreira 1212b7a882 Updated Brazilian Portuguese translation 
Applies translations already updated by me in official Teeworlds translation, accessed in:  https://github.com/teeworlds/teeworlds-translation/blob/master/brazilian_portuguese.json
 2014-11-21 16:16:02 -02:00
def 9fb02ade4f Remove BB skins 2014-11-07 02:20:36 +01:00
def 7a5935d298 Add BadAnqelMonster skin 2014-10-25 14:40:18 +02:00
Dennis Felsing 792a891dfa Merge pull request #71 from cinaera/pr_speaker 
Add editor icon for audio source
 2014-10-21 12:15:18 +02:00
BeaR 09f8630b68 Add editor icon for audio source 2014-10-21 12:07:09 +02:00
timgame 3899a80f75 clean up automapper 2014-10-21 00:59:08 +02:00
def 760a9662ba Add fixes for grass_main_0.7 (by Saavik) and automapper rules (by hi_leute_gll) 2014-10-19 01:15:14 +02:00
def 8de48fe072 Remove Bloody FreaKy skin on request of FreaKy (no idea why) 2014-10-19 01:08:35 +02:00
def d9b94a7332 Fixed jungle_background (by 645654) 2014-10-17 20:18:27 +02:00
def fdfa9141af Remove unused 00260teecammo 2014-10-06 04:20:00 +02:00
def 755590309e Add 00Bolox skin 2014-10-05 23:53:40 +02:00
def 9691293f4c New "Entities off" sign 2014-10-01 19:07:42 +02:00
def a168f17bf1 Add Volt skin 2014-09-21 13:38:07 +02:00
def 58f768e8b1 Separate timed-switch-activation and unsolo tiles in entities_clear 2014-09-20 16:56:17 +02:00
def a8b33efafa Oops², restore old entities_clear 2014-09-20 16:51:02 +02:00
def 520b84328f Fix 5:4 resolution in menu 2014-09-20 13:37:00 +02:00
def 7b9f346440 Oops, restore old entities_clear 2014-09-18 02:31:50 +02:00
def 18d1e25d5c Fix: Render SwitchTimedOpen and Unsolo on seprate tiles 2014-09-17 20:22:42 +02:00
def 568120157f Remove moon_0.7 because it's the same as moon (thanks Saavik) 2014-08-27 22:26:59 +02:00
east 070ebe2895 merge fixed 2014-08-23 17:57:32 +02:00
east 65b2426349 CDemoEditor: added new buttons to demo player 2014-08-13 16:35:15 +02:00
def ab43f45c78 Add Shadow skin 2014-08-12 20:55:12 +02:00
def 6ede38cdf7 Update 00Laxa skin 2014-08-11 22:36:52 +02:00
def 251af2fd49 xenon skin update 2014-08-10 17:27:05 +02:00
def 670b449aa5 Add Sonic skin 2014-08-10 11:02:18 +02:00
def b883ca1787 Add XeNoN skin 2014-08-06 15:09:11 +02:00
def 938394f223 Add 00Laxa skin 2014-08-04 17:58:04 +02:00
def 1205b22b6c Remove Shadow skin, add ghostjtj instead 2014-07-30 22:37:36 +02:00
def aa81aea400 New 00Wolf skin 2014-07-28 22:09:53 +02:00
def 5cfa9f947d 2 more skins 2014-07-27 11:27:25 +02:00
def 80f607e784 Add Shadow skin 2014-07-26 21:03:26 +02:00
def 5864a47c4b Show tune layers in entities again 2014-07-26 12:33:25 +02:00
def 510b8c6e21 add 00appendix skin 2014-07-18 23:23:17 +02:00
def de1253033e Add DDNet start line 2014-07-15 14:50:07 +02:00
def 37ac87c8a6 Update iParano skin 2014-07-12 00:05:29 +02:00
def ebc9e55acd Add 00Necrid skin 2014-07-10 16:47:25 +02:00
def 5e89631637 Revert "Add 00Necrid skin" 
This reverts commit b52afd5464.
 2014-07-10 16:46:46 +02:00
def b52afd5464 Add 00Necrid skin 2014-07-10 16:19:56 +02:00
def 4c2e01114f Add back 00Eviltee 2014-07-09 20:01:40 +02:00
def 659651adf7 Add 00Beast skin 2014-07-08 16:56:19 +02:00
def cf40843780 Add back another skin 2014-07-08 16:54:27 +02:00
def 1507abe474 Add skins I accidentally removed 2014-07-08 04:04:20 +02:00
def 7341c73128 Add 00Bibi skin 2014-07-08 03:29:55 +02:00
def f7f5c24fcd Remove unused and bad skins 2014-07-08 03:26:25 +02:00
def 3f4efa5898 Rename cube_personal skin to oldman 2014-07-08 02:22:26 +02:00
def d12f4d95fa New skin 2014-07-03 19:28:33 +02:00
def 7ddbf78de4 New PPRace skins by whis 2014-07-03 02:32:11 +02:00
def 329d448648 New skin 2014-07-01 17:57:40 +02:00
def 844e7d23f7 Add new skin by MobyDog 2014-06-29 20:37:54 +02:00
def d023db5dfd Zed -> 00Zed 2014-06-25 14:31:20 +02:00
def ca160bad1d New skin Zed by Nigel 2014-06-25 12:16:21 +02:00
def 7e43084548 Remove ugly DDRace start line 2014-06-24 16:33:02 +02:00
def b5044ea832 Add some nice Teeworlds 0.7 mapres 2014-06-24 16:32:54 +02:00
def 6af468b5c3 New skins by chew 2014-06-24 00:02:21 +02:00
def 99c74b5311 Fix wall jumps 2014-06-22 00:50:11 +02:00
def 180ccb768d Remove space in skin 2014-06-14 09:49:19 +02:00
def 0549e1ef62 New skin 2014-06-07 17:32:16 +02:00
def d8ff93bc85 New BB skins 2014-06-07 02:10:13 +02:00
def 51f1633549 New skin 2014-05-25 03:25:28 +02:00
def 477efde171 New skin for Amol 2014-05-23 19:28:13 +02:00
def a8ad349ed8 New skin 2014-05-19 00:20:09 +02:00
def f495c4abec New skins 2014-05-11 20:59:52 +02:00
def a889a4c2b2 New arrow 2014-05-05 19:57:21 +02:00
def fe789f3b78 Add new skin 2014-05-03 15:17:44 +02:00
def 489c148f91 New ddnet-tiles 2014-04-28 18:54:50 +02:00
def 0508d547b8 New ddnet-tiles 2014-04-28 16:37:47 +02:00
def 378d613de9 Add tee directions 2014-04-26 21:00:14 +02:00
def e5a2f5412e Add aqua skin 2014-04-16 15:25:20 +02:00
def 72a8c581a2 Fix shotgun_strength in tune zone 2014-04-14 22:15:48 +02:00
def b489aa5237 Remove unwanted skin 2014-04-14 15:42:30 +02:00
def 29db455131 Multiline tune zone messages 2014-04-13 19:27:08 +02:00
def a285751c5f Fix: Bullets should still work 2014-04-05 16:17:05 +02:00
def 3c8a55c743 Readd gravity map 2014-03-30 16:41:06 +02:00
def 3fc879728a Change example map to Kobra 2014-03-29 18:28:49 +01:00
def 8db3ad04f0 Remove gravity map 2014-03-29 18:24:01 +01:00
def a7d5ebe412 Remove duplicate skin 2014-03-29 18:12:37 +01:00
def 3818ceb5fd New skins from Moby Dog (thanks SBL) 2014-03-27 11:22:21 +01:00
def 82027bc3a6 New BB skins 2014-03-27 01:38:05 +01:00
def c98ad5bf22 Merge branch 'new' into DDRace64 
Conflicts:
	src/game/editor/layer_tiles.cpp
 2014-03-23 23:18:43 +01:00
def f6a86ca75e Corrent entities_clear 2014-03-23 17:55:06 +01:00
HMH e8a7e28f69 updated entities_clear.png for tuningzones 2014-03-23 17:10:49 +01:00
HMH a26106f132 added gravity.map with gravity.cfg as test and example map 2014-03-23 17:10:49 +01:00
HMH c7e52211d7 merged tunelayer: added Buttons, put an Image for the tunelayer took over most code from other layers and adapted for tunelayer 2014-03-23 17:10:48 +01:00
def 699eb0f27a New skins 2014-03-23 03:37:09 +01:00
def d4c20c8927 Revert freeze entity when playing with entities 2014-03-13 21:18:40 +01:00
def 64835db8ae New (old) deep-unfreeze tile 2014-03-09 21:16:11 +01:00
def 08d2335572 New BB skins 2014-03-05 22:19:49 +01:00
def 8bde63bd5c New freeze in editor too 2014-02-26 14:19:34 +01:00
def fb98c4e5bd Remove duplicate skin 2014-02-26 03:12:12 +01:00
def e2d7b1c3ff Bandana Brothers update 2014-02-26 01:21:20 +01:00
def 6741b00212 New unfreeze entity 2014-02-25 20:18:24 +01:00
def 1baa44009e Dilate round-tiles 2014-02-21 20:57:08 +01:00
def de5c1d4741 ddnet-walls (by Broken) 2014-02-19 22:44:19 +01:00
def 714e617eba New BandanaBrothers skins 2014-02-19 00:02:38 +01:00
def 966b0770ec Tile redesign 2014-02-12 20:24:04 +01:00
def 90fa601a2f Skins 2014-02-10 01:52:23 +01:00
def 42ed2807cb Add penalty tile 2014-02-09 23:31:29 +01:00
def bf4ba56b05 Oops 2014-02-05 20:10:52 +01:00
def c4e0cca046 Fix +showhookcoll when player hooking is disabled 2014-02-05 03:39:09 +01:00
def ef406f2f0b Oops 2014-02-03 21:25:29 +01:00
def 618a5986cb Add very important skin 2014-02-03 02:33:05 +01:00
def eca83be1ee Dilate files 2014-02-01 22:21:00 +01:00
def 391232017a Add evil checkpoint teleports 2014-02-01 22:20:41 +01:00
def ff3b76af61 Add NoLaser tile to entities 2014-01-26 22:13:37 +01:00
def 5bfda18aea OS X server changes 2014-01-16 20:23:00 +01:00
def 1e1ef2843d Improved ddnet-tiles 2014-01-15 14:29:36 +01:00
def f8158bfa83 Improved ddnet-tiles 2014-01-15 14:12:51 +01:00
def 865509f266 New BB skins 2014-01-12 04:45:16 +01:00
def 7deb1ec6e6 Very bad ddnet-tiles rules for automapping 2014-01-10 19:29:05 +01:00
def 4f0c61716c Better Scoreboard 2014-01-10 18:15:26 +01:00
def 3dc996e3cc New ddnet-tiles by phacrum and 645654 2014-01-06 15:19:00 +01:00
def 7da88b06fa Name fix 2014-01-01 15:06:06 +01:00
def 4b5785d45b Add ddnet-tiles and rules 2013-12-28 01:09:40 +01:00
def ea6f6c0e37 Add fadeout tiles and automapper rules for them 2013-12-27 18:33:46 +01:00
def f22a1f6050 Auto mapper: Rules for Freeze, Unfreeze, Tele with grass_main 2013-12-27 18:33:26 +01:00
def 83dd6ddf83 Add languages 2013-12-26 18:51:18 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
def e3559581b2 New skins 2013-12-09 22:48:41 +01:00
def d1a584b4af Add jetpack tile 2013-11-22 15:10:55 +01:00
def 9c4432dba9 New skins 2013-10-30 09:27:06 +01:00
def 0ede3492ce Skin update 2013-10-25 03:22:49 +02:00
def 8979ebb075 Update BB skins 2013-10-18 14:55:24 +02:00
def b5ba5b172a Remove stupid skin 2013-10-18 14:52:07 +02:00
def 40569651fb More entities fix 2013-10-15 17:28:42 +02:00
def 585d1d5c1a Further entities cleanup 2013-10-15 15:13:27 +02:00
def 8354478125 Enitties fix 2013-10-15 14:48:40 +02:00
def 45b8939c35 Better entities 2013-10-14 01:40:04 +02:00
def 302c0106d8 improve entities 2013-10-11 16:00:07 +02:00
def f0b6ff9c4c Readd chat sounds and add option to disable them 2013-10-08 17:23:00 +02:00
def 97cf635e75 Remove 2nd Default skin 2013-10-08 00:35:03 +02:00
def 2813ff3155 Fix entities 2013-10-07 23:56:08 +02:00
def eb3580f257 Add skins 2013-10-07 23:55:51 +02:00
def 0d7b918361 New entities 2013-10-07 15:36:15 +02:00
def 6da8d2146c New mapping entity: Specify number of jumps 2013-08-24 01:03:45 +02:00
def bf518df74d New teleport entities 2013-08-13 04:59:25 +02:00
def 4987b26b7b Fix prediction 2013-08-05 19:58:51 +02:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
def f097b32c2c Remove stupid sound files 2013-07-11 17:16:35 +02:00
chingis eedd4fed0d Update kyrgyz.txt 2013-04-20 05:05:41 +06:00
chingis 1a5e22dbcc Update kyrgyz.txt 2013-04-19 19:23:01 +06:00
oy 7e8374447a switched filenames of highlight and client chat message to prevent some misunderstanding there. #966 2013-03-20 22:38:06 +01:00
chingis e25a002fa4 kyrgyz.txt 
kyrgyz translation
 2013-02-28 17:28:45 +06:00
chingis 5de3192c27 Update index.txt 
add kyrgyz
 2013-02-28 17:27:12 +06:00
Shereef Marzouk 9e3cd78369 obst skins (Closes #211) 2013-02-03 20:11:57 +02:00
Shereef Marzouk 531a59123b missing tele tile 2013-02-02 03:25:45 +02:00
Shereef Marzouk ba3c1f36db Added beast.png and veteran.png skins by whis 2013-02-01 10:28:02 +02:00
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