Commit graph

20375 commits

Author SHA1 Message Date
ChillerDragon 5986ee03b9 Consistently apply the NOLINT comment for all sounds in FireWeapon
Most but not all sound creations in CCharacter::FireWeapon have this NOLINT comment.

Somehow clang does not get tripped on all of those. But sooner or later it might.
I currently got a new error in my downstream fork when tweaking
FireWeapon a bit. So I applied the NOLINT comment to ALL occurences in
FireWeapon not only the ones that clangd finds at the moment.
2024-09-01 11:39:17 +08:00
Dennis Felsing 36f0bcc509
Merge pull request #8618 from ChillerDragon/pr_editor_prompt
Add ctrl+p editor prompt (quick actions)
2024-08-31 21:42:48 +00:00
Dennis Felsing dd82cf83a2
Merge pull request #8853 from gerdoe-jr/master
Update russian.txt
2024-08-31 21:36:34 +00:00
Dennis Felsing 8ca93d451b
Merge pull request #8855 from ChillerDragon/pr_armor_progress
Only do armor progress hack in ddrace controller
2024-08-31 21:35:48 +00:00
Dennis Felsing 871f97a283
Merge pull request #8856 from ChillerDragon/pr_gun_damage
Call TakeDamage on projectile and laser hit (gun, shotgun and laser)
2024-08-31 21:35:16 +00:00
ChillerDragon 2c77aeef2b Add quick action to pick image for selected layer 2024-08-31 21:57:32 +08:00
ChillerDragon f053a29463 Add ctrl+p editor prompt (quick actions) 2024-08-31 21:57:31 +08:00
ChillerDragon f8a4e7dbab Call TakeDamage on projectile and laser hit (gun, shotgun and laser)
The grenade and hammer already triggered TakeDamage
now all weapons hitting a tee call the method again
2024-08-31 19:59:05 +08:00
ChillerDragon f44def1cdd Only do armor progress hack in ddrace controller
Only mess with the characters armor in ddrace controllers.
This allows other game modes to use the armor as actual armor.
2024-08-31 18:57:42 +08:00
Vlad 468900acfe typos in russian.txt 2024-08-31 13:44:09 +03:00
Dennis Felsing 6ab597a465
Merge pull request #8852 from JuraIBOZO/patch-8
Update russian.txt
2024-08-31 08:37:53 +00:00
Dennis Felsing a83248b9ec
Merge pull request #8851 from ChillerDragon/pr_chr_get_tuning
Simplify character tuning code
2024-08-31 08:24:42 +00:00
JuraIBOZO 383bef93b9 Update russian.txt 2024-08-31 10:19:36 +02:00
Robert Müller f0449befa5
Merge pull request #8841 from ChillerDragon/pr_unhardcode_07_gameflags
Share gameflags for 0.6/0.7 instead of hardcoding it
2024-08-31 07:38:22 +00:00
ChillerDragon c02a2ed1d6 Simplify character tuning code
entities/character.cpp now has the same api as prediction/entities/character.cpp
2024-08-31 10:41:39 +08:00
Dennis Felsing 60688bf80e
Merge pull request #8850 from dobrykafe/pr-18.5-translations
Update Czech and Slovak translations for 18.5
2024-08-30 22:04:36 +00:00
dobrykafe 29a205a6d9 update slovak translations for 18.5 2024-08-30 22:18:45 +02:00
dobrykafe c10b466a40 update czech translations for 18.5 2024-08-30 22:18:35 +02:00
Dennis Felsing 914867d980
Merge pull request #8849 from furo321/fix-twlang-endline
Set correct end line in `twlang.py` for strings with context
2024-08-30 18:44:10 +00:00
furo d40cc86bfa Set correct end line in twlang.py for strings with context 2024-08-30 20:15:26 +02:00
Dennis Felsing f754054874
Merge pull request #8848 from Robyt3/Client-Map-Download-Reset-Cleanup
Fix map downloading overriding more recent map change messages
2024-08-30 16:20:48 +00:00
Robert Müller 05970178b2 Fix map downloading overriding more recent map change messages
Following sequence of events was possible:

1. HTTP map download for map X is started (e.g. client initially connects to server).
2. Map change message for map Y arrives while downloading (e.g. vote for another map has passed on the server).
3. Client already has map Y and loads it directly without starting or resetting the map download.
4. HTTP map download task for map X finishes.
5. Map X is loaded, overriding the map Y that should be loaded. This is one cause for #2804.

This could potentially also happen with the map download from the game-server, if the final map data chunk for a downloaded map is received directly after another map change message for a map which does not need to be downloaded, though this seems more unlikely.

This is fixed by resetting the current map download immediately after receiving a valid map change message instead of only when starting a new map download.

