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

20665 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Felsing eb0392007b
Merge pull request #7458 from furo321/incorrect-usage 
Correct usage of `demo_extract_chat` tool.
 2023-11-15 14:33:11 +00:00
furo e27223a027 Correct usage of demo_extract_chat tool. 2023-11-15 15:08:30 +01:00
Dennis Felsing 9c083cadb5
Merge pull request #7457 from ChillerDragon/pr_unused_demo_var 
Fix unused variabled m_WasRecording
 2023-11-15 12:07:26 +00:00
ChillerDragon 9e27a5a107 Fix unused variabled m_WasRecording 2023-11-15 12:11:58 +01:00
Robert Müller f726fbf16c
Merge pull request #7456 from apelsin21/exit_OP_SCALE 
Use Escape to cancel OP_SCALE envelope
 2023-11-14 22:22:21 +00:00
Axel Vestin 7c15514696 Use Escape to cancel OP_SCALE envelope 2023-11-14 21:17:07 +01:00
Dennis Felsing a329417dee
Merge pull request #7455 from AlehKushniarou/update-belarusian-17.4 
Update Belarusian translation for 17.4
 2023-11-14 12:31:53 +00:00
Pavukoplov c97c39ad1e Update Belarusian translation for 17.4 2023-11-14 13:03:58 +03:00
Dennis Felsing 6d1654a13f
Merge pull request #7454 from ByFox213/master 
Update russian.txt
 2023-11-14 09:13:59 +00:00
ByFox 361f3121a9 Update russian.txt 2023-11-14 13:29:42 +05:00
heinrich5991 90fb33ae43
Merge pull request #7452 from Robyt3/Server-Max-Clients-Crash 
Fix server crash on DDTeam message with lower `sv_max_clients`
 2023-11-13 22:46:06 +00:00
Robert Müller b8d38f7f49 Fix server crash on DDTeam message with lower sv_max_clients 
When the `CGameContext::SendChatTeam` function is used to send a chat message to all members of a DDTeam (e.g. on completed /swap chat command), it was not checked whether the target players are online but only whether they belong to the specified team according to the teams core. However, the default team for unconnected/cleared players is 0 in the teams core, which is the same for players in team 0, so chat messages were being sent to client IDs not corresponding to connected clients when chat messages where supposed to be sent to players in team 0. This was causing the server to crash with the assertion error "erroneous client id" specifically when the server is started with `sv_max_clients` being less than the default, maximum 64.

Closes #7450.
 2023-11-13 23:16:21 +01:00
Dennis Felsing 32f3f9e03a
Merge pull request #7449 from furo321/lasttp-save 
Save entire character with `/lasttp`.
 2023-11-12 23:14:12 +00:00
furo f9b9480291 Save entire character with /lasttp. 2023-11-12 23:48:36 +01:00
Dennis Felsing 76d27e734a
Merge pull request #7444 from Chairn/demo_filename 
Update string when cutting demo to indicate file name
 2023-11-12 22:45:26 +00:00
Chairn c6f78ea3c3 Update string when cutting demo to indicate file name 2023-11-12 23:29:32 +01:00
Dennis Felsing 34fb10fcb4
Merge pull request #7443 from JuraIBOZO/patch-7 
Update ukrainian.txt 17.4
 2023-11-12 21:51:54 +00:00
Dennis Felsing 6d274bf2e0
Merge pull request #7445 from lolipodass/patch-8 
Update russian.txt
 2023-11-12 21:51:43 +00:00
Dennis Felsing fb490e47fb
Merge pull request #7446 from Jupeyy/pr_max_zoom_limit 
Increase max zoom limit
 2023-11-12 21:50:02 +00:00
Jupeyy 39b3249bf5 Increase max zoom limit 
To a limit that fits to the biggest maps
 2023-11-12 21:36:20 +01:00
lolipodass 31e1d41dfa
Update russian.txt 2023-11-12 18:57:58 +03:00
JuraIBOZO c5da8a5965
Update ukrainian.txt 2023-11-12 15:13:29 +02:00
Dennis Felsing 4f1fc71f95
Merge pull request #7440 from Robyt3/Server-Credits-Update 
Add new contributors to credits
 2023-11-12 11:36:26 +00:00
Robert Müller 188462ea27 Add new contributors to credits 
Thanks everyone!
 2023-11-12 12:20:10 +01:00
Dennis Felsing fb91302268
Merge pull request #7439 from furo321/swedish-17.4 
Update Swedish translations for 17.4
 2023-11-12 10:49:15 +00:00
furo 7b34024289 Update Swedish translations for 17.4 2023-11-12 11:31:44 +01:00
Robert Müller 5ef0e77145
Merge pull request #7437 from def-/pr-17.4-translations 
Translations for upcoming 17.4 (including updated German)
 2023-11-12 09:57:31 +00:00
Dennis Felsing e74e6770c3
Merge pull request #7325 from Robyt3/Browser-Community-Filter 
Add community server filter and icons, remove DDNet and KoG tabs
 2023-11-12 00:00:05 +00:00
