edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 14:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
20571 commits 1 branch 429 tags 411 MiB
Commit graph

20571 commits

This branch
This branch
All branches
Author SHA1 Message Date
ChillerDragon 6f75087d9f Refactor goto_tele 
Fixes a bug of some teleporters being skipped.
Improves performance by only iterating all teleporters instead of every tile in the map.
 2024-05-09 11:20:59 +08:00
heinrich5991 3887eea18d
Merge pull request #8332 from heinrich5991/pr_ddnet_fix_token_7 
Fix 0.7 tokens after #8322
 2024-05-08 13:12:32 +00:00
heinrich5991 c211e874aa Fix 0.7 tokens after #8322 
They're also read as big-endian integers now.

Thanks to @ChillerDragon for noticing.

Fixes #8330.
 2024-05-08 14:17:02 +02:00
Dennis Felsing f214c1101b
Merge pull request #8326 from heinrich5991/pr_ddnet_no_map_image_rgb 
Remove RGB images from the map file format
 2024-05-08 04:56:19 +00:00
Dennis Felsing 587b545ab1
Merge pull request #8327 from heinrich5991/pr_ddnet_revert_initialize_variables 
Revert "Initialize all ghost item member (Closed #8297)"
 2024-05-08 04:56:16 +00:00
heinrich5991 8a64feabc3 Remove RGB images from the map file format 
Cherry-picked from https://github.com/teeworlds/teeworlds/pull/2822.

CC https://github.com/teeworlds/teeworlds/issues/2812
CC https://github.com/teeworlds/teeworlds/issues/962

Since DDNet never saved these kinds of images, this should cause no
issues.
 2024-05-07 14:31:06 +02:00
heinrich5991 3a48b8e6cf Revert "Initialize all ghost item member (Closed #8297)" 
This reverts commit f319ed239a.

Initializing these variables with junk data doesn't seem to be an
improvement over not initializing them. It hides potential Valgrind
warnings about data accesses to uninitialized memory though.

f319ed239a (r1590801501)
 2024-05-07 14:25:29 +02:00
Dennis Felsing df30321f52
Merge pull request #8324 from ewancg/chat-practice 
Add chat commands for toggling weapons in practice mode
 2024-05-07 05:42:38 +00:00
Dennis Felsing edff7841e8
Merge pull request #8320 from ChillerDragon/pr_tidy_more 
Enforce more styling with clang tidy
 2024-05-07 04:45:34 +00:00
Dennis Felsing ae2c9e2999
Merge pull request #8323 from Robyt3/Client-Particles-Smoke-Nudge 
Fix smoke particles sometimes being stuck inside solid tiles
 2024-05-07 01:21:37 +00:00
Ewan Green 87cab3ebd9 change GetPracticeCharacter() to not be static, fix solo checks 2024-05-06 15:06:42 -06:00
Ewan Green ba5b39d294 change forgotten functions to use practice check 2024-05-06 14:08:51 -06:00
Ewan Green bf78d7fb48 cleanup 2024-05-06 14:03:17 -06:00
Ewan Green d6449872a4 add weapon chat commands for practice mode 2024-05-06 13:57:16 -06:00
Robert Müller 910001a772
Merge pull request #8322 from heinrich5991/pr_ddnet_endian_token 
Use network tokens in big-endian byte order consistently
 2024-05-06 19:35:55 +00:00
heinrich5991 36712db0f1 Use network tokens in big-endian byte order consistently 
Previously, it was handled inconsistently on big-endian machines and
caused connection failures.
 2024-05-06 20:33:17 +02:00
Robert Müller 6cbc85f229 Fix smoke particles sometimes being stuck inside solid tiles 
Nudge the initial position for explosions' smoke particles slightly towards the edge of the closest non-solid tile, if it would otherwise be inside a solid tile, so the smoke particles do not get stuck inside solid tiles on explosion events happening at the edges of tiles but slightly inside them. The physical position of the explosion event is unchanged, so this does not affect physics. The explosion sprite is still rendered at the physical position of the explosion, to preserve the apprearance.
 2024-05-06 16:03:36 +02:00
Robert Müller d4e3f6fc01
Merge pull request #8316 from ChillerDragon/pr_use_sendchat 
Use SendChat() in DbgStress
 2024-05-06 08:52:47 +00:00
