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

14612 commits

This branch
This branch
All branches
Author SHA1 Message Date
def 7032249b26 Fix leak when loading map in editor (fixes #2573) 2020-08-17 00:09:07 +02:00
def 53c43536d5 map_convert_07: Support drag'n'drop 2020-08-16 23:21:00 +02:00
def 99d1c4939a Version 14.3.3 2020-08-16 22:46:22 +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
def cf15ef6cc0 Ship map_convert_07 executable 2020-08-16 22:43:56 +02:00
bors[bot] 3252261b68
Merge #2578 
2578: Add tele checkpoint number to debug r=def- a=plsplsplslol



Co-authored-by: plsplsplslol <alpootagpro@gmail.com>
 2020-08-16 06:05:33 +00:00
plsplsplslol 8abf00b52c move checkpoint to debug 2020-08-15 17:00:02 -07:00
d3fault 94d0954620 Allow PaladiN skin to use custom colors 2020-08-15 02:08:14 -07:00
bors[bot] c900c035d8
Merge #2577 
2577: Add back skins by Moby Dog r=def- a=heinrich5991

CC #2518

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-08-14 16:10:01 +00:00
heinrich5991 63c26d25ee Add back skins by Moby Dog 2020-08-14 17:43:19 +02:00
bors[bot] 220c6b240f
Merge #2575 
2575: Complete simplified Chinese translation; Fix some translation errors r=def- a=Nyte-BK201



Co-authored-by: Nyte_BK201 <linzhy@shanghaitech.edu.cn>
 2020-08-14 06:53:47 +00:00
Nyte_BK201 31cbce81df Complete simplified Chinese translation; Fix some translation errors 2020-08-14 14:33:33 +08:00
bors[bot] 6203362ca5
Merge #2572 
2572: Allow switching weak/strong with saving and loading r=def- a=Zwelf

Fixes #2529  by reverting to the old /load mechanic.

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-08-13 20:45:25 +00:00
Zwelf 52af88826c Allow switching weak/strong with saving and loading 2020-08-13 16:19:07 +02:00
def 2f4eac2cf3 Optimization: Don't calculate with too small fraction 
since it won't add up to anything anyway.

Hopefully doesn't break any physics.
 2020-08-13 13:15:59 +02:00
bors[bot] e6c78ee7e8
Merge #2562 
2562: Update language files ("Client message") r=heinrich5991 a=def-

As noticed by TortiLeq

Co-authored-by: def <dennis@felsin9.de>
 2020-08-13 11:00:39 +00:00
bors[bot] 875bcea1e9
Merge #2571 
2571: Add +resetdummy r=def- a=ardadem

Closes #2053

Co-authored-by: Arda Demir <ddmirarda@gmail.com>
 2020-08-13 08:48:51 +00:00
Dennis Felsing 77473bb326
Merge pull request #2570 from Zwelf/pr-remove-incorrect-check 
Remove incorrect check when inserting team ranks
 2020-08-13 10:32:48 +02:00
Arda Demir 35995322d7 Add +resetdummy 2020-08-13 11:19:13 +03:00
Zwelf f3619c27ee Remove incorrect check when inserting team ranks 
Can be reliable reproduced by finishing in this sequence:

1. A, B
2. A, C
3. B, C <- triggers error

Fixes #2568
 2020-08-13 09:58:56 +02:00
bors[bot] f2cf70c0c7
Merge #2567 
2567: Improve sqlite transfer script r=def- a=Zwelf

Good that I looked over the script again. Additionally fixed that the script tell the user to delete too much after finishing the transfer. To clarify: the backup database `ddnet-server.sqlite` shouldn't be deleted.

Solves #2565 

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-08-12 21:43:31 +00:00
Zwelf ca24611c0c Do not recommend to deleting ddnet-server.sqlite database 
as it might be still in use or there might be even new ranks added to the database
 2020-08-12 23:38:09 +02:00
Zwelf 9848b3c759 SQLite transfer script: Warn if database does not exist yet and handle partially created sqlite tables 2020-08-12 23:38:09 +02:00
def 7172305657 Update language files ("Client message") 
As noticed by TortiLeq
 2020-08-12 11:55:56 +02:00
bors[bot] 4928d52bc9
Merge #2557 
2557: Add SQLite as dependency in README r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-08-12 09:03:31 +00:00
Dennis Felsing c41826d9fd
Merge pull request #2560 from Zwelf/pr-fix-teamrank-not-updating 
Fix team rank not updating after SQLite update
 2020-08-12 11:02:02 +02:00
Zwelf a866c3e9b7 Fix team rank not updating after SQLite update 2020-08-12 10:57:43 +02:00
def 3e0e4bd3a8 Add SQLite as dependency in README 2020-08-12 10:29:01 +02:00
def 048bb992bb Version 14.3.2 2020-08-11 14:07:16 +02:00
def b756eaf6dc Ignore non-existing dll file 
Happened when adding the new sqlite3.dll file.
 2020-08-11 14:07:16 +02:00
Dennis Felsing 5663357fef
Merge pull request #2556 from def-/pr-left-right-editbox 
Editor: Fix Left/right arrow keys when editing text
 2020-08-11 14:05:50 +02:00
def a8aeaa4cb6 Editor: Fix Left/right arrow keys when editing text 
as reported by Silex
 2020-08-11 12:21:33 +02:00
Dennis Felsing d44d596458
Merge pull request #2554 from heinrich5991/pr_ddnet_fix_token 
Fix the same token being generated for each client
 2020-08-10 23:46:03 +02:00
def e0c06464d2 Version 14.3.1 2020-08-10 23:43:10 +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
bors[bot] 62a2271253
Merge #2552 
2552: Flag afk when player timed-out r=def- a=ardadem

Timed out players kills entire team especially on t0 maps. So i just thought we can flag them as afk.

Co-authored-by: Arda Demir <ddmirarda@gmail.com>
 2020-08-10 20:41:31 +00:00
heinrich5991 2db4e2a3c8 Fix the same token being generated for each client 
Theoretically, a regression test would be nice here, but we don't really
have the infrastructure…

This fixes a spoofing vulnerability.
 2020-08-10 22:38:49 +02:00
Arda Demir fabc194081 Flag afk when player timed-out 2020-08-10 21:59:31 +03:00
Dennis Felsing 8239836a02
Merge pull request #2548 from def-/pr-skins-license 
Move skins license information to its own file
 2020-08-10 19:36:56 +02:00
Dennis Felsing 0403e772ad
Merge pull request #2549 from def-/pr-for-loop-c 
Satisfy old C standard
 2020-08-10 19:35:38 +02:00
bors[bot] 2d01f91e0e
Merge #2550 
2550: Fix bundling SQLite3 on Mac r=Zwelf a=def-

Verified locally

Co-authored-by: def <dennis@felsin9.de>
 2020-08-10 17:07:18 +00:00
def 0a9eb72d52 Fix bundling SQLite3 on Mac 
Verified locally
 2020-08-10 18:35:04 +02:00
def d08535684e Move skins license information to its own file 2020-08-10 18:23:31 +02:00
def 467778fc56 Satisfy old C standard 
system.c:2325:2: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
  for(int cursor = 0, pos = 0; pos <= truncation_len && cursor < dst_size && size != cursor; cursor = str_utf8_forward(src, cursor), pos++)
 2020-08-10 18:11:51 +02:00
Dennis Felsing 77d61973fa
Merge pull request #2545 from def-/pr-version-14.3 
Version 14.3
 2020-08-10 17:50:29 +02:00
Dennis Felsing 9d4a77130c
Merge pull request #2541 from def-/pr-editor 
Arrow key support in editor
 2020-08-10 17:50:14 +02:00
def 4ceb4ddb9f Version 14.3 2020-08-10 17:50:05 +02:00
def 285701695b Prevent crash by keeping m_SelectedImage/Sound in correct range 2020-08-10 17:41:58 +02:00