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
10565 commits 1 branch 429 tags 412 MiB
Commit graph

8326 commits

Author SHA1 Message Date
12pm b1ca920cd4 Fix IntersectCharacter 
This makes hitting yourself when shooting through other tees work
 2019-10-14 16:03:28 +02:00
sirius 71c53580ea recover the if-else block changed in d89ae6c18 2019-10-14 19:11:29 +08:00
sirius 926414c8cf remove the redundant line 2019-10-14 17:41:19 +08:00
sirius aaddc49704 recovert the if-else block 2019-10-14 17:32:42 +08:00
bors[bot] aa79d810ff
Merge #1935 #1936 #1940 
1935: Add a limit to GetNearestAirPos. Fix #1931 r=def- a=Learath2

There isn't really any sane behaviour here, so I just avoided the infinite loop.

You shouldn't be in the wall to begin with :P

1936: Mark players as afk initially. Fix #1797 r=def- a=Learath2

The whole afktimer code is quite ugly. I might rework it at a later date.
For now this looks like an acceptable fix.

1940: Update ddnet-libs version r=Learath2 a=def-

Was forgotten in the libcurl linux removal I think?

Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-10-14 08:04:06 +00:00
bors[bot] 4f63492dc9
Merge #1933 
1933: Fix two unintentional behavior changes of the stopper rewrite r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-10-14 07:46:10 +00:00
Learath a650a3c320 Remove the initial lifespan check 2019-10-14 02:28:24 +02:00
Learath 7cdd050fee Add SHA to demos. Bump Demo Version 2019-10-14 02:27:08 +02:00
Learath b2cefb20ed Always try extracting map before fail. Fix #1886 2019-10-13 18:46:28 +02:00
Learath 63998eaa84 Explode grenades twice at the end if they have lifespans. Fix #1559 2019-10-13 17:58:59 +02:00
Learath 3e7cf12995 Clamp ping to 999. Fix #1651 2019-10-13 17:17:05 +02:00
Learath 547f751bf3 Mark players as afk initially. Fix #1797 2019-10-13 17:13:03 +02:00
Learath 84f1542f43 Add a limit to GetNearestAirPos. Fix #1931 2019-10-13 16:34:03 +02:00
sirius d347ded43e change the time() in chat.cpp back to CComponent::time() 2019-10-13 22:01:08 +08:00
sirius d9d6569580 add button to set whether show chat when rendering video 2019-10-13 20:29:55 +08:00
sirius f5d0018ba9 solve the problem that chat message not show after a period of time when rendering 2019-10-13 19:57:24 +08:00
sirius 5b514e5c7f repair the problem that class selector appear when demo playing 2019-10-13 12:09:20 +08:00
sirius d89ae6c18c repair the problem that class selector appear when demo playing 2019-10-13 00:27:44 +08:00
bors[bot] fdf2ec37e7
Merge #1930 
1930: Fix #1888 r=heinrich5991 a=Learath2

I didn't see a better fix for it

Co-authored-by: Learath <learath2@gmail.com>
 2019-10-07 22:44:51 +00:00
heinrich5991 34087e1a7b Only get double jump when falling onto a stopper 
Another unintentional behavior change found by Zwelf.
 2019-10-06 13:54:16 +02:00
heinrich5991 eab0815ddc Fix unintentional behavior change with blockers 
Could be seen on "Insane 3", on teleporter 37. Thanks to Zwelf for
reporting.
 2019-10-06 13:51:16 +02:00
12pm 36df86fcd2 Add toggle keyboard shortcuts button to demo player 
Demo shortcuts can be annoying if you have other binds on them.

Icons made by eNJi
 2019-10-05 18:06:58 +02:00
bors[bot] 112d0432e2
Merge #1923 
1923: Properly force spawn order of teams. Fix #1828 r=Learath2 a=d3fault

Mimic old behavior of having a respawn tick > 0 ticks after current tick. 2 ticks later is still "instant enough".

The code below the change mentions strong spawning, so without deciphering it we simply give 2 extra ticks to make sure that it executes before spawning (2 instead of 1 so that it definitely executes for both primary and dummy).

Co-authored-by: d3fault <d3fault@d3fault.net>
 2019-10-03 12:11:50 +00:00
bors[bot] 80efc085f6
Merge #1927 
1927: Add show text entities button to settings r=Learath2 a=12pm

Fixes #1897

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-10-02 22:02:12 +00:00
Learath 49a2a47dc8 Fix #1888 2019-10-02 20:44:03 +03:00
bors[bot] e7ea336a94
Merge #1925 #1929 
1925: Don't bundle libcurl for Linux r=Learath2 a=heinrich5991

It's installed basically everywhere and just increases release size.
They're serious about backward compatibility and haven't had a breaking
change in ages.

1929: Remove space at end of cfg description r=Learath2 a=ChillerDragon

Happy hacktoberfest :octocat: 

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-10-02 17:25:02 +00:00
ChillerDragon 3777021383 Remove space at end of cfg description 2019-10-02 17:15:42 +02:00
12pm bc62167131 Add show text entities button to settings 
Fixes #1897
 2019-10-02 13:57:39 +02:00
heinrich5991 9a5de9eff8 Remove unused variables 2019-10-02 10:28:34 +02:00
sirius 4f3f3d2a61 add two video settings: showhookcollother and showdirection 2019-10-02 13:33:55 +08:00
sirius 9467bef192 add button to set whether show hud when rendering video 2019-10-02 13:11:58 +08:00
sirius 6acae69d96 repair the segment fault bug in con_startvideo 2019-10-02 09:52:54 +08:00
sirius ca583ba2a9 solve the problem about disorder of frames, reason is that no glReadBuffer() before glReadPixel() 2019-10-02 09:52:47 +08:00
sirius b0ee5671ff rebased to ef32fc4 2019-10-02 09:51:33 +08:00
d3fault 5f193d009e Properly force spawn order of teams, so dummy doesn't get strong hook. Fix #1828 
Mimic old behavior of having a respawn tick > 0 ticks after current tick.
2 ticks later is still "instant enough".
The code below the change mentions strong spawning,
so without deciphering it we simply give 2 extra ticks to make sure that
it executes before spawning (2 instead of 1 so that it definitely
executes for both primary and dummy).
 2019-09-30 15:42:09 -07:00
d3fault 718eebd9ce Revert "Force spawn order of teams. Fix #1828" 
This broke respawn rate limiting and didn't even fix #1828.
When primary tee hits kill tiles, dummy still gets strong hook.

This reverts commit 02f5723321.
 2019-09-30 15:38:35 -07:00
sirius e4fdeefdd4 remove first two frames to forbid from interface before playback being rendered to video 2019-09-30 20:55:23 +08:00
sirius 605da124d4 add button to adjust render speed 2019-09-30 20:54:42 +08:00
sirius 1c150106f8 demoplayer disconnect when render finished 2019-09-30 20:54:42 +08:00
sirius d9d1e8b309 add if defined to newly added lines 2019-09-30 20:54:19 +08:00
sirius 14ed79972b check if video exist when render 2019-09-30 20:52:25 +08:00
sirius 562dffe800 segment fault repaired (don't nest others' function thoughtless) 2019-09-30 20:52:25 +08:00
sirius a71339366b add function to appoint video name, but will segment fault 2019-09-30 20:52:25 +08:00
sirius 1375fbb95d add a button to render whole demo 2019-09-30 20:52:24 +08:00
HMH 41da2f4497 removed superfluous const 2019-09-30 20:48:50 +08:00
H-M-H 78e851c52c hopefully made msvc happy now 2019-09-30 20:48:50 +08:00
H-M-H 4b86630b42 fps for videos configurable and videos are stored at a proper location 2019-09-30 20:48:47 +08:00
H-M-H 98568eba43 no audio for now 2019-09-30 20:48:47 +08:00
H-M-H 2f71720fb1 correct time after stopping recording a video 2019-09-30 20:48:47 +08:00
H-M-H ab9e716444 fixed compiling on linux 2019-09-30 20:48:47 +08:00
H-M-H 7ae4b39574 made recording demos work 
- videorecorder only works for recording demos now
- demoplayer was modified to allow controll over the time that passed
  in order to get perfect fps, IVideo controlls how much time passed,
  basically every rendercall sets the time to record the next frame
 2019-09-30 20:48:47 +08:00
H-M-H 94860c935f raw H.264 --> mp4 \o/ 2019-09-30 20:46:45 +08:00
H-M-H c5c171a3cb initial work on a video recorder 2019-09-30 20:46:45 +08:00
heinrich5991 f19220f1bb Allow to hammer directly on unfreeze 
Previously, this was only doable with frame-perfect input if you were
going to get frozen again the next tick. Now, you only have to hold your
hammer to immediately hammer once you get unfrozen.

This fixes that "deepfly" (flying with deep-frozen dummy, binding both
main and dummy tee hammers onto the same key) does not only work for
good connection.
 2019-09-28 21:07:33 +02:00
heinrich5991 947b5e7936 Fix some formatting in src/game/server/entities/character.cpp 2019-09-28 20:58:31 +02:00
bors[bot] ef32fc4bed
Merge #1920 
1920: Don't highlight window when playing demo (fixes #1919) r=Learath2 a=def-



Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-09-24 14:22:30 +00:00
bors[bot] a1ff029af9
Merge #1918 
1918: Editor speedup fixes r=def- a=Learath2

Fix 1 bug, improve usability of angle selector.

Co-authored-by: Learath <learath2@gmail.com>
 2019-09-24 09:04:27 +00:00
Dennis Felsing e06fb2b605 Don't highlight window when playing demo (fixes #1919) 2019-09-24 11:00:30 +02:00
Learath ba12250892 Constrain ValueSelector to integer multiples of Step 2019-09-22 14:21:17 +03:00
Learath 37d9e4fa26 Add a saner way to select angles. Close #1916 2019-09-20 23:57:35 +03:00
Learath 918003911c Fix bug handling speedup brushes 2019-09-20 21:52:28 +03:00
heinrich5991 4e67241794 Fix rotated stoppers not working 
Fixes #1861.
Fixes #1914.
 2019-09-19 02:07:22 +02:00
heinrich5991 bcd1559c5e Make LimitVel a proper function 2019-09-18 14:50:27 +02:00
heinrich5991 66ccd808aa Rewrite stopper code a bit, second try 
Remove the whole copy-and-paste mess.

A seemingly ineffective and apparently code block has been removed.

The broken front layer from the first try has been fixed.
 2019-09-18 02:04:46 +02:00
bors[bot] 38fc84f816
Merge #1912 
1912: Fix skin reset r=def- a=12pm

default skin id is -1 not 0

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-09-17 18:18:51 +00:00
heinrich5991 79bce4250a Address forgotten review comment of #1904 2019-09-17 17:07:33 +02:00
12pm 82e63d7f27 Fix skin reset 
default skin id is -1 not 0
 2019-09-17 16:45:44 +02:00
bors[bot] 1bf178614f
Merge #1904 
1904: Add tune zone prediction r=heinrich5991 a=trml

Is enabled with cl_predict_ddrace 1.

This will predict tunings loaded from the map the first time tunezones are entered, but will also update the tunes after you receive new tunes while in a tunezone, since it's possible to change them in rcon.

Co-authored-by: trml <trml@users.noreply.github.com>
 2019-09-17 13:50:18 +00:00
trml ea9e444283 Use a single getter for tunings, add some missed cases, fix tuning update 2019-09-16 00:07:42 +02:00
bors[bot] 0c34b6eb55
Merge #1878 #1903 
1878: Add paused and spec to explayerflags r=Learath2 a=Ryozuki

I think client should know about this, maybe we can do something with it in the future.

It also may help with https://github.com/ddnet/ddnet/issues/259 but i didn't figure out yet a way to fix it.

1903: Consistent spacing for getters and setters r=Learath2 a=ChillerDragon



Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-09-15 13:41:19 +00:00
bors[bot] c146de63fa
Merge #1909 
1909: Fix filescore path r=Learath2 a=ChillerDragon

The filescore system did not handle map paths well that were an actual path and not just the mapname.

```
# before fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:29:44][filescore]: opening 'records/DDNetPP-maps-BlmapChill_record.dtb' for reading failed

# after fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:31:05][filescore]: opening 'records/BlmapChill_record.dtb' for reading failed
```

I called ```Server()->``` in a thread so please review thread safety before merge.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-09-15 13:30:48 +00:00
ChillerDragon b39de87b18 Fix filescore path 
# before fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:29:44][filescore]: opening 'records/DDNetPP-maps-BlmapChill_record.dtb' for reading failed

# after fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:31:05][filescore]: opening 'records/BlmapChill_record.dtb' for reading failed
 2019-09-15 13:35:35 +02:00