Dennis Felsing d716210e31
Merge pull request #7408 from Jupeyy/pr_tile_border_shader 
Switch to a fragment shader solution for border tile rendering
 2023-11-11 23:02:34 +00:00
Dennis Felsing 44b97ce6c1 Translations for upcoming 17.4 (including updated German) 2023-11-12 00:01:19 +01:00
Dennis Felsing 79e244f166
Merge pull request #7433 from Robyt3/Editor-Color-Picker-Refactoring 
Show color picker button for color envelope points
 2023-11-11 22:14:41 +00:00
Dennis Felsing aefa52c6b9
Merge pull request #7432 from Robyt3/Base-Standard-Mutex-Wrapper 
Add `CLock` wrapper for `std::mutex` to replace `lock_*` functions, use `CLock` instead of `std::mutex`, add thread-safety annotations
 2023-11-11 22:07:02 +00:00
Robert Müller bd4c138107 Show color picker button for color envelope points 
Simplify selecting envelope point colors by showing a color picker button that opens a color picker popup to change the color of the selected envelope point. The existing editbox to change only the selected channel's value is kept, as the color picker popup does not support the same precision to specify the individual color channel values.

Closes #7317.
 2023-11-11 20:45:22 +01:00
Robert Müller d8452ad02c Extract ShowPopupEnvPoint local function 2023-11-11 20:45:22 +01:00
Robert Müller c48623de8f Extract CEditor::DoColorPickerButton function 
Fix color not being updated while shift key is pressed, due to use of `else if`.
 2023-11-11 20:45:22 +01:00
Robert Müller 37b0a5569d
Merge pull request #7427 from furo321/save-unknown-commands 
Save unknown commands from `settings_ddnet.cfg`
 2023-11-11 18:24:32 +00:00
Robert Müller 4a00332f59
Merge pull request #7434 from ChillerDragon/pr_ctrl_s_scale 
Do not scale envelopes on ctrl+s
 2023-11-11 18:22:56 +00:00
furo 6599b7e14b Save unknown commands from settings_ddnet.cfg 2023-11-11 19:09:13 +01:00
ChillerDragon e090d73784 Do not scale envelopes on ctrl+s 
When using ctrl+s to test the current envelope it should not activate
the scale mode. This causes unexpected envelope changes on ctrl+s based
envelope fine tuning testing.
 2023-11-11 18:56:09 +01:00
Robert Müller 8bde57a1ca
Merge pull request #7429 from dobrykafe/pr-show-directory 
Hide `"Show directory"` when `"All combined"` selected
 2023-11-11 15:15:34 +00:00
dobrykafe ca6b518383 remove ShowingRoot check 2023-11-11 14:08:41 +01:00
Robert Müller 10470046b7 Use CLock instead of std::mutex, add thread-safety annotations 
Use `CLock` and `CLockScope` instead of `std::mutex` and add clang thread-safety analysis annotations everywhere except for usages in engine graphics and video, as those usages also involve `std::condition_variable`.

Fix lock not being unlocked on all code paths in `CFutureLogger::Log`, which is caught by the static analysis.
 2023-11-11 00:09:17 +01:00
Robert Müller 3d858c28ee Add CLock wrapper for std::mutex to replace lock_* functions 
Replace usages of platform specific `lock_*` functions with `std::mutex` through the wrapper class `CLock`. Move lock classes to `base/lock.h`.

The `CLock` wrapper class is only necessary because the clang thread-safety attributes are not available for `std::mutex` except when explicitly using libc++.
 2023-11-11 00:04:57 +01:00
dobrykafe 73fac0c8d4 check StorageType instead of SelectedIndex 2023-11-10 21:45:45 +01:00
heinrich5991 de52ded86d
Merge pull request #7431 from Robyt3/Editor-Envelope-Accuracy 
Fix inaccurate envelope point value rounding
 2023-11-10 18:31:31 +00:00
Robert Müller 859727c1d3 Fix inaccurate envelope point value rounding 
Round to nearest integer instead of truncating in `f2fx` to ensure correct round-trip with `fx2f`.

Add test to ensure correct round-trip with maximum `0.0005f` absolute error.
 2023-11-10 19:11:10 +01:00
dobrykafe 41b63843ce hide "Show directory" when "All combined" selected 2023-11-09 22:16:07 +01:00
heinrich5991 962379d64d
Merge pull request #7428 from Robyt3/Editor-Entities-Explain-Assertion-Fix 
Fix editor crash when showing explanation for custom entities
 2023-11-09 18:41:53 +00:00
Robert Müller df664261bb Fix editor crash when showing explanation for custom entities 
The failing assertion is removed because users can add custom entities images besides the predefined ones.

Reported by Mr.Gh0s7 on Discord.
 2023-11-09 19:02:54 +01:00
Robert Müller fa8640bd35
Merge pull request #7425 from furo321/editor-correct-corners 
Use correct corners for brush rotation buttons.
 2023-11-08 19:13:34 +00:00