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
11188 commits 1 branch 428 tags 413 MiB
Commit graph

11188 commits

This branch
This branch
All branches
Author SHA1 Message Date
def f92a4753c3 Version 15.0.4 2020-09-20 01:51:55 +02:00
def cc2f05b6df Revert "Implement on-demand skin downloader (fixes #1166)" 
This reverts commit 3cc1e47ec4.
 2020-09-20 01:51:23 +02:00
def 4ad0f61a00 Revert "Fix skin prefix search crash" 
This reverts commit 1270434f5e.
 2020-09-20 01:49:58 +02:00
def 833e3640b4 Revert "Fix clang-format" 
This reverts commit f42a5a0431.
 2020-09-20 01:49:26 +02:00
def a7f5627df3 Revert "Remove non-free skins by Lappi (fixes #2547)" 
This reverts commit 7b2c71435d.
 2020-09-20 01:49:16 +02:00
bors[bot] ea1a7934e5
Merge #2878 
2878: Max images (fixes #2148) r=def- a=Jupeyy



Co-authored-by: Jupeyy <jupjopjap@gmail.com>
 2020-09-19 20:50:04 +00:00
bors[bot] 5d7f9698ca
Merge #2879 
2879: Use submodule option. Fix #2792 r=def- a=Learath2



Co-authored-by: Emir Marincic <learath2@gmail.com>
 2020-09-19 20:05:47 +00:00
Jupeyy a1eb5dc114 Max images(for editor, clamp for client and warning for mapconvert) (fixes #2148) 2020-09-19 21:22:21 +02:00
Emir Marincic af3f167f49
Use submodule option. Fix #2792 2020-09-19 22:16:10 +03:00
bors[bot] 04ea24b4f8
Merge #2869 
2869: Fix MouseInside to only select one field (fixes #2868) r=Jupeyy a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-09-19 19:12:02 +00:00
bors[bot] 79b1825000
Merge #2876 
2876: Init curl first, then call curl_version_info r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-09-19 19:05:50 +00:00
def f4d763c895 Init curl first, then call curl_version_info 2020-09-19 15:10:32 +02:00
Jupeyy 5208a588b8 Add unmasked entities for all mods 2020-09-19 14:44:24 +02:00
12pm aa18dc1d88 remove for more info 2020-09-19 13:40:19 +02:00
12pm f3bef4919f mention rules 2020-09-19 13:28:30 +02:00
def c31fc33cf2 Fix MouseInside to only select one field (fixes #2868) 2020-09-19 11:50:33 +02:00
bors[bot] e07b430700
Merge #2866 
2866: Update italian language translation r=def- a=iTzMeRafa



Co-authored-by: Rafael Carneiro <36051055+iTzMeRafa@users.noreply.github.com>
 2020-09-19 06:22:08 +00:00
Rafael Carneiro 85f47fabc0
Merge branch 'master' into master 2020-09-19 03:36:07 +02:00
Rafael Carneiro ce96178f15
Update italian.txt 2020-09-19 02:43:39 +02:00
Rafael Carneiro 843e814dfd
Update italian.txt 2020-09-19 02:42:39 +02:00
bors[bot] 6ae7b19c4a
Merge #2865 
2865: Fix localizing demo list r=Jupeyy a=def-

You can't store the result of Localize in a static, it will be removed
by switching to another language.

Thanks to Jupeyy for report

Co-authored-by: def <dennis@felsin9.de>
 2020-09-18 21:42:20 +00:00
def 1cf68d7191 Fix localizing demo list 
You can't store the result of Localize in a static, it will be removed
by switching to another language.

Thanks to Jupeyy for report
 2020-09-18 23:33:51 +02:00
Dennis Felsing 1d7c7aa30f
Merge pull request #2860 from QingGo/fix-ws-lookup 
fix localhost lookup problem when ws enable
 2020-09-18 17:14:44 +02:00
清歌 7ab35dc55e fix localhost lookup problem when ws enable 2020-09-18 23:02:25 +08:00
bors[bot] 32b0e52ebb
Merge #2859 
2859: fix websockets behavior in net_socket_read_wait r=def- a=QingGo



Co-authored-by: 清歌 <zyqingjohn@qq.com>
 2020-09-18 13:30:44 +00:00
清歌 059a2a0a35 fix websockets behavior in net_socket_read_wait 2020-09-18 21:28:17 +08:00
Dennis Felsing 4317cb7af8
Merge pull request #2855 from def-/pr-kill-server-on-quit 
Kill server on quit
 2020-09-18 08:04:44 +02:00
def 848c8c992c Version 15.0.3 2020-09-18 07:57:54 +02:00
def 427450ddc3 Demo viewer: Ignore shortcuts when popup is open 
As reported by Shyzo on Discord
 2020-09-18 07:57:43 +02:00
Dennis Felsing 28d0f2c842
Merge pull request #2856 from Jupeyy/pr_fix_15.0 
Fix skin prefix search crash
 2020-09-18 07:46:43 +02:00
Jupeyy 1270434f5e Fix skin prefix search crash 2020-09-18 06:27:18 +02:00
def 46b21020be Kill server on quit 
As suggested by Ryozuki
 2020-09-18 00:30:31 +02:00
def 3983bfeeef Version 15.0.2 2020-09-17 23:12:33 +02:00
def 9717d032ff Don't call atexit in forked process 2020-09-17 22:19:13 +02:00
def 6481138345 Add Russian update by gerdoe 2020-09-17 22:04:50 +02:00
def d5648f5cde Fix localizing in browser 
Thanks to gerdoe for noticing
 2020-09-17 21:54:24 +02:00
def 94f307aaaf Update persian.txt too 2020-09-17 21:38:44 +02:00
def 3945ae4a63 Update German translation 2020-09-17 21:20:02 +02:00
def 9da149f84b Localize control settings 2020-09-17 21:18:33 +02:00
def 003192eb12 Default to autoupdater off 2020-09-17 21:11:28 +02:00
def 2221881f79 Version 15.0.1 2020-09-17 21:06:55 +02:00
def da4a8c704b Fix running server from other directory 2020-09-17 21:06:02 +02:00
def 5e60526c18 Update translations 2020-09-17 21:05:07 +02:00
def f2ec3c4f0a copy-paste error 2020-09-17 18:58:47 +02:00
def 41996fe672 OSX libwebsockets linking fix 2020-09-17 18:35:35 +02:00
Dennis Felsing 8ad64820ef
Merge pull request #2830 from def-/pr-15 
Version 15.0
 2020-09-17 18:34:59 +02:00
Dennis Felsing 514e974667
Merge pull request #2849 from def-/pr-max-requests 
Increase br_max_requests to 100
 2020-09-17 18:34:44 +02:00
bors[bot] 93e592dcd9
Merge #2813 
2813: Sort spectator view by team, then name (not score) (fixes #2808) r=Jupeyy a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-09-17 16:07:28 +00:00
def 3e58d8b756 Increase br_max_requests to 100 
As suggested by BannZay on Discord. We scale down when we notice that
no responses arrive. The idea is that player's internet has become
faster than when DDNet started, so increasing the default is ok.
 2020-09-17 17:41:14 +02:00
bors[bot] 557c212c14
Merge #2848 
2848: fix websockets client link problem in xp r=def- a=QingGo

implement a simple version of inet_ntop by myself. I only check that it can work at MacOS. No way for me to check if it work at windows xp now.

Co-authored-by: 清歌 <zyqingjohn@qq.com>
 2020-09-17 15:32:32 +00:00