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

1058 commits

Author SHA1 Message Date
Dennis Felsing 92616f1a55
Merge pull request #2664 from ddnet/pr-revert-revert 
Revert "Revert Jupeyy's OpenGL changes" (fixes #2659)
 2020-08-30 10:55:15 +02:00
def 3767eebead Update entities by Soreu (fixes #2652) 2020-08-30 09:39:49 +02:00
bors[bot] a6738d9fd6
Merge #2635 
2635: We don't just list countries, but also regions like EU  r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-08-29 10:37:52 +00:00
def e9edca65e9 Update translations for chinese and german 2020-08-29 12:34:59 +02:00
def fa7ed8ceb9 Add new "Country / Region" word to language files 2020-08-29 12:32:08 +02:00
def c85ffb90af Revert "Revert Jupeyy's OpenGL changes" 
This reverts commit 3eab3f5eb7.
 2020-08-29 12:10:53 +02:00
def 3eab3f5eb7 Revert Jupeyy's OpenGL changes 
Emergency-revert for 14.5.1 release, too many problems
 2020-08-26 20:03:22 +02:00
Dennis Felsing 5ffcab127f Add back Vanilla maps for compatibility (fixes #2643) 2020-08-25 21:49:33 +02:00
bors[bot] 694db44ee2
Merge #2598 
2598: Allow specifying an OpenGL version manually r=def- a=Jupeyy

Ofc don't merge, we'll test it first, and if we want merge it, i'd need to enable shader compability for OpenGL 4+, and general support for OpenGL 3.1 and 3.2(bcs i think they already don't allow some older GL commands).

Also i never really read in the OpenGL 1.x specification, i remember that older OpenGL versions required glBegin and stuff like that

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
 2020-08-25 15:35:30 +00:00
Jupeyy a07e9ac2cf Add OpenGL 1.x, 2.x, 3.x support (fixes #2619) (fixes #2607) 2020-08-22 10:22:51 +02:00
Arda Demir 276fcf4ce7 Update turkish language 2020-08-22 01:22:03 +03:00
Dennis Felsing dbb9c662ba
Merge pull request #2617 from Jupeyy/pr_font_fallback 
Font fallback
 2020-08-20 20:34:48 +02:00
Arda Demir 0437f71507 Update turkish translate 2020-08-20 16:45:51 +03:00
def 178d864ec9 Switch to Source Han Sans font 2020-08-20 13:55:03 +02:00
heinrich5991 dd2662b4b8
Merge branch 'master' into pr-cert 2020-08-20 11:38:59 +02:00
def 446526486d Use two fonts, one as explicit fallback 
Merging with fontforge had problems, for example for the Bei (U+5317) in
Beijing, see https://github.com/fontforge/fontforge/issues/4432
 2020-08-20 11:13:08 +02:00
bors[bot] f8098ba05c
Merge #2613 
2613: Update chinese translation r=def- a=TsFreddie



Co-authored-by: TsFreddie <tsfreddiewang@gmail.com>
 2020-08-20 08:27:51 +00:00
TsFreddie 7f5a9726a2 update reviewed strings from Dan_cao 2020-08-20 09:16:00 +01:00
bors[bot] 60b7f8430d
Merge #2611 
2611: Add bomb skin (by Ravie) r=heinrich5991 a=def-

License given publicly on Discord

Co-authored-by: def <dennis@felsin9.de>
 2020-08-20 00:11:40 +00:00
TsFreddie 8a2009f586 Update chinese translation 2020-08-20 01:07:49 +01:00
def 7c65b89fd2 Add bomb skin (by Ravie) 
License given publicly on Discord
 2020-08-19 23:06:39 +02:00
MikiGamer 8fd016242a
Update bosnian.txt 2020-08-19 19:07:56 +02:00
MikiGamer c8504982f8
Update bosnian.txt 2020-08-19 18:56:16 +02:00
def c458ee52b0 Remove need for custom certificate 
in anticipation of using CloudFlare
 2020-08-19 17:54:05 +02:00
bors[bot] 607f5f0014
Merge #2594 
2594: Add support for PLATFORM_SUFFIX define, Don't bother Steam users with red update text r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-08-19 13:33:14 +00:00
Dennis Felsing 924ed78ee4
Merge pull request #2589 from def-/pr-serbian 
Update Serbian translation by Kingston
 2020-08-19 14:31:19 +02:00
def 1f377469f4 Remove unused translation text 2020-08-19 13:41:52 +02:00
bors[bot] 8b41dca059
Merge #2602 
2602: Merge DejaVuSansCJKName with DejavuWenQuanYiMicroHei and use it for all (fixes #2593) r=Learath2 a=def-

allows reading CJK for everyone independent of language chosen.

got them merged with fontforge, finally looks good.

Hopefully the lags are gone.

Co-authored-by: def <dennis@felsin9.de>
 2020-08-19 11:35:10 +00:00
def 1394ac0fc4 Merge DejaVuSansCJKName with DejavuWenQuanYiMicroHei and use it for all (fixes #2593) 
got them merged with fontforge, finally looks good.

allows reading CJK for everyone independent of language chosen.

Hopefully the lags are gone.
 2020-08-19 12:31:55 +02:00
Jupeyy 7450e354de Add OpenGL 4.x support & cleanup 2020-08-19 08:42:09 +02:00
Andrii 34035eb5a8 update ukrainian localization 2020-08-18 23:49:05 +03:00
def 9b1c071396 Update Serbian translation by Kingston 2020-08-18 12:18:19 +02:00
bors[bot] ac1649d13b
Merge #2579 #2588 
2579: Ship map_convert_07 executable, allow drag'n'drop and ship Gold Mine map (with sixup version) instead of Kobra 4 and Goo! r=def- a=def-



2588: Add instructions about how to kill and pause game r=def- a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-08-18 08:52:26 +00:00
def 4da0592d78 Replace Kobra 4 and Goo! with Gold Mine 
and add maps7 version
 2020-08-18 10:47:17 +02:00
def b767564f61 Update German translation 2020-08-18 10:35:41 +02:00
def d2cdfe493b Update translation files 2020-08-18 10:35:34 +02:00
bors[bot] d04dc8a405
Merge #2574 
2574: Allow PaladiN skin to use custom colors r=def- a=d3fault

Hey @def- what png optimizer did you use? The ones I tried either didn't get the file as small as yours, or mucked up the transparency :(. Feel free to optimize and push to my branch (but I'm still kinda curious which one you used)

Co-authored-by: d3fault <d3fault@d3fault.net>
 2020-08-16 20:45:03 +00:00
d3fault 94d0954620 Allow PaladiN skin to use custom colors 2020-08-15 02:08:14 -07:00
heinrich5991 63c26d25ee Add back skins by Moby Dog 2020-08-14 17:43:19 +02:00
Nyte_BK201 31cbce81df Complete simplified Chinese translation; Fix some translation errors 2020-08-14 14:33:33 +08:00
def 7172305657 Update language files ("Client message") 
As noticed by TortiLeq
 2020-08-12 11:55:56 +02:00
bors[bot] 3108b51ff1
Merge #2555 
2555: Pr chinese translation r=def- a=plsplsplslol

found some problems with chinese translation

Co-authored-by: plsplsplslol <alpootagpro@gmail.com>
 2020-08-10 21:34:53 +00:00
plsplsplslol 9787f20e52 fixed translation because the original translator thought that this was supposed to mean a person left the game 2020-08-10 14:20:54 -07:00
plsplsplslol b56cd3f166 removed the s 2020-08-10 14:18:33 -07:00
def d08535684e Move skins license information to its own file 2020-08-10 18:23:31 +02:00
def 7be7160d9b Remove unlicensed skins (fixes #2518) 
and mention skin licenses (fixes #2544)

Still missing: Which skin is by btd?
 2020-08-09 15:07:08 +02:00
def 802c97a79d Remove IP skin 
Apparently that's a pokemon, definitely can't use that one
 2020-08-08 13:10:59 +02:00
def 4873536d93 Polish update by TortiLeq 2020-08-02 00:03:22 +02:00
Dennis Felsing 4d496f6774
Polish update by TortiLeq 2020-07-21 23:57:28 +02:00
def 478d7434b2 Persian update by Quick 
and regenerate translation files while at it
 2020-07-11 23:21:34 +02:00
def 59243c0588 Update French translations (by SunnyPistache & Pipou) 2020-07-10 00:34:17 +02:00
Edgar a5e8fc55fc
fix some spanish translations 2020-07-09 12:45:14 +02:00
bors[bot] 8a3743fa90
Merge #2474 #2476 
2474: Remove IP skins r=heinrich5991 a=def-



2476: Use x instead of y in show distance (fixes #2475) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-07-08 20:39:01 +00:00
def d9c89d4e44 Remove IP skins 2020-07-08 22:04:54 +02:00
def 5eecbeef31 Revert "Update polish 07/07/20" 
This reverts commit 8940b81777.
 2020-07-08 16:42:59 +02:00
heinrich5991 4e2ea97531 Fix a few inconsistencies in the French translation 2020-07-08 13:31:46 +02:00
heinrich5991 99d02b9a15 Revert "Update french 07/07/20" 
This reverts commit 8d4658d112.
 2020-07-08 13:18:46 +02:00
FeaRZ 8d4658d112
Update french 07/07/20 
Fixed some translations, and what was missing are already translated.

Fix 1: Line 244
Fix 2: Line 241
Fix 3: Line 265
Fix 4: Line 573
Fix 5: Line 585
Fix 6: Line 609
Fix 7: Line 867
Fix 8: Line 942
Fix 9: Line 1050
Fix 10: Line 1071
Fix 11: Line 1209
 2020-07-07 17:40:04 -04:00
FeaRZ 133f92c66d
Update spanish 07/07/20 
Little changes.

Fix1: Line 866 (V instead of v)
Fix2: Line 869 (O instead of o)
Fix3: Line 1190 (Agarrar)
Fix4: Line 423 ("Apariencia" instead of HUD)
Fix5: Line 252 ("Mensaje del día" instead of MOTD)
 2020-07-07 12:10:05 -04:00
FeaRZ 8940b81777
Update polish 07/07/20 
Fix1: Finished the last two missing translations.
Fix2: Fixed 1 empty translation.
 2020-07-07 11:18:52 -04:00
Edgar 7c984b5c0c
Update catalan translation 2020-07-07 10:58:55 +02:00
def c6a0698805 Add Russian translations by barsik 2020-07-07 09:11:43 +02:00
def 6fce212545 Fix typo in spanish translation 2020-07-07 09:05:13 +02:00
FeaRZ d16b46b496
Finished what was left to translate in Spanish 
Translated from line 658 to line 1199. Finished what was left to translate in Spanish.
 2020-07-06 23:25:03 -04:00
def 9093e9aca5 Fix polish translation typo (by TortiLeq) 2020-07-05 23:56:05 +02:00
def a451b08e11 Fix hungarian translation typo (by Cellegen) 2020-07-05 23:54:53 +02:00
heinrich5991 6ff3167a6a Add translations by Jeroen and gigi7187 2020-07-03 00:56:47 +02:00
3edcxzaq1 ab3bbc4337 Update Swedish translations 2020-07-01 11:42:49 +02:00
def 00673e53f4 Add hungarian translation by Cellegen (fixes #2428) 2020-06-30 21:43:39 +02:00
def e8feba8afd Lost some polish translations by TortiLeq, restore 2020-06-30 21:38:53 +02:00
def 73dcd08f5d Update German translation 2020-06-30 21:38:15 +02:00
def 9a87068184 Regenerate language files 2020-06-30 21:38:15 +02:00
bors[bot] de8cc79578
Merge #2389 
2389: Ignore emoticon of spammy players (fixes #2387) r=heinrich5991 a=def-

Controlled with the regular ignore chat button in players menu

Co-authored-by: def <dennis@felsin9.de>
 2020-06-29 12:09:48 +00:00
def cb7a8a3f5e Add gui_icons.png by Ravie 2020-06-28 09:38:39 +02:00
def 6635ce210a Switch order in gui_icons.png, add icon by barsik 2020-06-27 19:44:57 +02:00
def 7d1e67eb44 Fix first lines to start with # 2020-06-27 12:58:55 +02:00
def 7608eb67d6 Ignore emoticon of spammy players (fixes #2387) 
Add ignore emoticon button in player menu.
Someone needs to draw the graphic for that.
 2020-06-27 01:15:09 +02:00
def 3278002ac7 Remove comments in language files 2020-06-26 23:27:49 +02:00
def a1f9222f50 Add German translation 2020-06-26 18:42:46 +02:00
def d77bf206dc Regenerate language files 2020-06-26 18:38:41 +02:00
def 2d6e56fec8 Translation fixes 
- Code didn't work with newlines, get rid of them
- Some stylistic improvements
 2020-06-26 18:34:50 +02:00
def 853d312436 Update polish translation by TortiLeq 2020-06-26 13:22:30 +02:00
sven 9d0bae9769 Fix unused translation 2020-06-26 02:49:35 +02:00
sven d6ba7863c8 Update Swedish translations 2020-06-25 18:22:20 +02:00
Nyte_BK201 6d11aeec81 Add 14.0 Simplified-Chinese translation; Edit few translation errors 2020-06-25 07:17:13 +08:00
def f51a443998 Merge remote-tracking branch 'edg-l/pr_show_spec' 
Update x_spec with the more minimal version by HiRavie
Fix CMakeLists.txt
 2020-06-24 09:55:59 +02:00
Edgar 3f476171f1
change to white and use colors 2020-06-22 18:43:49 +02:00
Edgar f3466e05ba
Show /spec tees with a dashed skin 2020-06-21 17:48:33 +02:00
def c64691db01 Update translation files 
With:

  for i in data/languages/*.txt; do scripts/languages/copy_fix.py $i $i.$$.tmp --delete-unused --append-missing && mv $i.$$.tmp $i; done
 2020-06-21 01:18:42 +02:00
bors[bot] 98b448ebcc
Merge #2247 
2247: Thread safe SQL interaction r=def- a=Zwelf

This PR intends to make the database interaction thread safe and optimizes some SQL queries. This is still a WIP, but since it is a rather big PR I wanted to get feedback early on.

Benefits:

* remove race conditions leading to undefined behavior and potential crashes
* logging game related database results in teehistorian would be possible

Behavior change:

* /top5team prints ranks in reverse order when passing a negative number (like /top5, /top5points)
* Optimize SQL statements for /rank /teamrank /top5 /top5team /points /top5points
* /load without parameters doesn't pass the SQL error to the user (as most other functions)
* Simplify IScore interface
* Add UUID to /save table (update of database schema necessary):
  ```
  ALTER TABLE record_saves ADD SaveID varchar(64);
  ```
* /save immediately kills team and loads it again if the database insert fails.

still TBD:
* [x] saving (team) score when finishing
* [x] loading team save
* [x] loading initial time and birthday check
* [x] /map and random map votes
* [x] RFC: generate a passphrase (2-3 word) if save-code exists or no save-code is given making /save failures much more rare and save-codes more secure
* [x] clean up code (removing now unused structs, ordering of functions in IScore)

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-06-17 19:35:45 +00:00
Zwelf ea31171873 Generate passphrase for save-code 
* when none is given
* if the given save-code already exist
* if the database connection fails therefore it can't be checked if the save-code already exists

Using the short word list from eff:
https://www.eff.org/deeplinks/2016/07/new-wordlists-random-passphrases
 2020-06-15 11:14:15 +02:00
def 2d0340b1cd Add Entites off sign to front layer (fixes #2261) 2020-06-14 16:01:32 +02:00
MikiGamer 95c419d684 BlockWorlds Entities 2020-05-19 16:49:28 +02:00
Rafael Fontenelle 9652ef46f1
Update brazilian_portuguese.txt 2019-12-18 02:51:47 -03:00
bors[bot] 9b8675b774
Merge #1991 
1991: Translate the replay feature to german (+more) r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-12-16 13:41:33 +00:00
清歌 72ac1a2cc8
Add/Optimize some simplified Chinese translations 2019-12-16 19:55:35 +08:00
ChillerDragon b36e010aed Translate the replay feature to german (+more) 2019-12-13 16:37:55 +01:00
Dennis Felsing 0498df2508 Update localizations (Thanks to Cellegen for report) 
- Remove duplicate laser entries
- Update menus_settings.cpp comment for scripts
- Update instructions for scripts
- Run script to get updated localizations
 2019-12-02 09:09:01 +01:00
ChillerDragon 96c9b1ab73 Rename rifle to laser 
This makes it easier to copy code from/to 0.7
23df3c609e
 2019-11-22 15:37:18 +01:00
12pm 36df86fcd2 Add toggle keyboard shortcuts button to demo player 
Demo shortcuts can be annoying if you have other binds on them.

Icons made by eNJi
 2019-10-05 18:06:58 +02:00
def 6394924210 Replace browse_icons (by MiM) (fixes #1880) 2019-08-04 11:17:18 +02:00
Rafael Fontenelle 55ae5e2376
Update Brazilian Portuguese translation 2019-04-06 16:54:34 -03:00
def cc1ce8699b Update language files 
Is this the proper way?

for i in data/languages/*.txt; do scripts/languages/copy_fix.py $i $i.tmp --delete-unused --append-missing --delete-empty && mv $i.tmp $i; done
 2019-04-06 15:19:07 +02:00
Dennis Felsing 1b34283001 Switch verified icon to checkmark again (by MiM) 2019-03-22 07:14:30 +01:00
def 0535f31bea Remove unused norank icon from browse_icons.png 2019-03-19 21:54:47 +01:00
def 4f515bf67e Add symbol for official servers in server browser (fixes #1501) 
- Also fix favorites checkbox when removing favorite
- Might need a nicer looking symbol
 2019-03-19 07:46:50 +01:00
def 6701000931 Rename Score board to Scoreboard for consistency 2019-03-12 19:00:47 +01:00
def 9452851764 Update Hungarian translations (by Cellegen) 2018-12-24 11:03:21 +01:00
Ryozuki 62dbda204e fix entities clear and remove tele-activator from gametile as it doesn't make sense. 2018-11-04 15:50:56 +01:00
Ryozuki 007eb71d2a new tele-activator tiles (edited by Ravie, based on Sonix work) 2018-11-03 10:26:20 +01:00
Ryozuki c831b5e0c1 change tele-blocker to tele-activator 2018-11-03 10:26:18 +01:00
12pm 5a5dc45368 Update GL and LY flags 2018-10-22 18:31:13 +02:00
Ryozuki 183f335606 Improve teleblocker tile, thanks to Ravie 2018-10-22 18:25:08 +02:00
Dennis Felsing a09fa562be
Merge pull request #1314 from timakro/pr_editor_entities_gametypes 
Allow choosing game layer entities for different gametypes, closes #1283
 2018-10-07 23:02:20 +02:00
yangfl 6ead5e6f9c Update Chinese translations 2018-10-07 20:49:30 +08:00
Tim Schumacher 3d7ee89104
Add game layer entities images 2018-10-02 23:24:22 +02:00
Tim Schumacher fd52bc7a26
List all game layer entities images in directory 2018-10-02 23:08:17 +02:00
def d92b7ef6b7 newline 2018-08-25 19:40:18 +02:00
def 23874f8ac2 grass_main automapper fix by Ravie 2018-08-25 19:39:30 +02:00
Dennis Felsing 285b6f1ca7
Merge pull request #1222 from heinrich5991/pr_ddnet_langscripts 
Move language scripts and make them callable from everywhere
 2018-08-09 13:03:54 +02:00
Dennis Felsing eb1b4a8b74 Add back Vanilla maps for compatibility 2018-08-07 08:39:08 +02:00
Jupeyy d7bb03ee19 don't render all border all the time 2018-08-02 18:26:12 +02:00
heinrich5991 3a8cc43e13 Move language scripts to scripts/ 2018-07-25 00:34:02 +02:00
fokkonaut b8b97eb740 added skin prefix (#1218) 2018-07-24 17:26:39 +02:00
Ryozuki 50c84a60f7 add teleport gun/grenade/laser 2018-07-15 10:21:59 +02:00
bors[bot] 861746a641 Merge #1185 
1185: Port lang scripts to Python3 r=heinrich5991 a=rffontenelle

Scripts for managing translations are currently available for Python 2. DDNet already uses Python 3, so it make sense IMO to have these scripts using this version as well.

Co-authored-by: Rafael Fontenelle <rafaelff@gnome.org>
 2018-07-06 12:14:46 +00:00
Rafael Fontenelle 85a15fe442 Port lang scripts to Python3 2018-07-06 08:39:08 -03:00
Rafael Fontenelle 7697f3072b
Update Brazilian Portuguese translation 2018-07-04 07:38:51 -03:00
Edgar 1a83968df2
remove warning 2018-07-04 09:22:21 +02:00
Edgar 3ca0bd4f69
Update catalan translation 2018-07-04 09:20:19 +02:00
Rafael Fontenelle 099e9faafe Remove duplicated "please translate this" comment lines 2018-07-03 20:12:23 -03:00
Rafael Fontenelle 27a15d491a Update translations 2018-07-03 20:00:31 -03:00
Rafael Fontenelle b67d2247b9 Fix Simplified Chinese 
The multiple occurrences of a key string was resulting in failure
when running analyze.py.
 2018-07-03 19:53:21 -03:00
ChillerDragon ba842a9672 Add new freeze automap rule 2018-06-29 15:48:52 +02:00
Dennis Felsing bf772769ad Update portuguese.txt (by Rockus) 2018-04-06 10:46:35 +02:00
Dennis Felsing a01939a6f7 Update portuguese.txt (by Rockus) 2018-04-06 07:34:37 +02:00
David-U-Tang db75df4d92 Change the wrong translation of Simplified Chinese 
“Manual” here should be translated to “手动” or "手动录制" but not "手册"。
 2018-04-03 17:42:07 +03:00
Dennis Felsing ed33557a97
Merge pull request #1081 from Jupeyy/master 
New buffer system and text renderer to support buffering of hud, text and map components, that are displayed ingame
 2018-04-03 10:12:09 +02:00
Jupeyy e642b14c88 add icon font 2018-03-13 21:43:27 +01:00
Jupeyy 91dcab6645 add new shaders for quads,text and sprites 2018-03-13 21:42:05 +01:00
Jupeyy b911ee9044 calcualte texel offset on CPU not GPU 2018-03-13 21:41:37 +01:00
Ryozuki 1230f4e016 update catalan translation 2018-03-12 19:45:55 +01:00
Emir Marincic 4264652573
Fix UI break on portuguese 
This very badly overflows, just "Information" should work fine in this context.
 2018-02-22 22:03:20 +01:00
清歌 360e475d74
Change the wrong translation of Chinese 
Countries should mean “国家” but not "次数"。
 2018-02-04 19:03:53 +08:00
def 151da9af97 Remove Emojis 2018-01-25 20:03:18 +01:00
def 1e5985a4b3 Update portuguese translations by Rockus 2018-01-21 16:50:37 +01:00
Deeper b095c0b864
Update russian.txt 2018-01-20 01:12:11 +03:00
def ae0525a027 Update hungarian translation (by Cellegen) 2018-01-04 20:02:33 +01:00
bors[bot] 27722633a3 Merge #940 
940: Put shaders into the data/ directory r=Learath2 a=heinrich5991

Simplifies a lot of things
 2017-11-15 23:29:55 +00:00
heinrich5991 a3f544a73e Add missing EOL at end of file to shaders 2017-11-09 11:31:13 +01:00