Commit graph

20020 commits

Author SHA1 Message Date
Robert Müller 3afdc20df2 Rename clan related variables, removing Name from name 2024-07-20 13:19:03 +02:00
Robert Müller 0222e4ae96 Avoid duplicate calculations of nameplate text width
Get name/clan bounding box size from the text container index instead of calculating it twice.
2024-07-20 13:18:41 +02:00
Robert Müller b30dde56b6 Extract variables to improve readability and reduce duplicate code 2024-07-20 13:18:17 +02:00
Robert Müller f0fb1fd196 Avoid using pointer for vec2, use in_range function 2024-07-20 13:18:02 +02:00
Robert Müller c24d0c0ace Remove unnecessary CNamePlates::RenderNameplate function
The client ID of `CNetObj_PlayerInfo` objects is validated prior to calling the `CNamePlates::RenderNameplate` function, so the additional checks and arguments to handle the client ID not being valid where never used.

Rename existing `RenderNameplatePos` function to `RenderNameplate`.
2024-07-20 13:17:49 +02:00
Dennis Felsing cb9521d29f
Merge pull request #8621 from Robyt3/Client-Engine-UI-Touch-Input
Support touch input in engine, UI and console
2024-07-19 22:03:26 +00:00
Robert Müller 36f19f491e Support touch input in engine, UI and console
Add support for touch input to the engine, UI and console. Ingame touch controls require more discussion and will be delivered separately based on this engine implementation.

Engine
------

The state of all currently pressed touch fingers is aggregated based on the SDL touch events and can be retrieved with the `IInput::TouchFingerStates` function. This design is less complex than an event-based system where the touch events are delivered to the individual client components, as each system would then have to keep track of the finger states individually. However, this means that only one component can handle touch fingers at any given time, which seems like a reasonable assumption for our use cases.

Obsolete code for relative mouse handling on Android is removed. Connecting a mouse to an Android device should now also work as expected, as more recent SDL/Android versions support relative mouse input natively.

User Interface
--------------

Support absolute mouse positioning and clicking in the user interfaces (menus, editor, demo player) with touch presses.

Support right clicking by pressing and holding one finger at roughly the same position for 0.5 seconds.

Support scrolling scroll regions up and down with a two finger swiping gesture. Fast scrolling via a two finger flinging gesture is not yet supported and would be a useful future extension.

The menus and demo player are fully usable with touch inputs. The editor is only fully usable with an external keyboard and/or mouse, as panning the map is not currently possible with only touch inputs, which is also left as a possible future extension.

Console
-------

The touch input logic for the user interface is reused for the console. Thereby, text selection in the console with touch input works, although the text can only be copied by pressing Ctrl+C with an external keyboard at the moment. In the future, we could add buttons to the console to activate the search and copy functionalities with touch inputs.

Support scrolling the console history up and down with a two finger swiping gesture.

The local/remote consoles can currently only be opened with an external keyboard. The ingame touch controls will also include buttons to open the consoles.
2024-07-19 13:36:04 +02:00
Robert Müller 75d2b82ccd
Merge pull request #8616 from def-/pr-estonian-18.4
Update Estonian translations (by Cammo)
2024-07-19 10:43:36 +00:00
Dennis Felsing 36d8803302 Update Estonian translations (by Cammo) 2024-07-19 00:37:59 +02:00
Dennis Felsing e74f17c939
Merge pull request #8614 from Robyt3/Video-Removed-Property-Fix
Fix assertion when rendering demo with updated ffmpeg library
2024-07-18 15:59:33 +00:00
Robert Müller c30a35a493 Fix assertion when rendering demo with updated ffmpeg library
The `in_channel_count` and `out_channel_count` properties of the `SwrContext` were already deprecated and have been removed in the most recent ffmpeg library version, hence rendering demos was causing an assertion error when these properties were set.

