edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
11149 commits 1 branch 429 tags 412 MiB
Commit graph

11149 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors[bot] ac3dde1d98
Merge #2446 
2446: Fix storing finish on solo server with practice mode enabled r=heinrich5991 a=Zwelf

Fixes #2445 
vulnerable versions: 
* 506602d472c48821b6e7bb846b86431a113834a1..59a7e1f1873ad58b838cd3470d51b6ba84c02926~
* b99bbccd248437c928b25e32d40deaf98d8ef3ad..4186622d8750f4288be86b9064886a86c665c45d~

Problem was that `OnFinish` is only suited for team0 finishes, where `/practice` can't be enabled. Solo server finishes have to be handled like team finishes in CheckTeamFinished, which checks if `/practice` was enabled.

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-02 21:08:20 +00:00
bors[bot] 84a7cfc05d
Merge #2447 
2447: Moved include from teamscore.h to teamscore.cpp r=heinrich5991 a=Zwelf

small cleanup

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-02 20:58:35 +00:00
Zwelf d0975f9c4b Fix storing finish on solo server with practice mode enabled 2020-07-02 22:49:30 +02:00
Zwelf 0c0fab5e66 Moved include from teamscore.h to teamscore.cpp 2020-07-02 22:11:43 +02:00
bors[bot] 7266bcad78
Merge #2444 
2444: Fix erroneous "unable to find all characters" message r=heinrich5991 a=Zwelf

Fixes #2443 

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-02 15:07:55 +00:00
bors[bot] dbbf967ee9
Merge #2442 
2442: Don't load movement and pause state when rescuing r=heinrich5991 a=Zwelf

Fixes #2439

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-02 15:00:25 +00:00
Zwelf 17bb4522fc Fix erroneous "unable to find all characters" message 2020-07-02 16:34:36 +02:00
Zwelf ab9cdc294d Reset all input after rescuing 2020-07-02 16:24:23 +02:00
Zwelf 538de72c94 Don't load movement and pause state when rescuing 2020-07-02 14:06:18 +02:00
bors[bot] e39a53d379
Merge #2441 
2441: Fix reenabling practice mode after kill on solo server r=heinrich5991 a=Zwelf

Fixes #2440 

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-02 09:16:18 +00:00
Zwelf 4388579d48 Fix reenabling practice mode after kill on solo server 2020-07-02 11:13:07 +02:00
heinrich5991 9ed54440cb Add some tests for the bezier stuff 2020-07-02 11:07:30 +02:00
heinrich5991 9c3f8894b0 Restore some lines to the state before working on smooth zoom 2020-07-02 10:53:20 +02:00
bors[bot] a62eeeb829
Merge #2434 
2434: Send Sixup information to antibot r=heinrich5991 a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
 2020-07-01 22:37:50 +00:00
bors[bot] d551b2f069
Merge #2437 
2437: Spam protection on /rank r=Zwelf a=Learath2

Honestly, this isn't really the best fix, it'd probably be best to rate limit the query itself more harshly but this is how it behaved in the past before @Zwelf's rework.

Co-authored-by: Learath <learath2@gmail.com>
 2020-07-01 21:28:36 +00:00
Learath f9bf6cf354 Spam protection on /rank 2020-07-01 23:53:25 +03:00
Learath 416cb37000 Send Sixup information to antibot 2020-07-01 21:09:58 +03:00
bors[bot] 21c338ad4a
Merge #2432 
2432: Update Swedish translations r=heinrich5991 a=3edcxzaq1



Co-authored-by: 3edcxzaq1 <3edcxzaq1@mailbox.org>
 2020-07-01 16:20:12 +00:00
bors[bot] 6da2f117cf
Merge #2425 
2425: Fix doors not resetting on restart on solo server r=heinrich5991 a=Zwelf



Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-01 16:10:34 +00:00
bors[bot] 98779776e5
Merge #2424 
2424:  Keep hook when loading  r=heinrich5991 a=Zwelf

Solves issue discussed in #2374. Also keeps direction and jump, which is evaluated when player is in /pause. Fire could be deleted, as it does not affect game play in any way.

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-01 16:01:25 +00:00
bors[bot] 2a36219987
Merge #2436 
2436: Revert "Don't run UpdateServerInfo if server isn't initialized yet" r=Learath2 a=heinrich5991

