edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-05 15:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
11146 commits 1 branch 428 tags 411 MiB
Commit graph

11146 commits

This branch
This branch
All branches
Author SHA1 Message Date
def a99b673042 Some browser improvements 
- Increase size of Name and Clan in adding friend fields
- Smaller Search and Exclude fields
- No more duplicate Search - Search - Search text
- Smaller Connect and Refresh buttons
 2020-09-20 11:47:04 +02:00
bors[bot] d4c14505bf
Merge #2883 
2883: Ask for confirmation before placing border tiles r=def- a=Fireball-Teeworlds

Fixes #2823 

Co-authored-by: Fireball <fireball.teeworlds@gmail.com>
 2020-09-20 09:36:55 +00:00
Fireball bb2be60a08 Ask for confirmation before placing border tiles (fixes #2823) 2020-09-20 01:42:07 +01:00
bors[bot] c2f388a52b
Merge #2882 
2882: Skin reactive with fix for prefix r=Jupeyy a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-09-20 00:31:09 +00:00
def 4e157c64e3 clang-format fix 2020-09-20 02:24:51 +02:00
def dfa072353d Fix skin lookup 
Thanks for Jupeyy for looking into this with me
 2020-09-20 02:19:58 +02:00
def 61f89533c5 Clean up skin downloader code a bit 
Was trying to find what's causing the issues with skin downloader, but
didn't find anything suspicious.
 2020-09-20 02:19:49 +02:00
def 591dfb0d02 Revert "Revert "Remove non-free skins by Lappi (fixes #2547)"" 
This reverts commit a7f5627df3.
 2020-09-20 02:19:37 +02:00
def 8ef6a0da16 Revert "Revert "Fix clang-format"" 
This reverts commit 833e3640b4.
 2020-09-20 02:19:32 +02:00
def 1d868fec70 Revert "Revert "Fix skin prefix search crash"" 
This reverts commit 4ad0f61a00.
 2020-09-20 02:19:28 +02:00
def a09be98df9 Revert "Revert "Implement on-demand skin downloader (fixes #1166)"" 
This reverts commit cc2f05b6df.
 2020-09-20 02:19:24 +02:00
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
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