For newer ffmpeg versions, we now set the channel layout with the `in_chlayout` and `out_chlayout` properties instead of setting the number of channels.
2024-07-18 17:23:16 +02:00
Dennis Felsing c4fca3e6f9
Merge pull request #8610 from Robyt3/Scoreboard-Score-Spacing-Fix
Slightly increase size for score in scoreboard again
2024-07-18 09:39:34 +00:00
Dennis Felsing 9b9005b77d
Merge pull request #8612 from furo321/swedish-18.4
Update Swedish translations for 18.4
2024-07-17 22:41:04 +00:00
Dennis Felsing 8a7dee1f9f
Merge pull request #8611 from gerdoe-jr/patch-5
Update russian translation
2024-07-17 22:41:02 +00:00
gerdoe 7a6c40fb5d Update russian.txt 2024-07-17 22:29:36 +03:00
furo 816c5f2991 Update Swedish translations for 18.4 2024-07-17 21:21:55 +02:00
Robert Müller ac95d73e31 Slightly increase size for score in scoreboard again
Did not consider in #8591 that the team and size would also need this space.
2024-07-17 20:23:04 +02:00
heinrich5991 f9a94fb5e0
Merge pull request #8609 from Robyt3/Android-No-Process-No-Server
Disable "Run server" button and process functions on Android
2024-07-17 15:46:56 +00:00
heinrich5991 f9c5d008ca
Merge pull request #8591 from Robyt3/Client-Scoreboard-Spectate-128
Add basic support for 128 players in scoreboard and spectator UI
2024-07-17 15:29:26 +00:00
Dennis Felsing 17f8b59400
Merge pull request #8608 from EGYT5453/ua-18.4
Update Ukrainian l10n (18.4)
2024-07-17 15:24:11 +00:00
Dennis Felsing 139c1af8cb
Merge pull request #8607 from rffontenelle/patch-7
Update brazilian_portuguese.txt
2024-07-17 15:23:48 +00:00
Rafael Fontenelle baedadc1ef
Update brazilian_portuguese.txt 2024-07-17 12:05:10 -03:00
Andriy 17d102f9b8
Update Ukrainian l10n (18.4) 2024-07-17 18:01:30 +03:00
Robert Müller 45f9161d43 Disable "Run server" button and process functions on Android
Starting the server on Android is currently not possible because a) the server executable is currently not compiled for Android b) launching the server executable with `fork` and `exec` is not supported on Android and may result in strange bugs like broken networking.

Running the server in a background service or in a separate process by using `Runtime.getRuntime().exec` from Java code might be feasible, but this is currently too much effort and may be done in the future.