The relevant code to reset the map download is moved to `CClient::ResetMapDownload` to avoid duplicate code and ensure that the temporary map download file is always deleted and closed.
2024-08-30 17:54:38 +02:00
Dennis Felsing 3d5b533816
Merge pull request #8847 from EGYT5453/ua-18.5
Update Ukrainian l10n (18.5)
2024-08-30 09:16:10 +00:00
Andrii cdc5b9922a
Update Ukrainian l10n (18.5) 2024-08-30 10:41:55 +03:00
Dennis Felsing 528a38265e
Merge pull request #8846 from n0Ketchp/patch-21
Update spanish.txt
2024-08-30 06:52:17 +00:00
noKetchup 099ec44eac
Update spanish.txt 2024-08-30 00:29:21 -04:00
Dennis Felsing b641fdb8fd
Merge pull request #8845 from GokturkTalha/patch-11
Update Azerbaijanese translations for 18.5
2024-08-29 22:18:02 +00:00
Dennis Felsing e54fb30e72
Merge pull request #8844 from GokturkTalha/patch-10
Update Turkish translations for 18.5
2024-08-29 22:18:00 +00:00
Talha Aygün 325f908f09
Update Azerbaijanese translations for 18.5 2024-08-29 23:38:53 +03:00
Talha Aygün 870cff3da2
add author 2024-08-29 23:31:07 +03:00
Talha Aygün 4ea9ed9b2b
Update Turkish translations for 18.5 2024-08-29 23:29:27 +03:00
Jupeyy 98b0f50111
Merge pull request #8661 from DynamoFox/workaround-glew-on-wayland-partial-init
Workaround GLEW error code on init with Wayland
2024-08-29 18:21:08 +00:00
DynamoFox fe35322bb0 Workaround GLEW error code when calling glewInit() on Wayland
* Fixes OpenGL on Wayland when the GLX flavor of GLEW is linked
* Only if SDL2's video driver is "wayland" we also allow the
  GLEW_ERROR_NO_GLX_DISPLAY error code to be accepted as if glewInit()
  actually succeeded
* Hopefully this won't be needed anymore on future versions of GLEW when
  glewContextInit() is made part of the public API
2024-08-29 19:47:43 +02:00
Dennis Felsing 41cd82c2d3
Merge pull request #8653 from DynamoFox/force-sdl2-video-driver-selection-on-linux
Fix game launch on Wayland-only systems with SDL2.30+
2024-08-29 16:06:03 +00:00
Dennis Felsing 21375f0e1d
Merge pull request #8843 from Pioooooo/chinese-18.5
Update Chinese translations for 18.5
2024-08-29 13:42:23 +00:00
Pioooooo 55891afc50 Update Chinese translations for 18.5 2024-08-29 11:11:41 +00:00
Robert Müller edcc3245f4
Merge pull request #8821 from def-/pr-transl-18.5
Update translations for 18.5, remove 0.7-only translations
2024-08-29 08:11:18 +00:00
Dennis Felsing 88739c5345 Update translations for 18.5, remove 0.7-only translations
Fix some minor stuff
2024-08-29 09:53:28 +02:00
Dennis Felsing da4bc09429
Merge pull request #8840 from Pioooooo/translation-fix
Update Chinese translations
2024-08-29 07:36:54 +00:00
ChillerDragon 43dee5d4c5 Share gameflags for 0.6/0.7 instead of hardcoding it
5cf0e5e997/datasrc/network.py (L8)
5cf0e5e997/datasrc/seven/network.py (L10)

0.6 game flags:

```python
GameFlags = ["TEAMS", "FLAGS"]
```

0.7 game flags:

```python
GameFlags = Flags("GAMEFLAG", ["TEAMS", "FLAGS", "SURVIVAL", "RACE"])
```

The 0.7 protocol extended the game flags without changing the old 0.6 flags.
So flag teams and flag flags are the same in both versions and 0.7 just
has additional flags.

The server is now sending the same m_GameFlags from the gamemode
controller to 0.6 and 0.7 connections. It clamps away the unsupported
flags for 0.6.

Before this commit the ddnet server would always send the hardcodet race
flag to 0.7 connections while ignoring what the gamemode set as a game
flag.
2024-08-29 15:15:48 +08:00
Pioooooo ba4f0368a4 Update Chinese translations 2024-08-29 04:34:17 +00:00
Dennis Felsing 5cf0e5e997
Merge pull request #8839 from dobrykafe/pr-create-07-skin-folder
Create 0.7 skin folder
2024-08-28 23:00:58 +00:00
dobrykafe 218ce1f53f create 0.7 skin folder 2024-08-29 00:36:06 +02:00
Dennis Felsing 91ae4ca120
Merge pull request #8838 from dobrykafe/pr-07-skins-directory
Add 0.7 skins directory button
2024-08-28 22:19:27 +00:00
dobrykafe 41fee0bb3f add 0.7 skins directory button 2024-08-28 23:57:12 +02:00
Dennis Felsing cc1dc405fe
Merge pull request #8837 from Robyt3/Android-Build-NDK-Version-Fix
Remove unnecessary `ndkVersion` from Gradle build
2024-08-28 17:12:22 +00:00
Robert Müller 1dd56f1a90 Remove unnecessary ndkVersion from Gradle build
Gradle can determine the NDK version automatically and this property is only required if multiple NDK versions are installed. The NDK version previously determined from the filename could not be parsed by Gradle anyway.
2024-08-28 18:12:05 +02:00
Dennis Felsing 5a66dc05f4
Merge pull request #8828 from dobrykafe/pr-save-07-skins
Implement 0.7 skin save button
2024-08-27 21:50:23 +00:00
Dennis Felsing 7df1b24491
Merge pull request #8833 from furo321/vote-creator
Set `m_VoteCreator` when possible
2024-08-27 21:20:41 +00:00
dobrykafe 31ee6abe82 implement 0.7 skin save button 2024-08-27 23:18:43 +02:00