Commit graph

15765 commits

Author SHA1 Message Date
Learath 95d363b42c Fix votes for sixup 2020-07-07 13:14:07 +03:00
bors[bot] c5c2587607
Merge #2458
2458: Update catalan translation r=heinrich5991 a=edg-l



Co-authored-by: Edgar <git@edgarluque.com>
2020-07-07 09:13:48 +00:00
bors[bot] f3461e41aa
Merge #2457
2457: Fix uninitialised values in sixup differently (fixes #2421) r=heinrich5991 a=def-

"./DDNet-Server shutdown" still works

Co-authored-by: def <dennis@felsin9.de>
2020-07-07 09:05:51 +00:00
Edgar 7c984b5c0c
Update catalan translation 2020-07-07 10:58:55 +02:00
def f15ac1d869 Fix uninitialised values in sixup differently (fixes #2421)
"./DDNet-Server shutdown" still works
2020-07-07 10:26:44 +02:00
def c6a0698805 Add Russian translations by barsik 2020-07-07 09:11:43 +02:00
def 6fce212545 Fix typo in spanish translation 2020-07-07 09:05:13 +02:00
bors[bot] 6860d0eb4d
Merge #2456
2456: Finished what was left to translate in Spanish r=def- a=F3aRZ-hub

Translated from line 658 to line 1199. Finished what was left to translate in Spanish.

Co-authored-by: FeaRZ <67929476+F3aRZ-hub@users.noreply.github.com>
2020-07-07 05:49:45 +00:00
FeaRZ d16b46b496
Finished what was left to translate in Spanish
Translated from line 658 to line 1199. Finished what was left to translate in Spanish.
2020-07-06 23:25:03 -04:00
def 9093e9aca5 Fix polish translation typo (by TortiLeq) 2020-07-05 23:56:05 +02:00
def a451b08e11 Fix hungarian translation typo (by Cellegen) 2020-07-05 23:54:53 +02:00
bors[bot] 9008c96e80
Merge #2429
2429: Use a cubic polynomial for smoothing zoom r=def- a=heinrich5991

Supersedes #2420.

Co-authored-by: Edgar <git@edgarluque.com>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-07-05 21:46:25 +00:00
bors[bot] 4aa8cd651e
Merge #2448
2448: Add translations by Jeroen and gigi7187 r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-07-05 21:38:41 +00:00
bors[bot] 9c9dd525fc
Merge #2449
2449: Remove unused function r=heinrich5991 a=Zwelf



Co-authored-by: Zwelf <zwelf@strct.cc>
2020-07-03 20:51:01 +00:00
Zwelf 6be35cd4e7 Remove unused function 2020-07-03 20:13:51 +02:00
heinrich5991 6ff3167a6a Add translations by Jeroen and gigi7187 2020-07-03 00:56:47 +02:00
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