trml bb5eab0cc0 Add tunezone prediction 2019-09-09 00:53:07 +02:00
ChillerDragon f5f07860c4 Consistent spacing for getters and setters 2019-09-08 19:22:12 +02:00
bors[bot] 38f91d3891
Merge #1902 
1902: Remove useless votemute struct r=heinrich5991 a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-09-07 20:21:43 +00:00
ChillerDragon dbad486c67 Remove useless votemute struct 2019-09-04 21:21:40 +02:00
12pm 3b1dcc8793 Handle 0 star random map votes 2019-08-27 18:33:37 +02:00
Corantin H 043859b66d Fix keeping tmp replay demo file on map change 2019-08-21 22:49:21 +02:00
Ryozuki b58037f31e
fix the telegun save 2019-08-19 10:35:37 +02:00
bors[bot] e2840b1a57
Merge #1881 #1895 
1881: Replace browse_icons (by MiM) (fixes #1880) r=heinrich5991 a=def-



1895: Centered entities text r=heinrich5991 a=BannZay

Closes https://github.com/ddnet/ddnet/issues/1721

Before:
![not_centered_100](https://user-images.githubusercontent.com/17499770/63204728-89772580-c0a3-11e9-8ad9-060cd03d2f74.png)
Now:
![centered_100](https://user-images.githubusercontent.com/17499770/63204730-8da34300-c0a3-11e9-86e2-5f542e4789a1.png)

It is done for "buffered" mode. Therefore, it works for OpenGL 3.3 only.


Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: Andrii Vynychenko <bannzay3@yandex.ru>
 2019-08-17 15:32:29 +00:00
bors[bot] 75f25f348b
Merge #1875 
1875: Fix show_ips to show regular formatting (fixes #1873) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-08-17 15:21:24 +00:00
Andrii Vynychenko 4ab2b2010a Merge branch 'master' into centeredNumbers 2019-08-17 03:43:43 +03:00
Andrii Vynychenko 1671e6fbfc numbers dynamically centered for OpenGL 3.3 2019-08-17 03:42:54 +03:00
bors[bot] 77e59e3c49
Merge #1894 
1894: Fix max menu tabs (closed #1893) r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-08-16 09:06:44 +00:00
ChillerDragon ff49500659 Fix max menu tabs (closed #1893) 2019-08-16 00:58:06 +02:00
Andrii Vynychenko 0fa23a2c47 Numbers centered for OpenGL 3.3 2019-08-15 23:57:23 +03:00
bors[bot] 35b29ae01d Merge #1889 
1889: Dont reset variables twice r=def- a=fokkonaut

These variables get reset in Reset() aswell, no need to do it here

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-08-12 06:36:25 +00:00
fokkonaut 3434fca91c Dont reset variables twice 2019-08-12 05:28:42 +02:00
fokkonaut fcc2e06352 Fix unmasked entities 2019-08-06 23:43:11 +02:00
bors[bot] b0f1164485 Merge #1883 
1883: Fix crashbug on set_team_ddr -1 r=Learath2 a=fokkonaut

Teams over 63 are also forbidden, so I check for that too.

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-08-05 16:37:32 +00:00
fokkonaut 265d3b8a62
Fix namings 2019-08-05 14:45:04 +02:00
fokkonaut ac588f324c Fix crashbug on set_team_ddr -1 2019-08-04 23:38:08 +02:00
Ryozuki e112cf6791
add paused and spec to explayerflags 2019-08-02 18:16:58 +02:00
Dennis Felsing 968b5c1fed Version 12.6.1 2019-08-02 07:33:15 +02:00
bors[bot] cb19e147d0 Merge #1876 
1876: Reset m_Afk r=heinrich5991 a=FallenKN

Guess this was forgotten

Co-authored-by: FallenKN <fallen.kn@gmail.com>
 2019-08-01 23:10:57 +00:00
FallenKN a03b4f0cee Reset m_Afk 2019-08-01 23:07:40 +02:00
def cb738ffed0 Fix show_ips to show regular formatting (fixes #1873) 2019-08-01 20:24:30 +02:00
def 99b814342c Add a few contributors 2019-08-01 18:36:21 +02:00
bors[bot] 17fd8ae79a Merge #1870 
1870: Clarify what `ENTITIES_UNUSED` does by renaming it r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-07-31 20:57:55 +00:00
bors[bot] 85a8587f67 Merge #1872 
1872: Replace `str_comp_num` with `str_startswith` r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-07-31 19:44:37 +00:00
heinrich5991 9627fd0841 Clarify what ENTITIES_UNUSED does by renaming it 2019-07-31 21:22:11 +02:00
heinrich5991 1e2b8a4a3e Replace str_comp_num with str_startswith 2019-07-31 21:20:03 +02:00
def 0018ed27df Don't attempt to move DLLs on Linux (fixes #1867) 2019-07-31 18:00:48 +02:00
Dennis Felsing c8b3670bbc
Merge pull request #1866 from def-/pr-12.6 
Version 12.6
 2019-07-31 17:31:24 +02:00
Dennis Felsing c8d12bd386
Merge pull request #1853 from 12pm/pr_unused_non_ddnet 
Render all entities on non ddnet servers
 2019-07-31 17:31:11 +02:00
Learath 6882db1da2 Introduce flag to render all entities 2019-07-31 15:20:17 +03:00
Dennis Felsing e791927541 Version 12.6 2019-07-31 07:20:21 +02:00
bors[bot] 7b1d2d3f23 Merge #1862 
1862: Add Sleepbubble to ClAfkMark r=def- a=FallenKN

With setting cl_afk_mark to 2 you will now get a sleepbubble on afk instead of the mark.

Which option should be default?
Also it displays chatbubble instead of sleepbubble when the playerflag is active. (I don't know which behavior is preferred)
Kept sleepy eyes on afk aswell.

 ![screenshot_2019-07-29_14-47-34](https://user-images.githubusercontent.com/13277346/62049848-624dd680-b210-11e9-82f7-2d20281eb899.png)

Co-authored-by: FallenKN <fallen.kn@gmail.com>
 2019-07-30 19:15:58 +00:00
FallenKN b2d3df8f75 Remove ClAfkMark option & rename it to ClAfkEmote 2019-07-30 20:19:46 +02:00
bors[bot] 1d9191edfe Merge #1819 
1819: Show mapname in scoreboard r=def- a=ChillerDragon

![screenshot_2019-07-11_16-03-47](https://user-images.githubusercontent.com/20344300/61057588-e53ff600-a3f5-11e9-8b20-3b082172bd63.png)
![screenshot_2019-07-11_15-46-04](https://user-images.githubusercontent.com/20344300/61057605-ecff9a80-a3f5-11e9-8f59-68811a1b123a.png)

Not sure if this feature should exclude non ddrace gametypes. Or exclude standard maps. Or if the truncation limit should increase with bigger scoreboards.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-07-30 17:17:32 +00:00
bors[bot] fd502a8cce Merge #1844 
1844: Fix wrong flag color in scoreboard and spectator select menu (custom mods) r=Learath2 a=fokkonaut

Since in DDrace every player is in team red, in order to show them in one scoreboard, the flag will always be blue in scoreboard and the spectator select menu, here is a simple fix

I left kill messages out since they would need a fix which is a bit more complicated, and i didnt want to do too much just to support this. These two would make it already a lot better

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
Co-authored-by: Learath <learath2@gmail.com>
 2019-07-30 10:36:14 +00:00
Learath 99c62fb931 Fix killmessages aswell 2019-07-29 17:36:44 +03:00
FallenKN b804d3e1f2 Enhance ClAfkMark with another option 2019-07-29 14:46:21 +02:00
bors[bot] 8ab6e2c0a8 Merge #1848 #1860 
1848: Fix deci seconds not updating in spectator/pause (fixes #1846) r=heinrich5991 a=fokkonaut

Before this was set in `RenderDDRaceEffects()`, but that function is only called if `m_pClient->m_Snap.m_pLocalCharacter` exists, which isn't the case in spectator/pause.

1860: Ignore some more common files r=heinrich5991 a=Ryozuki

compile_commands.json is used a lot for language servers

https://cmake.org/cmake/help/latest/variable/CMAKE_EXPORT_COMPILE_COMMANDS.html

tags are generated from ctags

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
 2019-07-29 12:15:16 +00:00
Learath 9061f03174 Move the afk flag up front 2019-07-29 14:46:29 +03:00
Learath 0bc3650356 Send DDNet capability flag 2019-07-29 14:18:40 +03:00
bors[bot] dc41bb9649 Merge #1821 
1821: Add afk marks r=def- a=ardadem

This is final state  (and most minimalist to not create mess) of my previous pull request. I didn't reopen it because it's contains changed unnecessary commits.

If someone will become afk, mark will be spawn next to tee's name.
![2019-07-13-13:59:20-screenshot](https://user-images.githubusercontent.com/13207692/61170739-8c4b9b80-a576-11e9-9d87-4c4b2f93941b.png)


Co-authored-by: Arda <ddmirarda@gmail.com>
 2019-07-26 08:58:20 +00:00
Arda fb2cb4db26 move afk state inside to player flags 2019-07-26 11:48:15 +03:00
Arda 1a7fc77931 better names 2019-07-26 10:18:50 +03:00
12pm c57fcf3ee7 Persist playerflags when using timeout protection 2019-07-26 01:39:53 +02:00
12pm a0e2abf4af Render all entities on non ddnet servers 
Fixes #1741
 2019-07-24 21:33:43 +02:00
fokkonaut 5c280a3c9d
Fix blockZ and infectionZ 
I talked to coffee (creator of both mods) and he said it is okay to use zoom on the mods, also: eye emotes work there so the eye wheel is also supported. I have updated both mods to ddnet master so they have all the new stuff
 2019-07-24 06:52:32 +02:00
Learath 5ddc140494 Remove unused branch/flag 2019-07-22 18:20:19 +03:00
fokkonaut 1bfda0f635 Fix deci seconds not updating in spectator/pause (fixes #1846) 2019-07-22 10:41:19 +02:00
bors[bot] 658efe776b Merge #1845 
1845: Fix infectionZ gamemode seen as DDNet r=heinrich5991 a=fokkonaut

InfectionZ's gametype is somehow infection, instead of infectionZ

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-07-21 08:32:59 +00:00
fokkonaut a8756f99e0 Fix infectionZ gamemode seen as DDNet 2019-07-21 10:03:27 +02:00
fokkonaut e77bdb8114 Fix wrong flag color in spectator select menu (custom mods) 2019-07-21 09:02:38 +02:00
fokkonaut a268b95ea3 Fix wrong flag color in scoreboard (custom mods) 2019-07-21 08:55:55 +02:00
bors[bot] 69ace3c1ec Merge #1837 
1837: Don't advertise the reserved slots. Fix #1808 r=heinrich5991 a=Learath2

I think this is also fine for vanilla, but I can't get the vanilla client to work on mac to test it.

Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: Emir Marincic <learath2@gmail.com>
 2019-07-20 18:32:19 +00:00
Emir Marincic 57197d990c
Better represent the state of the server 
Co-Authored-By: heinrich5991 <heinrich5991@gmx.de>
 2019-07-20 21:25:15 +03:00
bors[bot] cd8994147c Merge #1842 
1842: [WIP] Fix timer r=heinrich5991 a=Learath2

I'm really unsure about this one.

DEPENDS on #1839 

Co-authored-by: Learath <learath2@gmail.com>
 2019-07-19 22:23:22 +00:00
bors[bot] 628f673014 Merge #1830 
1830: fix-ClDyncamMinDistance camera spawn r=Learath2 a=FallenKN

I forgot about the dyncam option, #1636.

Co-authored-by: FallenKN <fallen.kn@gmail.com>
 2019-07-19 16:53:06 +00:00
bors[bot] 2f23b5c29a Merge #1839 
1839: Set m_Race. Fix #1806 r=heinrich5991 a=Learath2

@heinrich5991 apparently you forgot to set `CGameInfo::m_Race` 🙂 

Co-authored-by: Learath <learath2@gmail.com>
 2019-07-19 09:31:04 +00:00
Learath b1ed78d58d Add new flag, Fix #1807 2019-07-19 12:28:08 +03:00
Learath 78ac5ce030 Send the flag from the server 2019-07-19 11:21:32 +03:00
bors[bot] 72dcf6fba6 Merge #1838 
1838: Force spawn order of teams. Fix #1828 r=heinrich5991 a=Learath2

This has an unfortunate(?) consequence of causing tees that hit kill tiles and fall out of map respawn instantly. If this is undesirable the fix would be a little more complex, maybe implementing a delay to the spawn in `CPlayer` or reordering the entity list to force strong on the tee (by swapping with one of their teammates (this might have some undesirable effects aswell, not sure though)).

Co-authored-by: Learath <learath2@gmail.com>
 2019-07-19 00:40:10 +00:00
bors[bot] ebeeace65e Merge #1841 
1841: Restart required message when changing Show console r=heinrich5991 a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-07-19 00:16:01 +00:00
fokkonaut 3edaf4b8cd Style fixes 2019-07-19 02:06:33 +02:00
fokkonaut 78f52629e4 fix build 2019-07-19 01:58:49 +02:00
fokkonaut 07089be2e0 Restart required message when changing Show console 2019-07-19 01:53:27 +02:00
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
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
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
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
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
Jupeyy 60604cabca fix name/clan width when zooming out (fixes #1752) 2019-06-28 20:23:01 +02: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
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 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 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
trml 087a5cbf6e Fix intratick for predicted pickup 2019-06-18 19:08:09 +02:00
trml 25e08f13e4 Small prediction fix for laser/shotgun 2019-06-16 16:35:16 +02:00
trml 8a18cabbb1 Small fix and cleanup of prediction of teams/solo 2019-06-16 16:34:57 +02:00
bors[bot] 9c9264db8b Merge #1785 
1785: Revert "Merge pull request #1736 from sirius1242/master" r=Learath2 a=def-

This reverts commit e8362f1727, reversing
changes made to 0f99605ab1.

Apparently people don't like "Digital Wellbeing"-like features @sirius1242 

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-06-15 13:18:11 +00:00
fokkonaut 1664a6e10e Fix zoom if dummy is connected and only one is able to zoom 2019-06-15 12:23:50 +02:00
Dennis Felsing 1e74502e66 Revert "Merge pull request #1736 from sirius1242/master" 
This reverts commit e8362f1727, reversing
changes made to 0f99605ab1.

Apparently people don't like "Digital Wellbeing"-like features
 2019-06-14 12:00:49 +02:00
heinrich5991 ca03ab6337 Address Learath2's comments 2019-06-14 00:28:59 +02:00
heinrich5991 62846821da Revert "Implement ISDDNET. Deprecates #1320" 
This reverts commit 1929bc6739.
 2019-06-14 00:28:59 +02:00
heinrich5991 a7857d58c4 Remove now-useless function in CGameClient 
(incorporate @fokkonaut's feedback)
 2019-06-14 00:28:59 +02:00
heinrich5991 2b7f3587c4 Only accept DDRace record message on DDRace servers 2019-06-14 00:28:59 +02:00
heinrich5991 f31e081bd4 Remove all checking for the gametype in the game 
OK, maybe not actually remove because it is kept for fallback when the
new method isn't available.

The whole gametype parsing business had the same downsides as user agent
parsing on the web, hence I removed it while keeping behavior the same.

This allows servers to explicitly opt in or out of certain bug
workarounds and other client behavior. This increases the complexity of
different configurations that are available in the client (which is a
bad thing).
 2019-06-14 00:28:59 +02:00
Learath efbc05c9a8 No need for <algorithm> 2019-06-13 23:24:06 +02:00
Dennis Felsing 4f665a904b
Merge pull request #1782 from def-/pr-12.5 
Version 12.5
 2019-06-13 20:40:33 +02:00
trml fbf5edfdcb Set and send solo status on servers with sv_solo_server and sv_team 3 2019-06-13 17:23:23 +02:00
bors[bot] f8ba394c5d Merge #1781 
1781: sv_server_info_per_second, sv_van_conn_per_second: allow 0 to disable r=heinrich5991 a=def-

Clean up code a bit, also allow larger values

Co-authored-by: def <dennis@felsin9.de>
 2019-06-12 20:23:27 +00:00
Dennis Felsing 6b793c21a4 Version 12.5 2019-06-12 15:42:44 +02:00
Dennis Felsing 0d9952b32a
Merge pull request #1748 from archimede67/pr_replays 
Replay system (demo after-the-fact)
 2019-06-11 18:13:26 +02:00
def 85bb376bdc sv_server_info_per_second, sv_van_conn_per_second: allow 0 to disable 
Clean up code a bit, also allow larger values
 2019-06-11 18:12:43 +02:00
Dennis Felsing bbe411901e
Merge pull request #1764 from ChillerDragon/pr_console_word_del 
Add console word deletion/navigation (#1032)
 2019-06-11 18:05:23 +02:00
Dennis Felsing 0992e3c7c4
Merge pull request #1777 from ChillerDragon/pr_demo_wrong_hash 
Prefer downloadedmaps over maps ( #1702 )
 2019-06-11 18:05:12 +02:00
Dennis Felsing 617d123024
Merge pull request #1778 from d3fault/instant-respawn 
respawn is now instant, but rate limited to 3 sec unless player clicks mouse1
 2019-06-11 18:04:52 +02:00
Dennis Felsing bbb1b2cdef
Merge pull request #1733 from Learath2/dd_pr_colorsigned 
Store colors unsigned
 2019-06-11 12:26:28 +02:00
Ryozuki 916eab68fe
revert back to yellow color 2019-06-09 19:31:05 +02:00
Ryozuki c089cffdde
fix hook col and make it green on tees 2019-06-09 19:26:20 +02:00
d3fault 10e06f919e respawn is now instant, but rate limited to 3 sec unless player clicks mouse1 2019-06-07 02:44:19 -07:00
ChillerDragon 839009fc93 Prefer downloadedmaps over maps ( #1702 ) 
Fixes corrupted demos if there is a different version of the current map in the maps/ folder.
Thanks to @archimede67 for initial research.
 2019-06-05 22:24:17 +02:00
archimede67 0e62b4b9b9 fix code style 2019-06-05 19:49:00 +02:00
archimede67 65353c2030 fix 2019-06-05 19:36:45 +02:00
archimede67 929bf57bf6 infinite length and a lot of changes including notifications are now chat messages 2019-06-05 19:17:55 +02:00
bors[bot] 0ad96f6901 Merge #1775 
1775: Fix prediction of non-grabbed hook r=def- a=trml

Fix #1766.

Turns out the bug was not just in the rendering, but in the prediction itself (hooks were not predicted unless/until they grabbed on to something). I compared with an older client (and the old implementation) and this seems like it will restore the old behavior.

Co-authored-by: trml <trml@users.noreply.github.com>
 2019-06-05 05:53:18 +00:00
trml cf8c8534f1 Fix prediction of non-grabbed hook 2019-06-05 02:01:31 +02:00
bors[bot] cffd9b0ba6 Merge #1774 
1774: Remove the unused Skinstealaction r=heinrich5991 a=fokkonaut

As far as I know it was never in use and the only punishment is to force pinky skin, which doesnt really seem useful. Skin stealing is a very harmless kind of 'bots', which doesnt need punishment imo

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-06-04 22:03:18 +00:00
fokkonaut e471d4796e Remove the unused Skinstealaction 2019-06-04 17:23:29 +02:00
heinrich5991 756aab339b Remove item invalidation logging for unknown UUIDs 
This caused lags due to too much output during gameplay, demo playback
and demo cutting.

Fixes #1643.
 2019-06-04 00:05:28 +02:00
bors[bot] f3b1135770 Merge #1769 
1769: Update view immediately when pasting in search in browser r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-06-03 16:34:26 +00:00
bors[bot] 21772bdc2f Merge #1771 
1771: Cleanup CPlayer Snap r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-06-03 10:05:29 +00:00
fokkonaut 75e13550c2 Convert to int 2019-06-03 11:57:46 +02:00
fokkonaut 078e88bc8f Cleanup CPlayer Snap 2019-06-03 11:35:18 +02:00
Dennis Felsing e8362f1727
Merge pull request #1736 from sirius1242/master 
Recorded the time of the player's game after the client was opened and show it on the top.
 2019-06-03 11:02:28 +02:00
fokkonaut af7fd12341 Remove m_Weapon parameter from CProjectile 2019-06-02 22:04:11 +02:00
def 7e063109c6 Update view immediately when pasting in search in browser 2019-06-02 21:55:38 +02:00
bors[bot] 055b1fea79 Merge #1767 
1767: Add missing letter to explanations r=def- a=fokkonaut

https://github.com/ddnet/ddnet/blob/master/src/game/editor/explanations.cpp#L36

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-06-02 18:42:57 +00:00
fokkonaut 18e704017c Add missing letter to explanations 2019-06-02 18:01:28 +02:00
Corantin H 2e27a22927 typo + added an optional argument to save_replay + changed max replay length and fixed cl_notification_time values 2019-06-02 15:34:01 +02:00
bors[bot] b113b70ec6 Merge #1765 
1765: Add ctrl-u delete in client console r=heinrich5991 a=ChillerDragon

Extends shortcuts from:
e9f8bd42b7

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-06-01 15:58:11 +00:00
ChillerDragon 9c68765dae Don't set Handled on ctrl-u 2019-06-01 17:51:22 +02:00
ChillerDragon b98b71df88 Rename 'DeleteFromCursor' -> 'DeleteUntilCursor' 2019-06-01 17:41:40 +02:00
ChillerDragon ed8a0b5eee Add ctrl-u delete in client console 
Extends shortcuts from:
e9f8bd42b7
 2019-06-01 17:11:35 +02:00
ChillerDragon 1af09a840c Add console word deletion/navigation (#1032) 2019-06-01 16:24:22 +02:00
bors[bot] c44cd2897c Merge #1763 
1763: Fix typo 'helter' -> 'helper' r=heinrich5991 a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-06-01 14:01:51 +00:00
ChillerDragon 9925f89077 Fix typo 'helter' -> 'helper' 2019-06-01 15:58:13 +02:00
Corantin H 761e73a131 should be thread safe now + moved demoedit to a new file 2019-05-31 20:42:28 +02:00
bors[bot] 1578a33628 Merge #1760 
1760: Fix freeze projectiles only hit one tee (Fixes #1759) r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-05-31 11:59:15 +00:00
bors[bot] 647bbcc259 Merge #1732 
1732: Implement ISDDNET and Time Score cleanly r=def- a=Learath2

This is an attempt at implementing the two things in a cleaner way.

Deprecated #1320 
Willfix #1622  soon(tm)

Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: Learath2 <learath2@gmail.com>
 2019-05-31 10:12:10 +00:00
fokkonaut 85cbe99422 Fix wrong character team check 2019-05-30 14:14:47 +02:00
fokkonaut 61a6518f0d remove spaces 2019-05-29 16:30:44 +02:00
fokkonaut bbbdd89e64 Fix freeze projectiles only hit one tee (Fixes #1759) 2019-05-29 16:28:38 +02:00
Corantin H 04464a325e fix 2019-05-28 15:39:11 +02:00
Corantin H 709a6c2924 Moved notification outside of the demoedit job, so now we keep track of all the editjbos and show the notification when they are done in the client loop 2019-05-28 13:24:55 +02:00
fokkonaut 14c7bf550a
fixed typo 2019-05-26 22:47:02 +02:00
Corantin H 7c79b48da5 The demoeditors are now initialised in the constructor of the job 2019-05-26 21:06:43 +02:00
Corantin H cbcb8d4830 The slicing is now done with a new demoeditor each time we save a replay 2019-05-25 15:16:03 +02:00
Corantin H e35951dedc demo slicing is now done in a separate task to prevent ingame freeze 2019-05-25 00:24:13 +02:00
Corantin H bf435e8b72 coding style + added cl_notification_time 2019-05-23 23:17:12 +02:00
bors[bot] dc4111da12 Merge #1746 
1746: Fix zoom reset r=def- a=archimede67

Fix zoom reset when connecting dummy.
This should fix #1731 

Co-authored-by: Corantin H <archi0670@gmail.com>
Co-authored-by: archimede67 <archi0670@gmail.com>
 2019-05-23 11:30:23 +00:00
Dennis Felsing 05ae7c4b68 Version 12.4.3 2019-05-22 08:13:05 +02:00
Corantin H 858a85e7b5 fixed some typo errors, fixed code style and added a slider setting to set the replay length 2019-05-21 23:59:57 +02:00
Dennis Felsing 0eded7e406
Merge pull request #1744 from heinrich5991/pr_ddnet_quotefixquote_randommap 
Hack around the race condition in random maps selection
 2019-05-21 22:51:51 +02:00
Corantin H e6ce2c0c46 Renamed class CNotification to CHudNotification 2019-05-21 18:50:41 +02:00
Corantin H b6b8f7e536 Somehow build failed because of that 2019-05-21 18:04:37 +02:00
Corantin H 857656e8db Implemented a small notification system, fixed some problems with removing tmp files and update the recorder status when checking/unchecking the setting "Enable replays". 2019-05-21 17:21:53 +02:00
Corantin H ac4d7085c5 Switched to a proper new recorder instead of using the auto one 2019-05-21 12:49:19 +02:00
Learath2 c98978c9d6 Implement timescore using a netobj 2019-05-21 10:26:33 +02:00
Learath 0d25bb86c4 Style 2019-05-21 10:25:15 +02:00
Learath c2a774275f Move AuthInfo into DDNetPlayer 2019-05-21 10:25:15 +02:00
Learath 1929bc6739 Implement ISDDNET. Deprecates #1320 2019-05-21 10:25:15 +02:00
Learath 23255a04b3 Remove time-score 2019-05-21 10:24:07 +02:00
Learath2 c7d8ca129a Rerevert #1187 2019-05-21 10:51:43 +02:00
Corantin H 817bdaf9cd initial work on a replay system 2019-05-20 23:55:40 +02:00
archimede67 ba86bf7ff9
Update src/game/client/components/camera.cpp 
Better formatting

Co-Authored-By: heinrich5991 <heinrich5991@gmx.de>
 2019-05-20 20:39:02 +02:00
Corantin H 280f67af5f Fixed zoom reset when dummy connects 2019-05-20 12:07:07 +02:00
bors[bot] 131a0e370d Merge #1742 
1742: fix particles, emote wheel, zoom and score for blockworlds r=Learath2 a=kpro998

fixes a few things that got broken for players using ddnet client in blockworlds

Co-authored-by: Kpro998 <kpro998@gmail.com>
Co-authored-by: Learath <learath2@gmail.com>
 2019-05-19 22:51:06 +00:00
Learath 66b1b44e07 Style 2019-05-20 00:18:19 +02:00
heinrich5991 096c87bd1d Hack around the race condition in random maps selection 
Revert this "once we get proper SQL code"™.
 2019-05-20 00:12:59 +02:00
Kpro998 f3ff81e5ab fix IsBlockInfectionZ duplication 2019-05-19 22:35:56 +01:00
Kpro998 0856fec38e fix particles, emote wheel, zoom and score for blockworlds 2019-05-19 22:11:16 +01:00
12pm 28f26a09cc Ignore binds in slice save menu 
Should fix a bug reported in #1702
 2019-05-19 13:33:30 +02:00
sirius f62f6d2207 show play time move to a new function 2019-05-17 21:57:00 +08:00
sirius 8819f21d3a played time can show now 2019-05-17 21:47:12 +08:00
Learath db5c17ce71 Avoid implementation-defined behaviour 2019-05-15 18:11:22 +02:00
Learath 0d39eb128d Use unsigned integers for colors 2019-05-15 18:05:19 +02:00
Learath 551397117b Last return isn't necessary 2019-05-14 14:20:36 +02:00
Learath 546016092d Consistently determine OtherTeam 2019-05-14 00:00:28 +02:00
def 4e7598c22e Version 12.4.2 2019-05-13 11:33:53 +02:00
Dennis Felsing a562b573fd
Merge pull request #1717 from Learath2/dd_pr_bindstuck 
Fix sticky binds
 2019-05-13 11:29:35 +02:00
Dennis Felsing 0f65d02d1d
Merge pull request #1727 from trml/pr_pred_fixes_2 
A few more prediction fixes
 2019-05-13 07:29:04 +02:00
trml a885c64f4f Fix ninjajetpack prediction 2019-05-13 01:46:50 +02:00
trml 672b4aef02 Fix ninja animation with antiping off 2019-05-13 01:46:50 +02:00
trml 53fe0a56f8 Fix predicted weapon animation 2019-05-13 01:46:50 +02:00
trml bde2de2267 Improve weapon prediction on fastcap and vanilla 2019-05-13 01:46:35 +02:00
bors[bot] 3f41eab6b3 Merge #1724 
1724: fix crash on fontsize equal zero r=def- a=BannZay

#1718 fix

Co-authored-by: Andrii Vynychenko <bannzay3@yandex.ru>
 2019-05-11 16:36:51 +00:00
12pm a6a33bfaa5 Restore old team colors 2019-05-11 18:04:32 +02:00
Andrii Vynychenko 0353eb94ef fix zero fonsize 2019-05-11 18:59:47 +03:00
12pm 219d6dcd92 Explicitly filter finished maps 
Otherwise this filters all maps in all other tabs
 2019-05-11 13:45:41 +02:00
trml d9ade50e0a Disable grenade prediction with cl_predict 0 2019-05-11 13:25:08 +02:00
bors[bot] b03dad7626 Merge #1714 #1719 
1714: Make the color output more sane r=def- a=Learath2



1719: Show the correct button when paused r=def- a=Learath2

Fix one bug from #1702 

Co-authored-by: Learath2 <learath2@gmail.com>
 2019-05-11 08:13:24 +00:00
Learath2 b2f92b09eb Show the correct button when paused 2019-05-11 03:02:00 +02:00
Learath2 15879c16f9 Fix sticky binds 2019-05-11 02:46:22 +02:00
Learath2 e608e2f34f Add Hex display 2019-05-11 02:32:37 +02:00
Learath2 0dd67c92f1 Abbreviate alpha 2019-05-11 02:16:48 +02:00
Learath2 82e6d180e4 Use % and ° 2019-05-11 02:12:37 +02:00
Learath2 b059ac256e Show Alpha only if it's relevant 2019-05-11 02:12:36 +02:00
Learath2 39303e3430 Blood color is a light color 2019-05-11 01:02:46 +02:00
12pm 51ba68eaa6 Don't show id for echo messages 2019-05-11 00:26:15 +02:00
def c935b41026 Version 12.4.1 2019-05-10 23:47:41 +02:00
Dennis Felsing 2396096e3b
Merge branch 'master' into pr-rename-col 2019-05-10 23:46:38 +02:00
Dennis Felsing 9dd6cc9168
Merge pull request #1708 from 12pm/pr-restore-echo-col 
Restore old echo default color
 2019-05-10 23:45:03 +02:00
Learath2 b41529fefd Try to be more accomodating of old players 2019-05-11 01:38:15 +02:00
12pm ea324592c6 Change col to color in variable names 2019-05-10 23:34:21 +02:00
12pm eda002993e Restore old echo default color 2019-05-10 23:07:32 +02:00
Learath2 08e19e60f4 UI ID's need to be unique 2019-05-10 23:15:14 +02:00
Dennis Felsing acd0cafaa0
Merge pull request #1704 from def-/pr-12.4 
Version 12.4
 2019-05-10 19:59:23 +02:00
Dennis Felsing 5e356b5327
Merge pull request #1692 from def-/pr-news 
Render news without STL functions
 2019-05-10 14:09:44 +02:00
Learath2 86fd363822 Keep the old default 2019-05-10 01:22:22 +02:00
Learath2 def36acce1 Apply alpha properly, fix refactoring fails 2019-05-10 01:00:24 +02:00
Learath2 06fc970ea1 Render the correct skin in the selector 2019-05-10 01:00:24 +02:00
def 7211d16ddb Version 12.4 2019-05-09 22:00:21 +02:00
def 51385100cd Make Color.HRHConv test runtime more reasonable 
Previous execution time: 650 ms / 661 ms total (98%)
Now:                       3 ms /  15 ms total (20%)
 2019-05-09 21:55:34 +02:00
def e1c9033300 Render news without STL functions (fixes #1693) 2019-05-09 21:54:56 +02:00
Andrew 0fffd7705f Cl_text_entities_size (#1632) 
* new command added

* fix code duplication after merge

* merge #1632 suggestions

* align the texture to the center vertically

* refactor

* fix RenderSwitchOverlay

* Update src/engine/client/text.cpp

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review
 2019-05-06 14:19:10 +02:00
Dennis Felsing 76f2a5965f
Merge pull request #1701 from trml/pr_pred_fixes 
Some prediction fixes (fix #1680)
 2019-05-05 20:11:18 +02:00
Dennis Felsing 7ba1cae5f6
Merge pull request #1699 from trml/pr_extend_ddnetchar 
Add some more fields to ddnetcharacter
 2019-05-05 20:11:10 +02:00
trml 339d9b05f8 Also reset hook on prediction reset 2019-05-05 14:28:39 +02:00
trml 6848274b43 Fix pickup prediction on vanilla 2019-05-05 12:33:26 +02:00
trml 00ab99aa2e Add prediction for weapon switches and gunfire animation 2019-05-05 12:33:26 +02:00
trml b61aae5ab4 Reset predicted character on kill 2019-05-05 12:33:26 +02:00
trml df84e86ed0 Workaround for super prediction on non-64-player gametypes 2019-05-05 12:33:26 +02:00
trml 20c06dfcdf Make speedup and stopper prediction on all gametypes again 2019-05-05 12:33:13 +02:00
trml 8eb4b7fd71 Add setting cl_predict_freeze 2 for having a small amount of misprediction while frozen 2019-05-05 12:32:06 +02:00
trml b27a124e17 Enable freeze prediction with antiping off, and enable superjump prediciton on non-ddrace servers 2019-05-04 22:20:47 +02:00
Learath 13807edc6a Don't apply colorscale to alpha 2019-05-03 20:37:32 +02:00
bors[bot] 0b7ca35414 Merge #1697 
1697: Don't check dnsbl when alone r=def- a=Learath2

Should help relieve some of the issues reported on discord.

Co-authored-by: Learath <learath2@gmail.com>
 2019-05-02 05:29:06 +00:00
trml 09401a83ec Add strong/weak id to ddnetcharacter 2019-05-02 00:34:20 +02:00
trml ae57b7f205 Add more fields to ddnetcharacter 2019-05-02 00:34:03 +02:00
Learath b86c457c91 Remember whether a color is lit or not 2019-05-01 23:35:29 +03:00
Learath 57f58cc9c7 Refactoring mishap 2019-05-01 22:57:14 +03:00
Learath ca888c56a2 Lighten when rendering the teeselector aswell 2019-05-01 22:49:52 +03:00
Learath 5d0a1c8d0a Unlighten colors when sending to server 2019-05-01 22:49:52 +03:00
bors[bot] 9bca330a73 Merge #1691 
1691: Persist show_ips setting on map changes r=Learath2 a=def-

@12pm 

Co-authored-by: def <dennis@felsin9.de>
 2019-05-01 12:08:13 +00:00
Learath 689c7b29be Don't check dnsbl when alone 2019-05-01 14:54:51 +03:00
Learath a451bb15c5 Dummy colors are also colors 2019-05-01 14:19:38 +03:00
Learath b16c0b8aaf Lighten the default authed color 2019-05-01 14:15:00 +03:00
Learath bfeef8f9ad Use the color macro 2019-05-01 14:05:39 +03:00
Learath f479f69735 Add a flag for colors with alpha 2019-05-01 13:58:51 +03:00
Learath 324c389e87 Accept negatives aswell, don't clamp 2019-05-01 13:41:58 +03:00
Learath 3cfbd8376f Forgot default color for ui 2019-05-01 10:27:04 +03:00
bors[bot] a2f44299e0 Merge #1678 
1678: Handle colors in console r=def- a=Learath2

DEPENDS: #1654 

A better way to fix #1581 possibly deprecates #1597 

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-30 19:39:56 +00:00
Learath f9ab06476d Lighten tee colors of others 2019-04-30 19:49:53 +03:00
12pm 3f76e17830 Fix FillSelection with no selected brush 
As reported by BannZay on Discord
 2019-04-30 14:24:13 +02:00
bors[bot] 9699d4ef06 Merge #1694 
1694: Fix inconsistant uppercase server in logs r=def- a=ChillerDragon

```
$ grep -nr 'IConsole::OUTPUT_LEVEL_STANDARD, "server"' src/ | wc -l
31
$ grep -nr 'IConsole::OUTPUT_LEVEL_STANDARD, "Server"' src/ | wc -l
1
```

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-30 07:35:26 +00:00
ChillerDragon 7a7caabbec Fix inconsistant uppercase server in logs 2019-04-30 09:03:06 +02:00
def a910d9eff7 Persist show_ips setting on map changes 2019-04-29 21:39:17 +02:00
bors[bot] d8964ceedb Merge #1654 #1685 
1654: Try working on colors a bit r=def- a=Learath2

There were color functions everywhere, I tried cleaning it up a little. I still couldn't get the roundtrip from Hsl to Rgb to be exactly the same, but I think this is the best possible.

1685: Work on compound binds r=def- a=Learath2

Closes #1417 

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-29 15:56:16 +00:00
bors[bot] 70b3f1db21 Merge #1675 
1675: Remove unused vanilla code (closed #1658) r=def- a=ChillerDragon

Removed vanilla code from gamecontext and gamecontroller. I didn't search for the code all over the place I just remember seing it there a lot. Also removed some empty lines. Wanted to do this for a long time :)

thought there is an reason it is there. But we have git and the vanilla repo so I don't see any point keeping it there.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-29 07:24:01 +00:00
12pm 8fa6dada95 Highlight same clan as dummy too 
Fixes #1686
 2019-04-29 00:48:40 +02:00
Learath 6a1ef1af62 Can't access a siblings protected members? 2019-04-28 20:34:34 +03:00
Learath 2975d6998d Block ctrl+shift+ binds. Fixes #1490 2019-04-28 20:30:17 +03:00
Learath 66c89eafb2 Allow binding with modifiers in settings 2019-04-28 20:22:19 +03:00
Learath 1da935f4c1 Fix stuck input 2019-04-28 16:52:10 +03:00
Learath c0c79c69c3 Fix output 2019-04-28 16:37:20 +03:00
Learath 6b815b2375 Work on compound binds 2019-04-28 16:32:49 +03:00
bors[bot] a5096c4de0 Merge #1663 
1663: Use freeze end tick instead of a flag. Fix #1659 r=def- a=Learath2

I used -1 for deep frozen, and 0 for not frozen. Not really sure if this is the best way.

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-27 08:53:38 +00:00
Learath 05b3df0afa Add the default constructors 2019-04-27 02:07:11 +03:00
Learath 588acdda0d Consolidate color configs, extend debugging 2019-04-27 02:02:31 +03:00
Learath 979d58f830 Use colors in CTextRender 2019-04-27 01:34:20 +03:00
Learath 6c371a9a57 Even more refactoring 2019-04-27 01:11:15 +03:00
Learath 15058330fa Don't inherit from vector, more cleanup 2019-04-27 00:47:34 +03:00
Learath be26789872 Remove unused function 2019-04-26 22:57:40 +03:00
Learath 929d772071 Collateral 2019-04-26 22:38:18 +03:00
Learath 93d14a1eca Inconvenience for windows 2019-04-26 22:36:49 +03:00
Learath 1b668916f2 Fix the test, fix small bug 2019-04-26 21:01:41 +03:00
Learath ffa07d88cb Please -WError 2019-04-26 19:11:34 +03:00
Learath 69d78c21b4 Lighten tee colors 2019-04-26 16:38:16 +03:00
Learath 54afd2c5af No iostream 2019-04-26 15:09:12 +03:00
Learath 65a17599e1 Add ColorHSVA, phase out more vec3's 2019-04-26 15:06:32 +03:00
Learath 987b9f69de Only lighten if too dark 2019-04-25 23:29:31 +03:00
Learath 93265dbb9c Please MSVC 2019-04-25 21:09:32 +03:00
Learath f53f09339a Default constructor 2019-04-25 19:59:04 +03:00
Learath e637064a68 Don't store HSL separately 2019-04-25 19:49:27 +03:00
Learath 95a3a69e08 Start phasing out vectors for colors 2019-04-25 18:21:35 +03:00
Learath cc319e0152 Fix warnings and style 2019-04-25 15:04:36 +03:00
Learath 0f781df1dd Try handling colors in console 2019-04-25 14:48:53 +03:00
Dennis Felsing aa5458b81d Version 12.3.1 2019-04-25 08:20:01 +02:00
Dennis Felsing ab8b807c5d Shorten strings correctly (fixes #1652) 
Using a string to format itself is undefined behaviour.
 2019-04-25 08:19:31 +02:00
Learath 5e5def314f Add tests 2019-04-24 23:53:38 +03:00
Learath cc36af73be Cleanup colors 2019-04-24 23:53:26 +03:00
ChillerDragon ad7a2cdef2 Remove unused vanilla code (closed #1658) 2019-04-24 22:36:47 +02:00
def 4f99623b5e Version 12.3 2019-04-24 19:49:00 +02:00
Dennis Felsing a1a581ecc2
Merge pull request #1653 from Ryozuki/pr_use_ddnetnetchar 
Use the DDNet Network Character
 2019-04-24 19:47:12 +02:00
def b6d2ed268a another one 2019-04-24 18:33:31 +02:00
Learath 24408e6f3c Oops 2019-04-24 19:12:46 +03:00
def 6cf8999a2f Restore old FindEntities behaviour, make it usable to count entities 2019-04-24 18:01:30 +02:00
trml 0b5f387779 Remove unneded check 2019-04-24 17:04:51 +02:00
trml 1db0d2ff40 Don't use freeze and deepfreeze flags for prediction yet 2019-04-24 15:56:56 +02:00
trml 2f35c64e6e Initialize array and fix warning 2019-04-24 15:56:07 +02:00
Ryozuki 502ebc5628 fix all conflicts 2019-04-23 20:45:54 +02:00
Ryozuki 42a5d7a9c1 fix conflicts 2019-04-23 20:42:07 +02:00
Dennis Felsing dc1e638fb9
Merge pull request #1664 from Learath2/dd_pr_solofix 
Fix solo bug
 2019-04-23 20:03:58 +02:00
Dennis Felsing 3f99dfdbcd
Merge pull request #1666 from Ryozuki/pr_fix_solo_spec 
fix ghosts in spec
 2019-04-23 20:03:01 +02:00
Ryozuki 87c797e84d fix ghosts in spec 2019-04-23 19:22:58 +02:00
bors[bot] 526af034dd Merge #1620 
1620: Rewrite of prediction code, with additional prediction (updated) r=def- a=trml

This is a reworked attempt at a rewrite of the prediction code (#464), to allow for more client side prediction. It doesn't fix the duplication of server code, but the client code should otherwise be cleaner. This includes separating prediction code out of gamecore/gameclient, and a refactor of the rendering of predicted characters.

There is also prediction for some new things, and some other changes:
- prediction of laser, shotgun, ninja, fng hammer, pickups and ddrace tiles (freeze/unfreeze tiles with cl_predict_freeze)
- laser and bullets are rendered when you fire them and bullets don't go through walls (when both cl_antiping_grenade and cl_antiping_weapons are enabled)
- antiping for flags
- prediction of dummy input
- an additional smoothing option that attempts to make antiping less jumpy (cl_antiping_smooth)

Co-authored-by: trml <trml@users.noreply.github.com>
Co-authored-by: trml <trml@noreply.github.com>
 2019-04-23 17:11:21 +00:00
Learath 5d4461981a Fix solo bug 2019-04-23 19:46:51 +03:00
Learath 67668d7fb2 Use freeze end tick instead of a flag. Fix #1659 2019-04-23 18:57:26 +03:00
bors[bot] 34542e64b5 Merge #1655 
1655: Add delete projectiles on death settings r=def- a=12pm

Need this for a map fix and doesn't hurt to have for grenades too I guess. Defaults are still the same

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-23 14:43:23 +00:00
12pm 808bb1303a Disable demo shortcuts in console 
As reported here: https://forum.ddnet.tw/viewtopic.php?f=3&p=67807#p67807
 2019-04-23 14:52:32 +02:00
trml 681f30950c Remove the dummy prediction 2019-04-23 02:01:17 +02:00
trml 3d8bd174e7 Add extended data to CCharacter and improve prediction of super/solo/endless/superjump 2019-04-22 00:38:24 +02:00
12pm a83e3e0d9a Add delete projectiles on death settings 2019-04-21 20:17:41 +02:00
Ryozuki d6cc94f839
fix hook col a bit 2019-04-21 19:35:07 +02:00
trml 78c8f42784 Put public members in a single block 2019-04-21 16:12:21 +02:00
trml e88459acec Make more variables private 2019-04-21 16:12:21 +02:00
trml c5c837e0e3 Revert dummy input fix (which wasn't a sufficient fix) 2019-04-21 16:12:21 +02:00
trml 92ef0b0707 Collapse if statements 2019-04-21 16:12:21 +02:00
trml 0b3f3b03b5 Rewrite of prediction code, with additional prediction 2019-04-21 16:12:20 +02:00
Ryozuki 7d4fdb3322
update the core server-side 2019-04-21 15:16:28 +02:00
Ryozuki 6bfdad9771
fix super and solo 2019-04-21 14:57:45 +02:00
Ryozuki eecdfd2af8
fix hook and colision on super 2019-04-21 10:45:11 +02:00
def fc68f3add1 Version 12.2 2019-04-20 12:40:55 +02:00
Ryozuki eaef31d4a0
fix wording and add/fix no col and no hook 2019-04-19 11:59:09 +02:00
Ryozuki 0f3411f8fa
fix wording 2019-04-19 11:46:54 +02:00
Ryozuki f37f8a8268
add all character flags to ddnetnetwork character 2019-04-19 11:17:28 +02:00
bors[bot] bbf485a9ac Merge #1628 
1628: Make client know about other solo players, fixes #258 r=heinrich5991 a=Ryozuki

When another player is in solo and you are not, you could notice a weird collision and also the hook moving a little towards the solo player. This as been fixed.

It also applies m_ClShowOthersAlpha to other players whenever you are on solo or others are.

It uses the protocol extension thingy.

fixes #258 

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
Co-authored-by: Learath <learath2@gmail.com>
 2019-04-18 23:03:52 +00:00
bors[bot] f15dd6303e Merge #1648 
1648: Fix mute typo r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-18 20:00:53 +00:00
12pm 997e01bf31 Fix mute typo 2019-04-18 20:54:22 +02:00
Dennis Felsing 04ac4932c6
Merge pull request #1645 from def-/pr-str_copy_num 
str_num_copy -> str_truncate, as in Vanilla 0.7
 2019-04-18 10:25:25 +02:00
Dennis Felsing 00c87c121a str_num_copy -> str_truncate, as in Vanilla 0.7 2019-04-18 10:25:01 +02:00
Learath d6bfef2cc0 Use a NetObj instead of a system message 2019-04-17 23:47:32 +02:00
12pm 7901cc26ad More reasonable layer size limits 2019-04-17 21:48:23 +02:00
12pm 50236ca45c Add editor copy & paste 2019-04-17 21:47:52 +02:00
Dennis Felsing 6e74d9d728 remove debugging 2019-04-17 14:12:35 +02:00
Dennis Felsing b425495f45 Fix draggers 2019-04-17 12:58:53 +02:00
def 9f3df78cae Fix typo 2019-04-16 20:37:12 +02:00
Learath 843dc29a88 Names can include quotes :/ 2019-04-16 02:39:22 +02:00
Learath dd62629ee9 Clean statboard chat parsing a bit 2019-04-16 01:47:12 +02:00
bors[bot] de5970579b Merge #1642 
1642: Add some demo player shortcuts r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-15 19:22:10 +00:00
12pm 6e880644af Add some demo player shortcuts 2019-04-15 21:08:12 +02:00
bors[bot] 091e41206c Merge #1635 
1635: Editor save menu improvements r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-15 18:40:34 +00:00
def 9dddb290dd File score: Implement negative top5 (fixes #1631) 2019-04-15 18:55:33 +02:00
Dennis Felsing aad18ebb86
Merge pull request #1624 from ChillerDragon/pr_refactor_mute 
Refactor mute and vote mute code
 2019-04-13 17:52:55 +02:00
FallenKN c69c4727ef removed unnecessary brackets 2019-04-13 15:22:31 +02:00
FallenKN 83b385f8a5 Fix #1636 2019-04-13 14:33:25 +02:00
def f1cf222e95 Editor: Don't enter directory name in filename in save menu 2019-04-13 13:21:05 +02:00
def 598c8cf1c6 Editor: Left align "New folder" button in save menu 2019-04-13 13:21:00 +02:00
def 87f588d8a3 Editor: Don't jump to first entry in file list when editing 
Fixes saving a new map when a subdirectory already exists
 2019-04-13 13:20:56 +02:00
ChillerDragon deaab4bb4b Add functions instead of goto 2019-04-12 19:50:02 +02:00
Ryozuki fb84bd1f0b
fix prediction when antiping is on 2019-04-12 17:08:06 +02:00
Ryozuki c686ceea53
Merge branch 'master' into pr_fix_solo 2019-04-12 16:34:43 +02:00
Ryozuki 3556830b9a
fix solo prediction 2019-04-12 16:29:13 +02:00
Ryozuki 7e43120b6e
make the client aware of other players solo status 2019-04-12 16:16:21 +02:00
bors[bot] 826a7781ae Merge #1621 
1621: Actually enable -Wuseless-cast r=heinrich5991 a=def-

It's not supported in C and we only checked using a C compiler.

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-04-12 00:08:19 +00:00
12pm a1dd2e45a5 Fix non destructive drawing with hookthrough shortcut 
Fixes #1623
 2019-04-11 21:43:22 +02:00
ChillerDragon a6d00973e1 Refactor mute and vote mute code 2019-04-11 20:10:04 +02:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast 
But don't enable it yet because I'm not sure what the best way is.
 2019-04-11 19:54:43 +02:00
bors[bot] cde3781184 Merge #1616 
1616: Minor CFileScore improvements r=heinrich5991 a=def-

It's written using STL strings and files intead of using system. Didn't change any of that because of the risk of breaking something unintentionally.

Co-authored-by: def <dennis@felsin9.de>
 2019-04-11 09:41:01 +00:00
def 0a286b1d94 File score: report file opening errors 2019-04-11 08:15:14 +02:00
bors[bot] 279eeed9fc Merge #1614 
1614: Remove unmaintained Android code (fixes #1575) r=heinrich5991 a=def-

Thoughts?

Co-authored-by: def <dennis@felsin9.de>
 2019-04-11 00:02:17 +00:00
bors[bot] 92a0dc8366 Merge #1618 
1618: Implement color_to_rgb r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-10 23:38:29 +00:00
bors[bot] 933f938b48 Merge #1619 
1619: Rcon console fixes r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-10 23:27:13 +00:00
def b91530eedc Console: Can't deallocate temp entries, so don't even try 2019-04-10 23:32:45 +02:00
def ab9912c9c1 Rcon console: Don't show duplicates 
when connecting to next server after old server shutdown
 2019-04-10 23:31:06 +02:00
def 2eab795c9e Implement color_to_rgb 2019-04-10 22:45:30 +02:00
fokkonaut 15658b3b10
removed brackets 2019-04-10 22:13:10 +02:00
def 279d6e60ca No duplicate () on rank 2019-04-10 22:05:44 +02:00
fokkonaut b92607eb7d
fix no score when joining when using file based score 2019-04-10 21:40:31 +02:00
def 94f3d97ddf Remove unmaintained Android code (fixes #1575) 2019-04-10 19:40:50 +02:00
def 11127f9344 Release fixes 2019-04-10 17:57:56 +02:00
Dennis Felsing 93b88647eb
Merge pull request #1612 from def-/pr-12.1 
Version 12.1
 2019-04-10 17:38:37 +02:00
Dennis Felsing ed34dcfec5
Merge pull request #1602 from def-/pr-explain-tiles 
Explain game tiles and entities in editor (fixes #1600)
 2019-04-10 17:38:22 +02:00
Dennis Felsing 5d79c41010
Merge pull request #1603 from def-/pr-demo-open 
Enable dragging demo file into client to play it directly
 2019-04-10 17:38:00 +02:00
Dennis Felsing 2d69935a6b Add explanations for TILE_THROUGH_CUT/ALL/DIR 2019-04-10 15:48:23 +02:00
bors[bot] f0cce17bfc Merge #1597 
1597: Console command "color_from_rgb" (fixes #1581) r=heinrich5991 a=def-

Converts RGB colors to TW's HSL format

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-04-10 12:21:19 +00:00
Dennis Felsing fc5810fa56 Version 12.1 2019-04-10 14:17:06 +02:00
Dennis Felsing 7c0f4c9856 Address reviewer comments 2019-04-10 09:00:06 +02:00
Dennis Felsing bd4e3716a1 color -> color_from_rgb 2019-04-10 08:58:08 +02:00
bors[bot] b05b268a6a Merge #1598 #1601 #1605 #1606 #1607 #1609 
1598: Fix home/end keys in console r=heinrich5991 a=def-



1601: 2 more tries to force DB to respond in UTF8 (fixes #1599) r=heinrich5991 a=def-



1605: Fix memory leak in draggers r=heinrich5991 a=def-



1606: Always initialize m_InfosLoaded r=heinrich5991 a=def-

otherwise it's uninitialized and then read, found by valgrind --tool=memcheck

1607: Enable a few more GCC warnings r=heinrich5991 a=def-



1609: Fix C90 compatibility on Windows r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-09 22:09:18 +00:00
def fe432b8ae4 Enable a few more GCC warnings 2019-04-09 22:05:21 +02:00
def 0e7a514c7b Fix C90 compatibility on Windows 2019-04-09 21:58:04 +02:00
Dennis Felsing bdb579330d Improve game tile explanations a bit 
As suggested by Bojidar and jao
 2019-04-09 14:23:40 +02:00
bors[bot] d4d6ab681d Merge #1593 
1593: Add emacs style ctrl-a ctrl-e navigation r=def- a=ChillerDragon

Im sure im not the only one who keeps pressing ctrl-a and ctrl-e in the teewoods console and nothing happens .-.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-09 10:54:04 +00:00
ChillerDragon 0b18d6eb44 Remove if nesting for compose keys in console 2019-04-09 12:11:29 +02:00
def 05fe69751d Add jao's explanations for telegun 2019-04-08 22:36:47 +02:00
def c3e36ee483 Always initialize m_InfosLoaded 2019-04-08 22:13:47 +02:00
def 708019c675 Grammar fix: Catched -> Caught 2019-04-08 21:54:33 +02:00
def 173b43d487 Fix memory leak in draggers 2019-04-08 21:54:12 +02:00
12pm 7b95d38bf3 Fix crash when draggers don't have a number 2019-04-08 21:47:22 +02:00
def cca80da554 Enable dragging demo file into client to play it directly 2019-04-08 21:43:59 +02:00
def eda16acbca Explain game tiles and entities in editor (fixes #1600) 
- Explanations by Lady Saavik taken from https://ddnet.tw/explain/
- CCW/CW were mixed up in enum names, fixed
- Make sure that the texts fits, otherwise reduce font size
- Still need explanations for Portal tiles
 2019-04-08 19:39:56 +02:00
def ea093f6d39 2 more tries to force DB to respond in UTF8 (fixes #1599) 2019-04-08 16:55:53 +02:00
def 527859e70c Fix home/end keys in console 2019-04-07 23:28:30 +02:00
def 01ffde25f3 Console command "colors" (fixes #1581) 
Converts RGB colors to TW's HSL format
 2019-04-07 22:54:29 +02:00
Ryozuki be708d0498
a mess 2019-04-07 21:18:43 +02:00
bors[bot] a4e2130342 Merge #1571 
1571: show_ips r=heinrich5991 a=def-

The problem is that the same console output is sent to all right now,
not sure how to change that cleanly

Co-authored-by: def <dennis@felsin9.de>
 2019-04-07 19:01:21 +00:00
bors[bot] 52c00dcc02 Merge #1573 
1573: Handle FS failures while updating (fixes #1560) r=heinrich5991 a=def-

Not sure if I caught all locations

Co-authored-by: def <dennis@felsin9.de>
 2019-04-07 18:50:08 +00:00
Ryozuki 0138dd32e3
apply alpha to solo players 2019-04-07 19:42:26 +02:00
Ryozuki 813c24bf29
add m_IsSolo and fix hook col 2019-04-07 18:58:49 +02:00
ChillerDragon e9f8bd42b7 Add emacs style ctrl-a ctrl-e navigation 2019-04-07 15:59:15 +02:00
bors[bot] 4931d00201 Merge #1589 
1589: Remove some code duplication in CSaveTee::LoadString r=def- a=def-

by using a switch-case with fallthroughs, seems like the perfect use case.

Co-authored-by: def <dennis@felsin9.de>
 2019-04-07 12:01:59 +00:00
Jordy Ruiz 1e0cc51ba1 Add bound check in datafile.cpp anywhere m_ppDataPtrs is accessed as an array. Should fix #2073 
(cherry picked from commit e086f4b35b)
 2019-04-07 13:10:07 +02:00
bors[bot] 5d9d0d7d35 Merge #1587 
1587: Small fixxings r=heinrich5991 a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-06 21:08:40 +00:00
def e27679ebcc Remove some code duplication in CSaveTee::LoadString 
by using a switch-case with fallthroughs
 2019-04-06 20:28:47 +02:00
Dennis Felsing edbd899471
Merge pull request #1588 from Ryozuki/pr_save_telegun 
Save telegun on /save
 2019-04-06 20:24:37 +02:00
def e539bbacb1 Handle FS failures while updating (fixes #1560) 
Not sure if I caught all locations
 2019-04-06 19:24:40 +02:00
def 25c54ef4db Implement show_ips to protect accidental leaking of IPs 
Marks all sensitive data with <{ }> and then filters that out when
show_ips is not set.
 2019-04-06 19:22:02 +02:00
Ryozuki 52b58c3d5b
final fix 2019-04-06 18:38:25 +02:00
Ryozuki 69fd7f1767
fix and add gameuuid 2019-04-06 18:37:25 +02:00
Ryozuki fb398ebcbf
better this way 2019-04-06 18:19:56 +02:00
Ryozuki beeda4d7bb
fix warnings 2019-04-06 18:18:46 +02:00
Ryozuki b92b2f1878
save telegun on /save 2019-04-06 18:13:11 +02:00
bors[bot] b25c5275d5 Merge #1585 
1585: Use OpenSSL md5 if it is available r=def- a=heinrich5991

Fixes #1582.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-04-06 15:43:24 +00:00
ChillerDragon 905204781b Cleanup if nesting 2019-04-06 17:22:15 +02:00
ChillerDragon ce5a7ea626 Remove one of two graphic includes 2019-04-06 17:07:17 +02:00
ChillerDragon abba71e6d6 Fix tw code style 2019-04-06 17:06:12 +02:00
bors[bot] ea82402e7e Merge #1574 
1574: Updater localization and update language files r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-06 14:53:46 +00:00
bors[bot] 2f4dd5ae2c Merge #1572 
1572: cl_mouse_min_distance as requested by Makoyuri r=heinrich5991 a=def-

also cl_dyncam_min_distance

Co-authored-by: def <dennis@felsin9.de>
 2019-04-06 14:17:25 +00:00
def 9df30dc235 Localize mentions 2019-04-06 15:18:40 +02:00
def 330a99686d Add localization for updating output 2019-04-06 15:18:35 +02:00
12pm 98bfeb3e72 Notify about chat mentions in editor 2019-04-06 11:32:50 +02:00
heinrich5991 e3657ab2d5 Use SHA256 instead of MD5 in some places 
This only works in places where the actual choice of hashing function
doesn't matter.
 2019-04-06 02:56:29 +02:00
heinrich5991 e44b1ca986 Use OpenSSL md5 if it is available 
Fixes #1582.
 2019-04-06 02:56:29 +02:00
Ryozuki f0a4da58cb
Merge branch 'master' into add_clan_color 2019-04-05 16:46:14 +02:00
Ryozuki 4e3b2191a2
fix wrong variable 2019-04-05 13:47:38 +02:00
Ryozuki 06e8a07b99
fix phrasing 2019-04-05 13:36:18 +02:00
Ryozuki 735aab9609
fix braces 2019-04-05 13:25:17 +02:00
Ryozuki bb3cde4369
add color to ping in scoreboard 2019-04-05 13:12:08 +02:00
Ryozuki ef6d4b5de6
add clan color to people with same clan as you 2019-04-05 12:41:01 +02:00
def e31561eb47 cl_mouse_min_distance as requested by Makoyuri 
also cl_dyncam_min_distance
 2019-04-04 20:19:37 +02:00
Dennis Felsing a7dabe3475
Merge pull request #1570 from 12pm/playerflags 
Add playerflags, dnsbl, and ips for non-admins in status
 2019-04-04 18:55:40 +02:00
Dennis Felsing fc76c2219f
Merge pull request #1566 from def-/pr-demo-speed 
Demo speed improvements
 2019-04-03 19:02:42 +02:00
Dennis Felsing 1fd130cf15
Merge pull request #1564 from def-/pr-dummy-fixes 
Some more dummy fixes (might fix #1415)
 2019-04-03 19:02:28 +02:00
Dennis Felsing b468552c43
Merge pull request #1563 from def-/pr-gun-sound 
Enable gun sound by default
 2019-04-03 19:02:14 +02:00
12pm a7ef921e3f Add playerflags, dnsbl, and ips for non-admins in status 2019-04-03 15:07:05 +02:00
bors[bot] d72929d33b Merge #1567 
1567: Make world offset calculation more accurate r=def- a=12pm

Noticed that after some time groups with a parallax different than 100 were incorrectly rendered in the editor

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-03 06:08:15 +00:00
12pm 4efc0e3b82 Make world offset calculation more accurate 
Noticed that after some time groups with a parallax different than 100 were incorrectly rendered in the editor
 2019-04-03 01:05:38 +02:00
def 9daa3beacd Broadcast: Fix display time during demo replay 
Only show for the same amount of ticks as originally, not number of
seconds, otherwise at high demo speeds you will see the broadcast for a
much longer game play time than originally.
 2019-04-02 23:28:13 +02:00
def e25d43aaf6 Extend GUI options for available demo speeds up to 64 2019-04-02 23:20:44 +02:00
def 989726db00 Allow demo speeds up to 256 2019-04-02 23:16:01 +02:00
12pm ff48221797 Validate game layer hookthrough shortcut 
Fixes #1556
 2019-04-02 22:55:12 +02:00
def ad70456687 Some more dummy fixes (might fix #1415) 2019-04-02 22:02:55 +02:00
def 392fe03844 Enable gun sound by default 2019-04-02 21:52:02 +02:00
def ef0e685496 Make timestamp consistent in scores 
The motivation is to have the exact same timestamp for every member
finishing in a team and the team rank as well. This makes the database
more consistent and tooling easier.
 2019-04-02 20:18:40 +02:00
yangfl ee104428bb Fix negative numbers in char 
On some architectures char can be unsigned, which makes g++
very unhappy.

  error: narrowing conversion of '-128' from 'int' to 'char' inside { }
 2019-04-02 23:19:20 +08:00
def ea6c69c273 Version 12.0.1 2019-03-30 17:01:00 +01:00
Dennis Felsing 0b76009644
Merge pull request #1553 from def-/pr-official-tab 
No checkmark in DDNet/KoG tab (as suggested by Alexander)
 2019-03-30 17:00:12 +01:00
Dennis Felsing 20f5d20692
Merge pull request #1552 from def-/pr-fix-confirm-time 
Fix cl_confirm_disconnect/quit_time (fixes #1550)
 2019-03-30 17:00:02 +01:00
Dennis Felsing 7f28f882c2
Merge pull request #1551 from def-/pr-sql-command-completion 
Command completion for /times, /points and /top5points
 2019-03-30 16:59:50 +01:00
def c0d3f5fa57 Actually disconnect dummy after confirmation (fixes #1555) 2019-03-30 16:59:25 +01:00
def 3248d94ace No checkmark in DDNet/KoG tab (as suggested by Alexander) 2019-03-29 23:08:11 +01:00
Dennis Felsing 0b578c4330 Fix cl_confirm_disconnect/quit_time (fixes #1550) 
-1 now works as described
Split into two settings
 2019-03-29 14:56:02 +01:00
Dennis Felsing 2dd78b6568 Command completion for /times, /points and /top5points 
Still not implemented for file based servers of course
 2019-03-29 14:39:48 +01:00
bors[bot] 5c919b6aab Merge #1549 
1549: Allow editing texture UV offsets in Quad properties r=def- a=bojidar-bg

Partial manual cherrypick of de82ad7a26.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2019-03-29 13:11:18 +00:00
Bojidar Marinov 6ca6fce0b2
Allow editing texture UV offsets in Quad properties. 
Manual cherrypick of de82ad7a26, original code by @cinaera
 2019-03-29 13:38:21 +02:00
def 4645b69401 Version 12.0 2019-03-28 23:39:30 +01:00
Dennis Felsing d12ad9d05f
Merge pull request #1548 from def-/pr-vote-mute 
Remove vote mute after it expired (fixes #1544)
 2019-03-28 23:38:45 +01:00
Dennis Felsing 4ed50440a8
Merge pull request #1547 from def-/pr-kill-harder 
After a char was killed stop processing further tiles
 2019-03-28 23:38:39 +01:00
Dennis Felsing 5124372e9d
Merge pull request #1546 from def-/pr-glyph-missing 
Fix text render when a glyph is missing (fixes #1543)
 2019-03-28 23:38:31 +01:00
Dennis Felsing 138a9c6ff7
Merge pull request #1545 from def-/pr-load-font 
Move out common font loading into method
 2019-03-28 23:38:24 +01:00
Dennis Felsing 95cc357dd6
Merge pull request #1540 from def-/pr-disconnect-time 
Add cl_confirm_disconnect_quit_time (fixes #1530)
 2019-03-28 23:38:16 +01:00
Dennis Felsing 72200a4e09
Merge pull request #1539 from def-/pr-esc-popup 
Escape during popup: Only make popup disappear
 2019-03-28 23:38:00 +01:00
Dennis Felsing 11fee99b9c
Merge pull request #1538 from def-/pr-kog-tab 
Add KoG tab in server browser
 2019-03-28 23:37:50 +01:00
def 09412f43f7 Remove vote mute after it expired (fixes #1544) 2019-03-28 23:35:51 +01:00
def c489fb61be After a char was killed stop processing further tiles 2019-03-28 23:29:34 +01:00
def 4171db48a9 Fix text render when a glyph is missing (fixes #1543) 
Instead show □ (white square, 0x25a1) as replacement character

The old behaviour was to continue when a glyph was missing, not load
the glyph and then instead fill the bitmap with random garbage that was
still in the buffer. Introduced by https://github.com/ddnet/ddnet/pull/1081
 2019-03-28 22:46:08 +01:00
def 9e25f4c113 Move out common font loading into method 2019-03-28 21:51:42 +01:00
12pm 427171bb17 Merge "Add Quad/Sound" + shortcut to add them at mouse position, add quads true to size 2019-03-28 13:41:07 +01:00
12pm 0abbba4c5d Add non-destructive brush drawing 
New brush draw mode that doesn't override existing tiles. Empty brush still acts as an eraser. Button and ctrl+d shortcut to toggle it.
 2019-03-26 19:19:25 +01:00
def e6f327ef06 Move ingame browser tabs all the way left 2019-03-26 17:38:46 +01:00
def 8908102536 Add cl_confirm_disconnect_quit_time (fixes #1530) 
Number of minutes of active racing time before being asked to confirm
disconnecting, disconnecting dummy or quitting through GUI. Defaults to
20 minutes, -1 to disable, 0 to always enable.

Also removed confirmation to quit when in main menu, except when having
an unsaved map in editor.

Spectate and kill should already be safe thanks to server-side kill
protection.
 2019-03-25 20:10:38 +01:00
def d31e9833f9 Escape during popup: Only make popup disappear 
Not the menu. Otherwise when opening the menu again the popup will
reappear for one frame before disappearing.
 2019-03-25 20:01:10 +01:00
def bf576723a3 Add KoG tab in server browser 
- As requested by qshar and KoG players
- Similar to DDNet tab
- Info fetched from servers-kog entry from https://info.ddnet.tw/info
- Also supports countries and types
- Doesn't inform whether map has been finished
- Generalized the code a bit but it's still ugly
- Depends on #1533, also shows KoG servers as official/verified
 2019-03-24 23:15:40 +01:00
def ea6b741eb8 thread_sleep: ignore signal interruption 2019-03-24 23:14:37 +01:00
bors[bot] 958778b441 Merge #1531 
1531: Don't rotate static game tiles and fix switch rotation r=def- a=12pm

Should be handy for mapping.
Can be disabled by activating unused tiles (don't think it's worth a separate toggle and if you want to do it, you're doing something unusal)

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-03-24 19:43:27 +00:00
12pm 4ca69a39de Default layer names to the selected image/sound 
And don't paste default names into the edit field
 2019-03-24 03:22:29 +01:00
12pm dff702bd2c Don't rotate static game tiles and fix switch rotation 
Should be handy for mapping.
Can be disabled by activating unused tiles (don't think it's worth a separate toggle and if you want to do it, you're doing something unusal)
 2019-03-23 01:11:32 +01:00
Dennis Felsing 05f927b8ca
Merge pull request #1507 from ddnet/chat-command-autocomplete 
Autocomplete chat commands (fixes #1504)
 2019-03-21 19:12:52 +01:00
bors[bot] 4c7b6f949e Merge #1528 
1528: str_format: always return length of written string r=heinrich5991 a=def-

As deducted from https://github.com/ddnet/ddnet/pull/1527

Co-authored-by: def <dennis@felsin9.de>
 2019-03-21 13:09:57 +00:00
def d9804f5142 str_format: always return length of written string 
Quoting the man page of vsnprintf:

RETURN VALUE
  Upon successful return, these functions  return  the  number  of  characters  printed
  (excluding the null byte used to end output to strings).

  The functions snprintf() and vsnprintf() do not write more than size bytes (including
  the terminating null byte ('\0')).  If the output was truncated due  to  this  limit,
  then  the  return  value  is the number of characters (excluding the terminating null
  byte) which would have been written to the final string  if  enough  space  had  been
  available.  Thus, a return value of size or more means that the output was truncated.
  (See also below under NOTES.)

  If an output error is encountered, a negative value is returned.

[...]

  The glibc implementation of the functions snprintf() and vsnprintf() conforms to  the
  C99  standard,  that  is, behaves as described above, since glibc version 2.1.  Until
  glibc 2.0.6, they would return -1 when the output was truncated.
 2019-03-21 13:39:25 +01:00
bors[bot] 0072c9843c Merge #1527 
1527: Leave space for \0 byte (fixes #1526) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-03-21 12:12:45 +00:00
12pm 34c99f5944 Don't enforce own votes when moderating 
It's counterintuitive, and hence way too risky
 2019-03-21 02:57:22 +01:00
def 82f9474eb4 Leave space for \0 byte (fixes #1526) 2019-03-20 18:27:08 +01:00
Dennis Felsing 1add4a0819 Only print team join message when not in team already (fixes #1524) 2019-03-20 14:01:32 +01:00
Dennis Felsing abe9f6f5a9
Merge pull request #1518 from ddnet/fetch-info 
Demo browser: Make Fetch Info a checkbox instead
 2019-03-20 07:45:12 +01:00
Dennis Felsing 8b68a2859a
Merge pull request #1509 from ddnet/error-checking 
More error checking in system.c (fixes #1317)
 2019-03-20 07:44:12 +01:00
bors[bot] b1f3692980 Merge #1514 #1521 #1522 #1523 
1514: Square and center icons before rendering them on button r=Learath2 a=def-



1521: Remove unused norank icon from browse_icons.png r=heinrich5991 a=def-



1522: Reset authed level in client r=Learath2 a=def-

As reported by jao on Discord:

22:26 jao @Learath2 client auth level needs to reset on server join or something
22:28 jao because other servers don't send it

1523: Make updating nameban reason work r=def- a=12pm



Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-03-19 23:08:37 +00:00
def 1e4890c499 More error checking in system.c (fixes #1317) 2019-03-19 23:16:29 +01:00
12pm 9f4f06e995 Make updating nameban reason work 2019-03-19 22:54:16 +01:00
def 9ea9a43f13 Reset authed level in client 
As reported by jao on Discord:

22:26 <jao> @Learath2 client auth level needs to reset on server join or something
22:28 <jao> because other servers don't send it
 2019-03-19 22:29:41 +01:00
bors[bot] 9d623cb23c Merge #1516 #1517 
1516: Remove useless comments r=heinrich5991 a=def-

Not sure if we want to do this kind of cleanup

1517: Fix rendering of checkbox x r=heinrich5991 a=def-

old:
![screenshot-20190319@163151](https://user-images.githubusercontent.com/2335377/54619252-9811d000-4a64-11e9-92cf-df3e3c325566.png)

new:

![screenshot-20190319@163137](https://user-images.githubusercontent.com/2335377/54619237-91835880-4a64-11e9-9775-7625bbcd3cb3.png)

Co-authored-by: def <dennis@felsin9.de>
 2019-03-19 21:15:40 +00:00
Ryozuki 6ed3276d20
fix formatting 2019-03-19 20:32:01 +01:00
Ryozuki e00e9f126a
add vote_mutes 2019-03-19 20:25:21 +01:00
Ryozuki 43a1990e5d
ConVoteUnMute -> ConVoteUnmute 2019-03-19 20:18:11 +01:00
Ryozuki d469654629
add vote_unmute and display on chat 2019-03-19 20:07:33 +01:00
def 22f278fdb8 Demo browser: Make Fetch Info a checkbot instead 
And persist the result. Helps with the workflow described by Shyzo on
Discord:

> I mean after i press ctrl-f or fetch info. then i want to sort by marker (from ... to 0) and just delete every demo without a marker. either in a whole (not possible i think) or just one by one. but I think after deleting one demo the order of demos change again
> so i have to fetch info again, delete one. fetch info again. delete one
> and so on
 2019-03-19 18:28:10 +01:00
def 04d67c02f2 Square and center icons before rendering them on button 2019-03-19 17:26:36 +01:00
def 4468f61ee2 Fix rendering of checkbox x 2019-03-19 16:31:24 +01:00
def 2c640b626f Remove useless comments in menus.cpp 2019-03-19 16:25:07 +01:00
def f51c12cabe Fix alignment of x inside button 2019-03-19 16:14:23 +01:00
def 58d9bd4105 Make cl_authed_player_color modifiable 
Old color was rgb = (0.78, 1.0, 0.8)
In hsl = (125°, 100%, 89%)
Converted to hex hsl:
H = 125° / 360° * 255 = 89 = 0x59
S = 100% = 0xFF
since the TW HSL color system fobids too dark colors it uses l = 0.5 + 0.5*L/255
so L = (0.89 - 0.5) * 2*255 = 199 = 0xC7
So in total we get 0x59FFC7 = 5898183
 2019-03-19 15:37:17 +01:00
def da08b7b86f Autocomplete chat commands (fixes #1504) 2019-03-19 10:33:08 +01:00
bors[bot] 38333b65a1 Merge #1506 
1506: Color authed players in spec (fixes #1497) r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-03-19 08:16:34 +00:00
bors[bot] 2209113027 Merge #1505 
1505: Add symbol for official servers in server browser (fixes #1501) r=heinrich5991 a=def-

- Also fix favorites checkbox when removing favorite
- Might need a nicer looking symbol

![screenshot-20190319@074729](https://user-images.githubusercontent.com/2335377/54585760-4b55d700-4a1b-11e9-962c-92c1b56659fd.png)

Co-authored-by: def <dennis@felsin9.de>
 2019-03-19 07:48:07 +00:00
def 0f9b89fc74 Color authed players in spec (fixes #1497) 2019-03-19 08:16:46 +01:00
def ed5b08e7dc Also recheck official server status when json gets loaded 2019-03-19 07:57:09 +01:00
def 4f515bf67e Add symbol for official servers in server browser (fixes #1501) 
- Also fix favorites checkbox when removing favorite
- Might need a nicer looking symbol
 2019-03-19 07:46:50 +01:00
12pm 679628c4eb Exclude current map on random map votes 2019-03-18 15:10:27 +01:00
Dennis Felsing 7a23baa020
Merge pull request #1502 from fokkonaut/master 
Remove AllowTimeScore from browser (fixes #1499)
 2019-03-18 13:24:55 +01:00
fokkonaut 55150bb7d6 Remove AllowTimeScore from browser (fixes #1499) 2019-03-18 13:13:37 +01:00
Dennis Felsing 1fec65572b
Merge pull request #1500 from 12pm/extraeditor-fix 
Fix editor render glitch
 2019-03-18 07:58:12 +01:00
12pm 90e2b355ae Fix editor render glitch 2019-03-18 02:34:24 +01:00
12pm 8fb77f1a26 Fit sound name in select button too 2019-03-18 01:14:32 +01:00
def 1bdea91abf Version 11.9 2019-03-16 10:56:07 +01:00
bors[bot] 1d9eb965fa Merge #1485 
1485: Browser's scoreboard now shows score based on cl_ddrace_scoreboard r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-03-12 22:47:38 +00:00
12pm ffe50b3b25 Don't change active edit box corners to default 2019-03-12 22:25:01 +01:00
bors[bot] 6a791fe8de Merge #1486 
1486: Fit image name in select button r=def- a=12pm

Adjusts font size a bit and truncates text if it overflows

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-03-12 20:12:09 +00:00
fokkonaut 8440b051f7
forgot one thing 2019-03-12 19:36:33 +01:00
12pm 0dd0de5ad4 Fit image name in select button 
Adjusts font size a bit and truncates text if it overflows
 2019-03-12 19:35:22 +01:00
fokkonaut 3f628de592
Update menus_browser.cpp 2019-03-12 19:33:47 +01:00
def bbec3b1f2f Minor style fixes 2019-03-12 19:29:18 +01:00
def 6701000931 Rename Score board to Scoreboard for consistency 2019-03-12 19:00:47 +01:00
def 6f9cfd5af1 Increase MAX_PATH_LENGTH to support our own downloadedmaps names 2019-03-12 18:43:03 +01:00
Dennis Felsing 984df7f49d
Merge pull request #1481 from 12pm/game-tiles 
Add auto game tiles to all possible layers, increase layer size if needed
 2019-03-12 16:54:04 +01:00
bors[bot] 98d54263c7 Merge #1477 
1477: Don't allow sound format changes, use preferred driver, print more debug info r=heinrich5991 a=def-

Someone should check if this works on Windows.

Co-authored-by: def <dennis@felsin9.de>
 2019-03-12 12:49:48 +00:00
12pm 7c227c563d Add auto game tiles to all possible layers, increase layer size if needed 2019-03-12 02:35:29 +01:00
heinrich5991 8b3f0246a9 Use EXPECT_* rather than ASSERT_* in tests 
`EXPECT_*` allows the test to continue even in the case of failure. Use
this where it makes sense to continue.
 2019-03-12 02:06:54 +01:00
fokkonaut 5c1dfe6b65 Scoreboard headline for score can now be Time when on DDRace 2019-03-11 23:10:21 +01:00
Dennis Felsing f0cce859ef
Merge pull request #1476 from ddnet/remove-save 
Remove save group/layer button (fixes #1475)
 2019-03-11 22:58:40 +01:00
Dennis Felsing 40591c2f8b Remove save group/layer button (fixes #1475) 2019-03-11 22:58:18 +01:00
Dennis Felsing b8c256b602
Merge pull request #1467 from 12pm/nameban_exact 
Add exact name ban option
 2019-03-11 22:50:39 +01:00
def a7548511bf Don't allow sound format changes, use preferred driver, print more debug info 2019-03-11 22:32:14 +01:00
12pm 6086f46bed Add substring tests 2019-03-11 15:00:51 +01:00
12pm 3dcb83778f Make name more descriptive 2019-03-11 14:48:45 +01:00
bors[bot] 185bfe7a6a Merge #1474 
1474: Fix automapper not removing the Opaque flag before checking if flags match r=def- a=bojidar-bg



Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2019-03-11 12:56:31 +00:00
Bojidar Marinov e944817472
Fix automapper not removing the Opaque flag before checking if flags match 2019-03-11 14:35:24 +02:00
bors[bot] d8e8a21a30 Merge #1469 
1469: Don't use strtok. Close #1468 r=heinrich5991 a=Learath2

^

Co-authored-by: Learath <learath2@gmail.com>
 2019-03-11 11:56:26 +00:00
Learath f6c15f1de0 Style 2019-03-11 14:54:31 +03:00
Learath 9713f6c2cd Improve interface to function 2019-03-11 14:39:54 +03:00
def bc91659aa8 Get GAME_RELEASE_VERSION back, fix compatibility filter in server browser 2019-03-06 21:02:06 +01:00
bors[bot] 26dc51a272 Merge #1466 
1466: Add colors for authed players. Deprecates #1299 r=def- a=Learath2

Not sure if a snap item is the best idea for this but it should help with not sending the data more then needed and keeping it properly updated. The colors aren't great now but we can fix that easily.

![image](https://user-images.githubusercontent.com/490500/53680889-607bf780-3cf2-11e9-84a0-579160e9e170.png)


Co-authored-by: Learath <learath2@gmail.com>
 2019-03-06 13:44:28 +00:00
Learath c4af290df5 Don't use strtok. Close #1468 2019-03-05 12:46:29 +03:00
Learath 6fa5d3fcce One color for all auth levels 2019-03-05 11:48:06 +03:00
bors[bot] 35cb7f0b2c Merge #1463 
1463: Don't suggest to downgrade, clean up versioning (fixes #1440) r=def- a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-03-03 19:36:20 +00:00
def deb2494692 Don't suggest to downgrade, clean up versioning (fixes #1440) 2019-03-03 20:31:23 +01:00
12pm 572e9532ee Fix tests 2019-03-03 19:02:42 +01:00
12pm 29592afdb5 Add exact name ban option 2019-03-03 18:29:33 +01:00
Learath 548e9969b2 Add colors for authed players. Deprecates #1299 2019-03-02 13:50:33 +03:00
def afa1e8adc5 Uninvite kicked/spectated players from team (fixed #1464) 2019-03-01 22:11:00 +01:00
def 65ce202697 Revert "More SQL fixes" 
This reverts commit c665cabc27.
 2019-02-28 06:14:30 +01:00
def f831f27d08 Revert "New SQL locking on each query (fixes #1430)" 
This reverts commit 5ddcf8bd0c.
 2019-02-28 06:14:20 +01:00
Dennis Felsing 6701ae726f
Merge pull request #1434 from ddnet/sql-locking 
Sql locking
 2019-02-27 20:26:24 +01:00
def 887d1c8401 Simplify some server messages 2019-02-27 19:46:01 +01:00
bors[bot] dfa16e37ba Merge #1462 
1462: Remove empty else branch r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-02-25 19:21:04 +00:00
ChillerDragon a34d9633ad Remove empty else branch 2019-02-25 20:16:05 +01:00
bors[bot] d14a8d3ac9 Merge #1460 
1460: Remove unused graphics include in ghost.cpp r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-02-22 10:36:43 +00:00
ChillerDragon 53e14d02f0 Remove unused graphics include in ghost.cpp 2019-02-22 11:27:25 +01:00
def 21a938d983 Update credits 2019-02-15 11:10:44 +01:00
def 374529b452 Update credits 2019-02-15 10:59:34 +01:00
def 510395bb9d Version 11.8 2019-02-15 09:48:18 +01:00
Dennis Felsing 6f3d261b73
Merge pull request #1441 from trml/pr_sync_weapon_input 
Sync weapon input with other input
 2019-02-14 10:27:52 +01:00
bors[bot] e87681c893 Merge #1458 
1458: Fix remaining issues from #1443 r=heinrich5991 a=Learath2

^

Co-authored-by: Learath <learath2@gmail.com>
 2019-02-14 02:07:13 +00:00
Bojidar Marinov 1ca48a38ac
Fixup #1454, inadvertedly broke game layer picker 2019-02-13 21:11:13 +02:00
Learath a46c31f356 Add a couple tests, fix #1457 2019-02-13 15:14:46 +01:00
Learath 37c67c00ad Style 2019-02-13 15:13:44 +01:00
Learath 867facfffc Forgot str_tokenize is not used now 2019-02-13 15:13:27 +01:00
Dennis Felsing 698a3f1c5a
Merge pull request #1443 from ChillerDragon/AutobanKnownBots 
Add autoban depending on client version
 2019-02-13 12:04:51 +01:00
trml b9f301018f Remove nesting 2019-02-11 22:25:51 +01:00
Learath 109983da21 Remove use of strtok 2019-02-11 18:53:30 +01:00
Learath 0086452757 Use str_in_list, generalize further 2019-02-11 18:52:40 +01:00
Learath 5d99746cc1 Add str_tokenize and str_in_list 2019-02-11 18:40:40 +01:00
Dennis Felsing 347da9c300
Merge pull request #1454 from bojidar-bg/1452-fix-crash 
Fix crash when painting tiles from a non-switch to a switch layer
 2019-02-11 17:12:00 +01:00
def 12fa8a23f5 Fix comment about str_utf8_comp_nocase 2019-02-11 17:11:33 +01:00
Dennis Felsing ba675ec18f
Merge pull request #1453 from 12pm/autocomplete_fix 
Fix tab autocompletion
 2019-02-11 17:10:53 +01:00
def 7da40ed1ea Better English by VeH-c 2019-02-11 14:57:42 +01:00
Bojidar Marinov 352157ddbe
Fix crash when painting tiles from a non-switch to a switch layer 
Fixes #1452.
 2019-02-11 10:41:26 +02:00
12pm 6d3e40760c Fix build 2019-02-10 19:20:08 +01:00
12pm 74992d9bd7 Fix tests 2019-02-10 19:13:55 +01:00
12pm ed55ac6d81 Fix tab autocompletion 2019-02-10 17:43:00 +01:00
bors[bot] 250d7c8475 Merge #1446 
1446: Disable unused tiles only for DDNet entities r=def- a=12pm

Sorry messed something up

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-02-10 12:11:32 +00:00
bors[bot] ea6f76b383 Merge #1438 #1447 #1448 
1438: Add man pages with asciidoc r=def- a=Ryozuki

Fixes #1240 

I added a simple script to generate the man pages.

To edit the man pages in the future, you must edit the `.adoc` files and then run generate.sh

You need asciidoc package to generate the manpages.

`sudo apt install asciidoc`

http://asciidoc.org/

Writing plain troff is a pain in the ass.

1447: Allow vote-kicking players with same auth level r=def- a=12pm

This is meant to help with dealing with trolls on test server since everyone can log into rcon there.
Shouldn't cause any problems anywhere else, I think.

1448: Require sv_vote_kick_min only on team 0 kick votes r=def- a=12pm



Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-02-10 10:23:08 +00:00
12pm f2cbb9d87d Make teleporting to where you look at convenient 2019-02-09 19:32:45 +01:00
12pm 1cf73b3eec Abort votes only if auth level is higher 2019-02-08 19:43:07 +01:00
12pm 10e4fcc185 Require sv_vote_kick_min only on team 0 kick votes 2019-02-08 18:44:11 +01:00
12pm 4b1651f18c Allow vote-kicking players with same auth level 2019-02-08 16:57:39 +01:00
12pm 2daafdaad5 Disable unused tiles only for DDNet entities 2019-02-08 04:04:41 +01:00
ChillerDragon c0157db98d Neutral kick reason 2019-02-06 14:53:22 +01:00
ChillerDragon eaf61b662d Never ban known bots 2019-02-06 14:49:41 +01:00
ChillerDragon 3f8e9613f7 Fix style 2019-02-06 13:06:28 +01:00
ChillerDragon f5b551adee Fix empty string check (ty Travis) 2019-02-04 23:33:25 +01:00
ChillerDragon 8ddb487e2b Use consisten seperators (comma not semicolons) 2019-02-04 23:12:05 +01:00
ChillerDragon ec7b525609 Default kick known bots instead of ban 2019-02-04 23:10:07 +01:00
ChillerDragon 03a20d6406 Add IServer::Ban 2019-02-04 23:09:14 +01:00
ChillerDragon 867b0a66ce Fixings thanks to @Learath2 2019-02-04 22:16:09 +01:00
ChillerDragon 069b1763dd Add autoban depending on client version 2019-02-04 20:46:42 +01:00
trml 3f9d30af0f Sync weapon input with other inputs 2019-01-29 20:58:25 +01:00
12pm 3d01e59878 Fix switch_open description 2019-01-27 20:09:33 +01:00
jupeyy 28ba295792 Don't use compression for text rendering 2019-01-20 14:28:59 +01:00
Dennis Felsing a5c78f85cf Disallow sv_map_vote in map settings 2019-01-15 08:57:30 +01:00
def 5ddcf8bd0c New SQL locking on each query (fixes #1430) 2019-01-14 22:28:13 +01:00
Dennis Felsing c665cabc27 More SQL fixes 
Should help with some crashes
Still doesn't call thread_init
Still shares statements and connections between threads
 2019-01-14 22:18:37 +01:00
def b1ef2bf864 Don't try to remove non-existing files 
Causes annoying error messages during map change & server start.
 2019-01-14 22:13:51 +01:00
bors[bot] 19aef99d0c Merge #1432 
1432: Merge BW support into IsDDNet r=def- a=fokkonaut

from now on Blockworlds can use this server message to tell the client not to use the DDRace (time) scoreboard.
(https://github.com/ddnet/ddnet/pull/1387)

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-01-14 17:16:06 +00:00
fokkonaut ade7b13f98 paranthese placement 2019-01-14 17:31:07 +01:00
fokkonaut 6206450e1b moved paranthese 2019-01-14 17:28:34 +01:00
fokkonaut cf09fbd1ea Merge BW support into IsDDNet 2019-01-14 16:50:06 +01:00
heinrich5991 c24c6274b6 Decode extended packets for the dummy as well 2019-01-14 15:42:37 +01:00
fokkonaut b2b6d25a92 add missing semicolon 2019-01-14 08:01:20 +01:00
fokkonaut d156ac47b7 forgot one 2019-01-14 08:01:20 +01:00
fokkonaut fe4426b008 fixed ddrace score (time score) 2019-01-14 08:01:20 +01:00
fokkonaut 0e842359ad Add DDRace Score NETMSG 2019-01-14 08:01:20 +01:00
heinrich5991 0c9cba4a67 Delete unused empty file 2019-01-12 01:18:40 +01:00
def 5e750e292d Version 11.7.2 2019-01-11 17:58:11 +01:00
def e8e2cd9f49 Revert "Reset brush when changing active layer (fixes #485)" 
Made it impossible to copy layer content to another layer and then use
autofiller on that: https://forum.ddnet.tw/viewtopic.php?f=16&t=6450

This reverts commit df6e3a541f.
 2019-01-11 17:57:37 +01:00
def 17a808a080 Version 11.7.1 2019-01-11 12:18:01 +01:00
Dennis Felsing b0709bbe5f
Merge pull request #1426 from ddnet/mouse-editor 
Hacky mouse editor fix (fixes #1367)
 2019-01-11 12:16:23 +01:00
def df6e3a541f Reset brush when changing active layer (fixes #485) 2019-01-11 12:15:19 +01:00
def caa9e4ba29 Fix auto save statboard limit (fixes #528) 2019-01-11 12:07:12 +01:00
def 15fb7891cb Fix FileCollection to remove the oldest file (fixes #605) 
Previously it removed one entry from m_aTimestamps before having filled
it entirely, so there was a small chance that it was not the smallest
one. Only after we have filled more entries than we want to keep can we
know which ones can be deleted for sure.
 2019-01-11 11:39:05 +01:00
def 6e9aa68149 Fix timestamp extraction with wildcards (fixes #605) 
in CFileCollection. Previously it included the _ character.
 2019-01-11 11:37:43 +01:00
def 8c4a26fa63 Fix editor fullscreen mode (fixes #1303) 
By initializing ToolBar
 2019-01-11 10:48:23 +01:00
def 9b88d8f418 Hacky mouse editor fix (fixes #1367) 2019-01-11 10:02:15 +01:00
def f05c56d6ce Fix cl_dyncam_mousesens 
should only have an effect ingame, not in menus or editor
 2019-01-11 09:40:04 +01:00
def 22ea30a7f5 Fix crash 2019-01-10 21:11:23 +01:00
def b3ca67e944 Minor code simplification 2019-01-10 15:54:42 +01:00
def 16f6e23aaa Nicer fix for crash 2019-01-10 15:44:04 +01:00
def 1c85c962ef Fix automap crash (reported in #1425) 2019-01-10 15:38:04 +01:00
def f5e8b9d822 Fix potential inconsistencies in rank/teamrank 2019-01-10 09:32:23 +01:00
Dennis Felsing a689533a9d Version 11.7 2019-01-09 08:55:40 +01:00
Dennis Felsing c16c50fa80
Merge pull request #1424 from ddnet/demo-markers 
Demo browser: Show markers (fixes #329)
 2019-01-09 08:54:42 +01:00
Dennis Felsing 71ec8cc294
Merge pull request #1423 from ddnet/utf8_nocase 
UTF8 nocase compare & use for chat TAB completion
 2019-01-09 08:54:25 +01:00
Dennis Felsing f82ab4cb21 Fix editor crash (reported in #1425) 2019-01-09 08:38:49 +01:00
def faa3cc195d UTF8 nocase compare & use for chat TAB completion 
- As suggested by Arseniy Zarche
- Also updated confusables to Unicode 12
 2019-01-09 08:31:03 +01:00
def f9d9fee314 Demo browser: Show markers (fixes #329) 
- Fetch Headers button
- Display Markers & Length columns
- Display footer info
- Don't rescan directory when not required
- Clean up code a bit
 2019-01-09 08:25:03 +01:00
def 1ece46aa4e Revert "setlocale for XOpenIM with compose key" 
Has been fixed: https://bugzilla.libsdl.org/show_bug.cgi?id=3102

This reverts commit 6c4e6c5c44.
 2019-01-07 21:27:09 +01:00
def 779a928faf CRaceDemo: Don't attempt to remove demo that hasn't been started 2019-01-07 14:36:17 +01:00
def 8b782285ab Fix return type of CStorage::RemoveFile 2019-01-07 14:35:11 +01:00
def da2fe3cbbc Revert "More SQL fixes" 
This reverts commit a58ade137d.
 2019-01-06 10:59:29 +01:00
Dennis Felsing afbb741910
Merge pull request #1420 from Jupeyy/master 
Fix text kerning and add flags for better positioning
 2019-01-06 10:57:16 +01:00
Dennis Felsing dfd12fb23e
Merge pull request #1416 from ddnet/scopes 
More SQL fixes
 2019-01-06 10:51:26 +01:00
Dennis Felsing 2695cb101d
Merge pull request #1418 from ddnet/borderless 
Disable borderless on Mac (fixes #1413)
 2019-01-06 10:51:15 +01:00
jupeyy 6fc49cbc9e style 2019-01-06 06:45:47 +01:00
jupeyy 619a33a7d5 text kerning fix, add new text render flags for accurate positioning 2019-01-06 06:42:57 +01:00
def a116ed3dbe Revert "New try at not decompressing unknown packets" 
Causes connection problems with old clients
This reverts commit a3b07dbf9c.
 2018-12-30 12:22:05 +01:00
def 7f8b1ecf21 Fix saves sql insert format for file fallback 2018-12-30 00:31:29 +01:00
def bcdec941da Update view target when spectating with chat open 
Thanks to ReiTW for reporting and illustrating the bug:
https://www.youtube.com/watch?v=LKicYqtqJbQ
 2018-12-29 00:05:05 +01:00
def aa7e6ff3e3 Disable borderless on Mac (fixes #1413) 2018-12-28 17:29:54 +01:00
def 7da2cb9357 Version 11.6.1 2018-12-27 22:50:33 +01:00
Dennis Felsing a58ade137d More SQL fixes 
Should help with some crashes
Still doesn't call thread_init
Still shares statements and connections between threads
 2018-12-27 14:31:58 +01:00
def 969f3c2db4 Version 11.6 2018-12-23 22:58:45 +01:00
def 4217d5d536 Fix 5:4/4:3 skin prefix setting display 2018-12-23 22:58:41 +01:00
def bad0d53906 Move timing code to actual end of function 2018-12-23 22:58:37 +01:00
def 87fa394daa Add Christmas skin event for client 2018-12-23 22:58:30 +01:00
def a38d0068e1 Fix specvoted/pausevoted behaviour 
Now switches immediately to the voted person if there is one instead of
switching back to unpaused first
 2018-12-23 22:57:28 +01:00
def c8ee27332a recvmmsg ipv6 fix 2018-12-23 22:57:28 +01:00
Dennis Felsing 8d200d1026 Try resetting m_pConnection to 0 to prevent segfault 2018-12-20 09:26:45 +01:00
Dennis Felsing fcf2a16aef Add toggle_tune 2018-12-20 09:18:22 +01:00
Dennis Felsing 735e3c64fc Read fifo more often 
otherwise we lose messages since we sleep for long times when server is
empty
 2018-12-20 09:18:03 +01:00
Dennis Felsing e076d07f5f
Merge pull request #1408 from ddnet/sneaky 
Sneaky code (TODO: Also mark 708?)
 2018-12-18 12:16:53 +01:00
Dennis Felsing 5026ba555d Fallback for /save when DB unreachable 2018-12-18 12:07:27 +01:00
def 76c32b2b1f fix tools 2018-12-17 22:23:50 +01:00
def 4b92e72763 Prevent copies 2018-12-17 22:15:41 +01:00
def bfa25bac4a cleanup 2018-12-17 20:49:25 +01:00
def 87887b7291 mmsgs fixes 2018-12-17 20:19:57 +01:00
def 6846a6ecad Fixes and stress improvements 2018-12-17 20:05:50 +01:00
def d0a887f688 Unused variable fix 2018-12-17 17:27:36 +01:00
def 4c39539d38 Mac OS fix 2018-12-17 17:19:01 +01:00
Dennis Felsing 9665dd67de Mac OS fix 2018-12-17 15:07:09 +01:00
Dennis Felsing f83a9be610 Sneaky code (TODO: Also mark 708?) 2018-12-17 14:55:58 +01:00
Dennis Felsing 1ca233988b No bool in old C 2018-12-17 14:53:59 +01:00
Dennis Felsing e585b1f2b8 Fix tools compilation 2018-12-17 14:46:17 +01:00
Dennis Felsing 1221b1f11c Fix Windows compilation 2018-12-17 14:44:19 +01:00
Dennis Felsing e9ee74a941
Merge pull request #1402 from ddnet/remove-modhelp 
Remove /modhelp (fixes #1401)
 2018-12-17 14:42:07 +01:00
Dennis Felsing 9febf58f37 New try at recvmmsg with some improvements 2018-12-16 22:59:41 +01:00
def a3b07dbf9c New try at not decompressing unknown packets 2018-12-16 22:15:45 +01:00
def d884465710 Revert "Don't decompress packets from unknown IPs" 
This reverts commit 9089c2b35a.
 2018-12-14 17:12:49 +01:00
Dennis Felsing 0b256ff653 Allow connecting clients to compress 
TODO: Look for better solution
 2018-12-14 11:17:15 +01:00
def c4d437bc0f Make client launchable from browser 
By needs from https://github.com/teeworlds/teeworlds/pull/1478/files
 2018-12-13 19:57:34 +01:00
Dennis Felsing 9089c2b35a Don't decompress packets from unknown IPs 2018-12-13 16:24:37 +01:00
Dennis Felsing 42d7f58d08 sv_join_vote_delay: Don't affect participating in map votes 
Since they are already restricted by veto right
 2018-12-12 10:41:31 +01:00
Dennis Felsing 5c18d6c481 Remove /modhelp (fixes #1401) 2018-12-12 10:05:44 +01:00
Dennis Felsing b224a4dafe Improve sv_join_vote_delay against vote bots 
- Prolong to 5 minutes
- also affects participating in votes
 2018-12-11 10:29:36 +01:00
Dennis Felsing fabd559746 Clamp Spectator ID 2018-12-11 09:23:12 +01:00
Dennis Felsing 7944c9ca75 Version 11.5.1 2018-12-11 08:12:51 +01:00
ChillerDragon aef7d76158 Allow to use pausevoted as normal pause 2018-12-10 23:20:29 +01:00
Dennis Felsing 1f421ab00a
Merge pull request #1395 from Jupeyy/pr_laser_bounce_delay_fix 
Fix laser/rifle bounce delay, when server time(server ticks) are high/huge
 2018-12-10 17:41:44 +01:00
Learath 19a458d523 Fix a couple issues 2018-12-08 00:24:57 +01:00
Learath 40d7b03f10 uf, typo 2018-12-08 00:06:54 +01:00
Learath 0c13c8cebb Handle the windows console properly. Fixes #1394 2018-12-07 23:52:33 +01:00
jupeyy 58e583e642 fix laser/rifle bonce delay, when server time(server ticks) are high, caused by unprecise floating point arithmetic 2018-12-07 11:06:44 +01:00
Dennis Felsing 0ad472df41 Make cort comparator conform to strict weak ordering 
comp(p1, p2) == false was violated when both are nullptr
https://en.cppreference.com/w/cpp/named_req/Compare
 2018-12-06 07:57:01 +01:00
Dennis Felsing 809afa265f Fix typo 2018-12-05 07:28:29 +01:00
Shengyu Zhang 464ef9e74b Fix crash when auto update is off 
Since 2696ac134c, whether to include auto
update related code should only control by macro CONF_AUTOUPDATE.

This commit should fix #1374
 2018-12-05 01:06:52 +08:00
def 6ad686eee2 Fix HUD (thanks to fokkonaut for reporting) 2018-11-24 22:57:15 +01:00
bors[bot] 35776ee627 Merge #1385 
1385: Fix the beep. Fixes #985 r=def- a=Learath2

Apparently this isn't a perfect solution as consoles are devices on windows for some reason. Hopefully it'll work for most if not all users :)

Co-authored-by: Learath2 <learath2@gmail.com>
 2018-11-22 21:10:18 +00:00
Learath2 21609d43fb Fix the beep. Fixes #985 2018-11-22 17:37:52 +01:00
def 1a66fb9c17 Serverside special handling for 9999 second time 2018-11-21 23:21:35 +01:00
def 27865fdd89 Fix Race scoreboard ordering for times > 166 minutes (9999 seconds) 2018-11-21 21:26:05 +01:00
yangfl a1db76cdef Remove extra semicolons 2018-11-18 14:27:48 +08:00
Learath2 c601df8b28 Switch around the colors for used/unused envelopes 2018-11-16 14:51:36 +01:00
Dennis Felsing fed6f02c87 Version 11.5 2018-11-15 14:45:10 +01:00
Dennis Felsing 045533cef7
Merge pull request #1321 from bojidar-bg/x-add-auto-automapper 
Add option to automatically run the automapper
 2018-11-15 09:30:22 +01:00
Ryozuki 90118b5a07
make it one line 2018-11-13 13:05:15 +01:00
Ryozuki 41fc33406a fix laser telegun through TELEINWEAPON tile 2018-11-10 20:47:11 +01:00
Ryozuki 62dbda204e fix entities clear and remove tele-activator from gametile as it doesn't make sense. 2018-11-04 15:50:56 +01:00
Ryozuki 674d3f00e0 add support for blue teleport gun 2018-11-03 10:26:20 +01:00
Ryozuki 3d202883c9 tele-activator: make delay be able to specify a weapon 2018-11-03 10:26:19 +01:00
Ryozuki ddf2e6af36 add tele-activator to the switch layer 2018-11-03 10:26:19 +01:00
Ryozuki c831b5e0c1 change tele-blocker to tele-activator 2018-11-03 10:26:18 +01:00
Dennis Felsing 69b25b8f4c Version 11.4.6 2018-11-02 14:24:14 +01:00
Ryozuki d9d3ed783e fix windows sound 2018-11-02 12:47:20 +01:00
Dennis Felsing d072817e25
Merge pull request #1366 from ddnet/upd1145 
Version 11.4.5
 2018-10-31 18:30:50 +01:00
Dennis Felsing bccf6320b7
Merge pull request #1368 from Learath2/dd_pr_shiftcrash 
Fix editor crash
 2018-10-31 18:30:34 +01:00