Robert Müller f9cb924e20
Merge pull request #8317 from ChillerDragon/pr_static_member_console 
Don't access static ConCommandStatus with a member
 2024-05-06 08:48:32 +00:00
ChillerDragon b422b0e927 Enforce more styling with clang tidy 2024-05-06 15:32:14 +08:00
ChillerDragon 3c606dd1e4 Don't access static ConCommandStatus with a member 
Fixes this clang-tidy 19 warning

```
/home/chiller/Desktop/git/ddnet/src/engine/shared/console.cpp:739:2: error: static member accessed through instance [readability-static-accessed-through-instance,-warnings-as-errors]
  739 |         pConsole->ConCommandStatus(&Result, pConsole);
      |         ^~~~~~~~~~
      |         CConsole::
```
 2024-05-06 11:48:47 +08:00
ChillerDragon 28f3ac3e87 Use SendChat() in DbgStress 2024-05-06 11:09:18 +08:00
Dennis Felsing c727b87601
Merge pull request #8315 from ChillerDragon/pr_chat_cleanup 
Rename chat `Say()` to `SendChat()`
 2024-05-06 02:06:14 +00:00
ChillerDragon 44d065888f Rename CChat::SayChat to CChat::SendChatQueued 
Also replace one code snippet with a call to SendChatQueued
 2024-05-06 09:49:35 +08:00
ChillerDragon 33baeb8f28 Rename CChat::Say to CChat::SendChat 
Follows the convention set by the other methods that send network packets.
 2024-05-06 09:23:19 +08:00
Dennis Felsing 5586961b4c
Merge pull request #8313 from Robyt3/Collision-Layers-Unload 
Also unload collision and layers when unloading map
 2024-05-05 15:47:46 +00:00
Robert Müller 1551dda3e9 Also unload collision and layers when unloading map 
Ensure that the `CCollision` and `CLayers` instances do not keep any pointers to the map data after the map has been unloaded.
 2024-05-05 12:41:18 +02:00
