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

11166 commits

This branch
This branch
All branches
Author SHA1 Message Date
def 5f4ed14c17 Add Sunny Side Up map 
Licensed by Ravie via Discord DM
 2020-09-22 16:36:44 +02:00
def 1b39526ba3 Add Tsunami map 
Licensed by Ravie via Discord DM
 2020-09-22 15:21:18 +02:00
def c6ef987521 Add LearnToPlay so we have at least two maps 
Licensed by Tridemy and Cøke via Discord DM
 2020-09-22 14:22:06 +02:00
bors[bot] 9e23623fa1
Merge #2874 
2874: Add unmasked entities for all mods r=def- a=Jupeyy

Fixes switch tile for unmasked ddnet
And ddnet mods send that they are a race and ddrace mod appearently?
Not very intuitive that ddnet is a superset of them, bcs tiles changed.

Waiting for a review from @fokkonaut 

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
 2020-09-21 20:46:51 +00:00
bors[bot] 481a56da2a
Merge #2899 
2899: Editor: Select game layer by default (fixes #2834) r=Jupeyy a=def-

Since it's the most important layer

Co-authored-by: def <dennis@felsin9.de>
 2020-09-21 20:23:56 +00:00
bors[bot] d61c97370f
Merge #2896 
2896: Add edit box to write skin name, Add link to Skin Database r=Jupeyy a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-09-21 17:50:09 +00:00
bors[bot] adf4103bd3
Merge #2895 
2895: Reload skin menu when skin count changed r=Jupeyy a=def-

fixes graphics bug when new skins are added, skins array is reallocated and we accessed freed memory

Thanks to Jupeyy & Learath2 for also looking into this

Screenshot of the bug for reference, reproduced by removing all skins in data/skins, opening skin menu, joining a full server and waiting a bit:
![screenshot-20200921@005129](https://user-images.githubusercontent.com/2335377/93745612-1cae5300-fbf4-11ea-8b9f-887f0f46f7a6.png)


Co-authored-by: def <dennis@felsin9.de>
 2020-09-21 17:43:08 +00:00
def ddb88c6f3b Editor: Select game layer by default 
Since it's the most important layer
 2020-09-21 19:36:28 +02:00
def a273969bc1 Fix clang-format 2020-09-21 10:44:13 +02:00
def d17e0e4819 Add link to Skin Database 2020-09-21 10:39:42 +02:00
def f9e66f0b41 Add edit box to write skin name 2020-09-21 10:35:13 +02:00
def 3276f2925d Reload skin menu when skin count changed 
fixes graphics bug when new skins are added, skins array is reallocated
and we accessed freed memory

Thanks to Jupeyy & Learath2 for also looking into this
 2020-09-21 10:19:54 +02:00
bors[bot] b3307dc2a6
Merge #2886 
2886: Update brazilian_portuguese.txt r=def- a=rffontenelle



Co-authored-by: Rafael Fontenelle <rffontenelle@users.noreply.github.com>
 2020-09-20 16:38:16 +00:00
Rafael Fontenelle 45454cb760
Update brazilian_portuguese.txt 2020-09-20 11:03:41 -03:00
bors[bot] 4cbcde06e5
Merge #2872 
2872: mention rules r=edg-l a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2020-09-20 10:22:52 +00:00
bors[bot] 15292cd1f3
Merge #2880 
2880: Some browser improvements r=edg-l a=def-

![screenshot-20200919@220208](https://user-images.githubusercontent.com/2335377/93688185-4cf6d400-fac4-11ea-809b-1d857a97d7a6.png)
![screenshot-20200919@220156](https://user-images.githubusercontent.com/2335377/93688190-4e280100-fac4-11ea-9b02-7f4123f1ad31.png)
- 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
- Search and Exclude no longer so dark

Co-authored-by: def <dennis@felsin9.de>
 2020-09-20 10:02:22 +00:00
def 5cc826d6f5 edit box: only highlight x when hovering it 
not when hovering the text field itself

Thanks to Ryozuki for report
 2020-09-20 11:52:17 +02:00
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
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