This reverts commit e69f747e5f.

Fixes `shutdown` on the initial command line which is also used on CI.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-07-01 15:54:14 +00:00
heinrich5991 358735aadb Revert "Don't run UpdateServerInfo if server isn't initialized yet" 
This reverts commit e69f747e5f.

Fixes `shutdown` on the initial command line which is also used on CI.
 2020-07-01 17:45:01 +02:00
3edcxzaq1 ab3bbc4337 Update Swedish translations 2020-07-01 11:42:49 +02:00
Zwelf bff8e90319 Fix loading team sets teamstate to TEAMSTATE_OPEN 2020-07-01 09:03:16 +02:00
heinrich5991 1fbd847edd Skip temporary branches of bors 2020-07-01 01:54:46 +02:00
heinrich5991 cdd715fd53 Add smoothing of camera zoom using a cubic polynomial 2020-07-01 00:19:17 +02:00
Zwelf 9e43f8d483 Add CCharacter::m_ReloadTimer to save 2020-06-30 23:49:40 +02:00
Dennis Felsing ac42861d1b
Merge pull request #2427 from def-/pr-14.0.4 
Version 14.1
 2020-06-30 22:44:20 +02:00
Dennis Felsing 47a3318d2b
Merge pull request #2422 from def-/pr-updateserverinfo 
Fix #2421
 2020-06-30 22:44:13 +02:00
bors[bot] 0199254296
Merge #2398 
2398: Implement /showothers 2 (fixes #2394) r=def- a=def-

in order to only show your own team members when they are in solo, not
other teams.

Also cl_show_others 2, sv_show_others_default 2

Co-authored-by: def <dennis@felsin9.de>
 2020-06-30 19:50:49 +00: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 1cb9454ab8 Rename showothers2 -> showothers 
and the old showothers to legacy
 2020-06-30 21:38:51 +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
def 59cf78be24 Always recreate the language files in same order 
Alphabetically as the files are located in directory structure.

Keeps the language files more stable
 2020-06-30 21:38:14 +02:00
def edba33be33 Add Show others (own team only) menu setting 2020-06-30 21:38:14 +02:00
def c3521572ea Add showothers2@netmsg.ddnet.tw 
to support cl_show_others 2 properly
 2020-06-30 21:38:14 +02:00
def 1b17c25fda Version 14.1 2020-06-30 21:32:25 +02:00
Zwelf 6f9dd48401 Fix doors not resetting on restart on solo server 2020-06-30 20:42:01 +02:00
bors[bot] 84372fb55f
Merge #2426 
2426: Address C++14 defect(CWG1558) r=def- a=Learath2

Fix #2370 

Co-authored-by: Learath <learath2@gmail.com>
 2020-06-30 18:36:31 +00:00
Learath d3ac9a69eb Address C++14 defect(CWG1558) 2020-06-30 21:34:23 +03:00
Zwelf b99bbccd24 Revert "Revert "Fix /save on solo server"" 
This reverts commit 59a7e1f187.
 2020-06-30 20:22:17 +02:00
def 3de5b3a12f Revert "Revert "Explain why the randomly generated save code is used"" 
This reverts commit 4476ec39f9.
 2020-06-30 20:18:58 +02:00
def 4476ec39f9 Revert "Explain why the randomly generated save code is used" 
This reverts commit 0d887e8b37.
 2020-06-30 20:15:50 +02:00
def d10cb17e54 Revert "Restore old /save behavior" 
This reverts commit d169bb1b52.
 2020-06-30 20:15:46 +02:00
Zwelf 839fd08d6a Check if player still in team when loading hook 2020-06-30 20:13:45 +02:00
Edgar 3578c74667
new defaults use logistic curve 2020-06-30 19:06:29 +02:00
def 59a7e1f187 Revert "Fix /save on solo server" 
This reverts commit 506602d472.
 2020-06-30 18:41:22 +02:00
def e69f747e5f Don't run UpdateServerInfo if server isn't initialized yet 
or currently shutting down anyway. Fixes the first half of #2421
 2020-06-30 18:33:22 +02:00