Robert Müller 7d640e1f98
Merge pull request #8309 from ChillerDragon/pr_init_ghost 
Initialize all ghost item member (Closed #8297)
 2024-05-05 09:37:54 +00:00
Robert Müller bf2343d60b
Merge pull request #8312 from ChillerDragon/pr_fix_misleading_demo_snap_var_names 
Make demo snap variable names more obvious
 2024-05-05 09:18:38 +00:00
ChillerDragon 1a3bb727c5 Make demo snap variable names more obvious 
Closed #8245
 2024-05-05 16:01:55 +08:00
Dennis Felsing 9bd9e0282c
Merge pull request #8311 from ChillerDragon/pr_ci_admin_msg_fixed 
Increase rcon command delay in integration test
 2024-05-05 07:44:42 +00:00
ChillerDragon 244875e339 Increase rcon command delay in integration test 
Closed #8261
 2024-05-05 15:24:38 +08:00
Dennis Felsing 2b2e57c2bb
Merge pull request #8308 from ChillerDragon/pr_team_enum 
Use enum for teams (Closed #8306)
 2024-05-05 03:59:35 +00:00
ChillerDragon f319ed239a Initialize all ghost item member (Closed #8297) 2024-05-05 11:47:05 +08:00
ChillerDragon 0b6bb8287a Use enum for teams (Closed #8306) 2024-05-05 11:38:29 +08:00
Dennis Felsing aafb4e2e09
Merge pull request #8304 from Zwelf/pr-teehistorian-finish-2 
Store player names in teehistorian and Finish/TeamFinish v2
 2024-05-05 01:34:57 +00:00
Dennis Felsing fdc929d2b1
Merge pull request #8293 from BlaiZephyr/add-team0-indicator 
add team0mode indicator
 2024-05-05 01:33:27 +00:00
Zwelf f14dab4cfa Increment teehistorian version_minor to 8 
Allows easily distinguishing between Teehistorian extension from #8221
with wrong Tick (divided by 50) and this fixed one.
 2024-05-04 21:40:06 +02:00
Zwelf af4da41c4c Record Player and Team finishes in Teehistorian 2024-05-04 21:40:06 +02:00
meloƞ 2b6f5641d6 hud-final 2024-05-04 21:20:20 +02:00
Zwelf fcd8aae388 Record player name in Teehistorian files 2024-05-04 20:44:20 +02:00
Dennis Felsing 2f22447d44
Merge pull request #8302 from Robyt3/Video-Refactoring 
Video recorder: improve error handling and log messages, fix crashes, refactoring
 2024-05-04 14:59:06 +00:00
meloƞ 9c2e70ff67 Empty 2024-05-04 16:08:16 +02:00
Jupeyy 9336b4cb37
Merge pull request #8301 from ChillerDragon/pr_skin_warn 
Improve skin name validation error message (Closed #8300)
 2024-05-04 12:57:48 +00:00
Robert Müller e5927d9024 Fix crashes when video recording is not started successfully 
Add additional checks to ensure that the `CVideo::Stop` function and the functions called by it will correctly stop the current video also if the video was not started successfully, i.e. if `CVideo::Start` returned `false` from any of the error branches.

In the `CVideo::Stop` function, iterate over the vectors of video and audio threads directly instead of using `m_VideoThreads` and `m_AudioThreads`, which do not reflect the actual count if the initialization failed before the threads were created.

In the `CVideo::Stop` function, only call `av_write_trailer` if the video recording was stated successfully, i.e. only if `avformat_write_header` was called successfully, as this will otherwise cause the client to crash. Closes #6375.

In the `CVideo::Stop` function, only call `avio_closep` if the format context was allocated.

In the `CVideo::FinishFrames` function, ensure that the codec has been allocated and opened, otherwise using it is not allowed.

Add assertions to the `CVideo::Start` and `Stop` functions to ensure that the same video is not started/stopped multiple times.
 2024-05-04 13:55:35 +02:00
Robert Müller 3a0e2429d1 Assert that size of image data matches size of video 
Crash with assertion when the size of the graphics is different from the video currently being rendered, instead of causing weirder bugs and a corrupted video file.
 2024-05-04 13:55:35 +02:00
Robert Müller a0465b67dd Improve various variable and class names of the video recorder 
- Rename variable `m_vBuffer` -> `m_vAudioBuffers`
- Rename class `SAudioBuffer` -> `CAudioBuffer`
- Rename variable `m_vPixelHelper` -> `m_vVideoBuffers`
- Add class `CVideoBuffer` as wrapper
- Remove unused variable `m_Vframe`
- Rename variable `m_ASeq` -> `m_AudioFrameIndex`
- Rename variable `m_VSeq` -> `m_VideoFrameIndex`
- Rename variable `m_vVideoThreads` -> `m_vpVideoThreads`
- Rename variable `m_vAudioThreads` -> `m_vpAudioThreads`
- Rename function `ReadRGBFromGL` -> `UpdateVideoBufferFromGraphics`
- Remove unnecessary `ALEN` definition
- Remove unused variable `NextPts`
- Rename class `OutputStream` -> `COutputStream`
- Rename variable `pSt` -> `m_pStream`
- Rename variable `pEnc` -> `m_pCodecContext`
- Rename variable `m_vpSwsCtxs` -> `m_vpSwsContexts`
- Rename variable `m_vpSwrCtxs` -> `m_vpSwrContexts`
- Rename variable `pOC` -> `pFormatContext`
- Rename class `SVideoRecorderThread` -> `CVideoRecorderThread`
- Rename class `SAudioRecorderThread` -> `CAudioRecorderThread`
 2024-05-04 13:55:35 +02:00
Robert Müller 5f647b97eb Ensure correct sample and bit rate are used for video recording 
The wrong sampling rate was being used for video recording if the client is not restarted after changing the `snd_rate` config variable.

Ensure that the correct bit rate is used if the sample rate was adjusted because the selected value is not supposed.
 2024-05-04 13:15:54 +02:00
Robert Müller 9d2c11d7ee Improve error handling and logging of video recorder 
Use `log_error` for all errors and consistently format all error messages.

Handle all ffmpeg errors and output the formatted ffmpeg error message when possible.

Register a log callback for ffmpeg log messages to delegate them to our logging system, to fix the log messages being interleaved with our log messages and not using the correct line breaks on Windows.

Stop video and demo immediately and show an error message popup if the video could not be started successfully.

Remove unnecessary debug output from ffmpeg.
 2024-05-04 13:15:54 +02:00
Robert Müller e595545cd6 Fix duplicate file extension .mp4 for demos rendered from menu 
The file extension is always added in `CClient::StartVideo` now.
 2024-05-04 13:04:58 +02:00