For now, the "Run server" button as well as the process related system functions are disabled via conditional compilation on Android, to prevent the networking bug that would otherwise be triggered by pressing the "Run server" button.
2024-07-17 16:48:17 +02:00
Dennis Felsing c8b25b6e5b
Merge pull request #8606 from def-/pr-libs
Update libraries
2024-07-17 12:31:45 +00:00
Robert Müller 06d16158ba
Merge pull request #8605 from MilkeeyCat/pr_remove_multiline_client_support
Remove multi line chat support
2024-07-17 12:12:49 +00:00
Dennis Felsing 04fba67005 Update libraries
SDL 2.26.5 -> 2.30.5
curl 8.0.1 -> 8.8.0
freetype 2.13.0 -> 2.13.2
sqlite3 3.41.2 -> 3.46.0
ffmpeg 6.0 -> 7.0.1
png 1.6.39 -> 1.6.43
2024-07-17 14:11:51 +02:00
MilkeeyCat 784333b2aa refactor: remove multi line chat support 2024-07-17 14:13:13 +03:00
Dennis Felsing 6e31f2cb43
Merge pull request #8604 from GokturkTalha/patch-9
Update Azerbaijanese translations
2024-07-17 07:18:33 +00:00
Dennis Felsing 287570f058
Merge pull request #8603 from GokturkTalha/patch-8
Update Turkish translations
2024-07-17 07:18:31 +00:00
Talha Aygün 91202eb4ed
Update Azerbaijanese translations 2024-07-17 02:24:38 +03:00
Talha Aygün 2a66f8cdd4
Update Turkish translations 2024-07-17 02:24:13 +03:00
archimede67 fdf13e3bf5
Merge pull request #8602 from Robyt3/Client-Ingame-Players-Skin-Tooltip
Show skin name as tooltip in ingame player list
2024-07-16 20:56:51 +00:00
Robert Müller 90c63746b4 Show skin name as tooltip in ingame player list 2024-07-16 20:38:47 +02:00
Robert Müller 51e47a6f5d
Merge pull request #8597 from def-/pr-transl-18.4
Update translations for upcoming 18.4
2024-07-16 16:52:48 +00:00
Dennis Felsing 3229a19fd5
Merge pull request #8601 from Robyt3/Client-Camera-ZoomAllowed-Function
Extract `CCamera::ZoomAllowed` function to reduce duplicate code
2024-07-16 16:49:40 +00:00
Dennis Felsing 22afa1770b Update German translations 2024-07-16 18:31:37 +02:00
Dennis Felsing 95eb509c93 Update translations for upcoming 18.4 2024-07-16 18:30:08 +02:00
Dennis Felsing 7197b815a1
Merge pull request #8599 from Robyt3/Spectate-UI-Input-Refactoring
Refactor spectator UI input handling
2024-07-16 16:29:07 +00:00
Robert Müller f574f759d4 Extract CCamera::ZoomAllowed function to reduce duplicate code 2024-07-16 18:06:22 +02:00
heinrich5991 02aec0db3b
Merge pull request #8600 from Robyt3/Scoreboard-Team-Name-Localization
Readd separate localization strings for `Red/blue team wins!`
2024-07-16 16:01:17 +00:00
Robert Müller 088f963c0d Readd separate localization strings for Red/blue team wins! 2024-07-16 17:40:57 +02:00
Robert Müller ed53b1c6dc Refactor spectator UI input handling
Use `IInput::KeyPress` instead of event callback for mouse presses. Remove subsequently unnecessary `m_Clicked` variable.
2024-07-16 17:12:58 +02:00
Robert Müller 846775c6b7 Avoid reusing Selected variable for different buttons 2024-07-16 17:12:48 +02:00
Robert Müller e8eb79e7fb Remove unused m_OldMouseX and m_OldMouseY variables 2024-07-16 17:12:45 +02:00
Dennis Felsing 3c43dcd636
Merge pull request #8596 from Robyt3/Android-Restart-App
Implement client restarting on Android
2024-07-16 13:43:51 +00:00
Robert Müller d4f47c2a55 Implement client restarting on Android
Restarting the client previously did not work, as the `shell_execute` function on Android uses `fork` which is not supported.

Now, the client is restarted by using an Android intent to restart the main activity. This is triggered by sending a user-defined message from the native code to the SDL main activity thread.
2024-07-16 12:52:19 +02:00
Robert Müller 78da9689f5 Add basic support for 128 players in scoreboard and spectator UI
Support showing up to 128 players in the scoreboard and the spectator UI. The 128 players are rendered in 3 columns of 43 players in the scoreboard and in 4 columns of 32 players in the spectator UI. Other lists like the server info (ingame and in the server browser) and the voting list already support showing any number of players.
2024-07-15 23:41:33 +02:00
Dennis Felsing 804e87a979
Merge pull request #8593 from Robyt3/Server-MaxClients-Fixes
Fix crashes with `dbg_dummies` and `sv_max_clients`, ensure that `sv_max_clients` can only be set when starting server
2024-07-15 13:26:38 +00:00
Robert Müller 37756aa389 Ensure that sv_max_clients can only be set when starting server
Changing the `sv_max_clients` config variable while the server is running does not change the maximum number of clients that can connect, as this is determined only once when the `CNetServer` is initialized. The reserved slot check and the calculation of the number of player slots for the `protocol7::CNetMsg_Sv_ServerSettings` message were using the `sv_max_clients` config variable directly, which was causing them to be out-of-sync with the real number of maximum clients.

Existing uses of the `sv_max_clients` config variable, except for the `CNetServer` initialization, are replaced with `MaxClients()`. The config variable `sv_max_clients` is now marked as read-only after reading the initial config and command line argument, so changing it via the remote console is not possible and shows an error message. The unnecessary conchain for `sv_max_clients` is removed.
2024-07-15 14:37:11 +02:00