Commit graph

13259 commits

Author SHA1 Message Date
Learath 25ec19b70b Set m_Race. Fix #1806 2019-07-18 18:56:24 +03:00
Learath 02f5723321 Force spawn order of teams. Fix #1828 2019-07-18 18:35:51 +03:00
Learath 1769e5ae71 Don't advertise the reserved slots. Fix #1808 2019-07-18 18:20:55 +03:00
bors[bot] 71652e0113 Merge #1833
1833: Correctly embed replacing images r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-07-17 05:42:22 +00:00
12pm 5f7a09dfe3 Correctly embed replacing images 2019-07-17 03:00:09 +02:00
bors[bot] 769364116b Merge #1831
1831: Apply ShowOthersAlpha to projectiles (fix #1595) r=Learath2 a=trml

Also moved IsOtherTeam to CGameClient, and used it to clean up nameplates.cpp a little.

Co-authored-by: trml <trml@users.noreply.github.com>
2019-07-16 21:00:51 +00:00
trml cd64204358 Use IsOtherTeam for nameplates too 2019-07-16 22:34:18 +02:00
trml ddfcb62caa Apply ShowOtherAlpha to projectiles 2019-07-16 22:06:57 +02:00
FallenKN e80cb9e86a fix-ClDyncamMinDistance camera spawn 2019-07-16 12:56:43 +02:00
bors[bot] c2e318985c Merge #1827
1827: Fix small issue r=def- a=Learath2

This fixed 

`objc[52886]: Class SDLApplication is implemented in both /Users/learath2/Desktop/C/ddnet/ddnet-libs/sdl/mac/lib64/SDL2.framework/Versions/A/SDL2 (0x10c8ac680) and /Users/learath2/Desktop/C/ddnet/build/./DDNet (0x10c46c090). One of the two will be used. Which one is undefined.`

Not sure if this was an issue for anyone, but at least it doesn't break anything.

Co-authored-by: Learath <learath2@gmail.com>
2019-07-15 11:53:05 +00:00
Learath 019998b4f8 Fix small issue 2019-07-15 14:48:45 +03:00
bors[bot] a2e40ca4b3 Merge #1803
1803: Fix double pause due to spec r=def- a=fokkonaut

If a player is in /spec (sv_pausable 1 required) and would then use /pause, the tee would respawn, but the player would still be in /pause instead of playing again.
With this, the player will resume completely

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2019-07-15 07:55:48 +00:00
bors[bot] 5a93ddefae Merge #1817
1817: Cfg to keep hammer after hammerfly (closed #1816) r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-07-15 07:44:27 +00:00
bors[bot] af083f0f4a Merge #1824
1824: Annotate `str_timestamp_format` with format arguments r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2019-07-14 14:08:11 +00:00
heinrich5991 c8198cc853 Annotate str_timestamp_format with format arguments 2019-07-14 15:42:16 +02:00
bors[bot] d3c6f1b54f Merge #1823
1823: Fix 'several players were found' on /rank r=heinrich5991 a=fokkonaut

If no player was found, it should say 'x is not ranked', instead it says 'Several players were found', that is because if the result is -1, it will say that. With the default result being -2, it can no longer say that, instead it will say that the player is not ranked.

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2019-07-14 11:23:55 +00:00
fokkonaut fabdc73087 Fix 'several players were found' on /rank 2019-07-14 11:31:58 +02:00
Arda 43c94c3d30 Add afk marks 2019-07-13 13:25:54 +03:00
Arda f1454dbb7a Share afk state of players to client 2019-07-13 12:25:24 +03:00
ChillerDragon 4ad1cce93c Show mapname in scoreboard (closed #1818) 2019-07-11 16:10:14 +02:00
bors[bot] bbcf7a6905 Merge #1815
1815: Return error codes on server fail r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-07-11 09:25:59 +00:00
ChillerDragon b9273a9ed2 Return error codes on server fail 2019-07-11 11:18:25 +02:00
ChillerDragon 1703e9d94c Cfg to keep hammer after hammerfly (closed #1816) 2019-07-10 18:04:54 +02:00
bors[bot] 65f4a619e8 Merge #1810
1810: Use the float type explicitly r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-07-08 22:14:01 +00:00
bors[bot] 9e9477c727 Merge #1809
1809: Consitently mark floats as floats r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-07-08 22:01:41 +00:00
ChillerDragon 6172a9dca0 Use the float type explicitly 2019-07-08 23:08:42 +02:00
ChillerDragon 573c46013d Consitently mark floats as floats 2019-07-08 23:06:26 +02:00
bors[bot] b50e7ee674 Merge #1802
1802: Prediction fixes r=def- a=trml

I believe this fixes #1671 (uninitialized variables).

Some other things: Use new ddnetchar fields in prediction, small fix for prediction of moving pickups, fix the freeze end tick in ddnetcharacter (will add it to the client later)

Also adds a setting for choosing between new/old antiping for grenade like suggested in #1683 (cl_antiping_gunfire 0 to disable).

Co-authored-by: trml <trml@users.noreply.github.com>
2019-07-04 12:59:52 +00:00
bors[bot] ec5cfbad1e Merge #1804
1804: Fix toggle not working with colors r=def- a=Learath2

Reported by @12pm on discord

Co-authored-by: Learath2 <learath2@gmail.com>
2019-07-04 12:47:05 +00:00
Dennis Felsing afa9a5be36
Merge pull request #1805 from Learath2/dd_pr_nameplates
Fix nameplate outline alpha
2019-07-03 18:32:33 +02:00
Learath2 1a80176365 Fix nameplate outline alpha 2019-07-03 12:31:05 +02:00
Learath2 8469949257 Remove debug message 2019-07-02 14:56:02 +02:00
Learath2 1993989067 Fix toggle not working with colors 2019-07-02 14:54:06 +02:00
fokkonaut 0cb13ccec1 Fix double pause due to spec 2019-07-01 01:17:32 +02:00
trml 82a47210eb Fix freeze end tick in ddnetchar 2019-07-01 00:50:50 +02:00
trml b72a16ca36 Use new ddnetchar fields, cleanup, and fix prediction for already used jumps 2019-07-01 00:50:50 +02:00
trml 011d9aa26f Add option to use new/old antiping for grenades (cl_antiping_gunfire) 2019-07-01 00:42:02 +02:00
bors[bot] d35550ce19 Merge #1799
1799: Fix name/clan width when zooming out (fixes #1752) r=def- a=Jupeyy



Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2019-06-28 22:14:53 +00:00
Jupeyy 60604cabca fix name/clan width when zooming out (fixes #1752) 2019-06-28 20:23:01 +02:00
bors[bot] c7435fd132 Merge #1796
1796: Fix -Wdeprecated-copy from GCC9 r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2019-06-26 09:59:40 +00:00
heinrich5991 b90dd43118 Fix -Wdeprecated-copy from GCC9 2019-06-26 11:53:39 +02:00
def 6d19963933 Remove unused variables 2019-06-25 23:07:32 +02:00
Dennis Felsing ec95a783c5
Merge pull request #1795 from def-/pr-Wmap
Fix race condition in /map (untested)
2019-06-25 23:05:51 +02:00
def f7e642bbbe Fix race condition in /map (untested) 2019-06-25 21:03:20 +02:00
Dennis Felsing 6e24bf9ae2
Merge pull request #1790 from ChillerDragon/pr_ctrl_k_console
Add ctrl-k delete in client console
2019-06-19 12:12:19 +02:00
Dennis Felsing c4e5d7c182
Merge pull request #1791 from ChillerDragon/pr_ignore_visualstudio_dirs
Ignore visual studio project files
2019-06-19 12:12:09 +02:00
Dennis Felsing d9286e8beb
Merge pull request #1786 from fokkonaut/master
Fix zoom if dummy is connected and only one is able to zoom
2019-06-18 20:38:24 +02:00
ChillerDragon 4762e26b54 Ignore visual studio project files 2019-06-18 20:32:28 +02:00
ChillerDragon 93dc33ee57 Add ctrl-k delete in client console
Extends shortcuts from:
ed8a0b5eee
e9f8bd42b7
2019-06-18 20:16:54 +02:00
trml 18fbb10451 Fix some unitialized variables in the prediction 2019-06-18 19:08:09 +02:00