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

18584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert Müller b9cce63bc7
Merge pull request #7577 from archimede67/pr-console-search 
Added search in console (ctrl+f)
 2023-12-14 21:19:42 +00:00
Corantin H af77ebac54 Added console search function 2023-12-14 21:58:27 +01:00
heinrich5991 efe593c7b0
Merge pull request #7602 from ChillerDragon/pr_create_switcherscontroller 
Move switcher snapping code to own method
 2023-12-13 22:10:49 +00:00
Dennis Felsing a16d8dd6c7
Merge pull request #7643 from Robyt3/Menus-Callvote-Margin 
Add small margin to callvote label
 2023-12-13 17:53:30 +00:00
Robert Müller 68508e1b81 Add small margin to callvote label 2023-12-13 17:47:10 +01:00
ChillerDragon 1723554288 Move switcher snapping code to own method 2023-12-13 17:29:02 +01:00
heinrich5991 b458890f08
Merge pull request #7639 from ChillerDragon/pr_canjoinmsg 
Move chat message into CanJoinTeam()
 2023-12-13 15:27:25 +00:00
heinrich5991 0075d85581
Merge pull request #7642 from BlaiZephyr/GfxRefactor 
changed GFX → Gfx
 2023-12-13 15:26:31 +00:00
BlaiZephyr 6521344eca changed GFX → Gfx 2023-12-13 15:46:49 +01:00
Dennis Felsing a36feebf71
Merge pull request #7640 from heinrich5991/pr_ddnet_rm_appdata 
Remove ddnet.appdata.xml
 2023-12-13 14:08:19 +00:00
ChillerDragon 157e8b7302 Pass error message as buffer to CanJoinTeam() 
Now `CGameContext` no longer assumes the `IGameController`
declined the team join due to slots.

This enables custom gametypes to disallow joining the game if the player
died, an active tournament is running or the player is not logged in
yet. And then the controller can print the correct error message
accordingly.
 2023-12-13 14:46:37 +01:00
heinrich5991 5efceb64f2
Merge pull request #7641 from furo321/set-correct-authcolor 
Set correct colour for authed colour reset button
 2023-12-13 12:48:47 +00:00
furo 09e222c39f Set correct colour for authed colour reset button 2023-12-13 13:23:33 +01:00
heinrich5991 9a1644982e Remove ddnet.appdata.xml 
It was outdated already.

Fixes #7607.
 2023-12-13 11:58:29 +01:00
Dennis Felsing bcc92fa0fb
Merge pull request #7638 from Robyt3/Engine-Refactoring 
Ensure network log files are closed when shutting down engine
 2023-12-12 20:12:00 +00:00
Robert Müller 187120dd31 Ensure network log files are closed when shutting down engine 
Previously, the network log files were not explicitly closed unless the `dbg_lognetwork` command is used again manually.
 2023-12-12 20:00:52 +01:00
Robert Müller 10b486a6b0 Remove unnecessary use of GetCompletePath 
The result `aFullPath` is unused.
 2023-12-12 20:00:48 +01:00
Edgar 082c44889a
Merge pull request #7635 from archimede67/fix-escape-key-lineinput 
Fix escape key not working when lineinput is focused
 2023-12-12 08:14:51 +00:00
Edgar 3cb510a2e6
Merge pull request #7637 from heinrich5991/pr_ddnet_even_less_system_h 
Remove `#include <system.h>` from one more header
 2023-12-12 08:14:32 +00:00
heinrich5991 e4c97e5583
Merge pull request #7574 from furo321/remove-telecursor 
Don't scale TargetXY by zoom when in spectator.
 2023-12-11 23:50:21 +00:00
heinrich5991 be53d83019 Remove #include <system.h> from one more header 2023-12-12 00:44:46 +01:00
Dennis Felsing 7813cfed6c
Merge pull request #7618 from heinrich5991/pr_ddnet_less_system_h 
Make less headers depend on `<base/system.h>`
 2023-12-11 23:08:59 +00:00
heinrich5991 05af24a052 Make less headers depend on <base/system.h> 
Move a couple of trivial type definitions to `<base/types.h>` instead.
 2023-12-11 23:52:23 +01:00
archimede67 0aca09093f Use WasCursorChanged() when rendering lineinput in CUI::DoEditBox 2023-12-11 22:26:19 +01:00
Robert Müller 990bb8bb5d
Merge pull request #7632 from furo321/input-envelope-scaling 
Fix envelope scaling being triggered in name input.
 2023-12-11 20:36:03 +00:00
furo b42f43ce99 Fix envelope scaling being triggered in name input. 2023-12-11 21:17:24 +01:00
Dennis Felsing 7abada56bf
Merge pull request #7630 from ChillerDragon/pr_authedcolor_setting 
Add ui setting for cl_authed_player_color
 2023-12-11 19:56:02 +00:00
ChillerDragon ab5a7b88bd Add ui setting for cl_authed_player_color 2023-12-11 20:21:01 +01:00
Robert Müller df678ea672
Merge pull request #7628 from furo321/refresh-keys 
Support `F5` and `Modifer` + `R` for refresh where possible.
 2023-12-11 17:37:29 +00:00
furo 466dca87a6 Support F5 and Modifer + R for refresh where possible. 2023-12-11 16:52:21 +01:00
Dennis Felsing 5013962480
Merge pull request #7627 from archimede67/fix-colorable-game-layers 
Fix colorable entities layers
 2023-12-11 12:58:39 +00:00
Corantin H 8c5b8a88c8 Ensure white color for entities layers when loading map layers 2023-12-11 13:37:23 +01:00
Corantin H 0c69378fcd Prevent editing the color of entities layers 2023-12-11 13:36:42 +01:00
Dennis Felsing 79b016b7a0
Merge pull request #7626 from archimede67/fix-editor-modified-state 
Fix editor modified state not being updated properly
 2023-12-11 11:17:28 +00:00
Corantin H 7b20bf71e6 Fix modified state being set when lineinput is selected. 
Differentiate between text and cursor changes by adding an additional `m_WasCursorChanged`.
 2023-12-11 00:05:13 +01:00
Corantin H 51220b1dfc Fix editor modified state not being updated properly 2023-12-11 00:03:46 +01:00
Robert Müller 733b46da87
Merge pull request #7613 from archimede67/fix-chat-input-history 
Reset history entry along with chat input when using Escape
 2023-12-10 18:34:28 +00:00
Dennis Felsing 079c462624
Merge pull request #7624 from Robyt3/Menus-KeyReader-Improvement 
Improve key reader button
 2023-12-10 18:05:00 +00:00
Corantin H 5b7c064ea2 Reset history entry along with chat input when using Escape 2023-12-10 17:39:41 +01:00
Robert Müller 83af5e47f3 Improve key reader button 
Show localized text "Press a key…" instead of "???" while waiting for a key to be pressed.

Render button with green background while waiting for a key to be pressed.

Inline unnecessary `DoButton_KeySelect` function.

Fix names of static variables.
 2023-12-10 16:07:27 +01:00
Robert Müller 1b03637436 Remove unused color argument, use ColorRGBA instead of vec4 2023-12-10 16:05:59 +01:00
Dennis Felsing eb86959e2b
Merge pull request #7622 from Robyt3/Editor-Color-Picker-Button-Rounding-Fix 
Consistent rounding of editor value/color picker buttons
 2023-12-10 12:13:38 +00:00
Dennis Felsing d15b1f4ab3
Merge pull request #7621 from Robyt3/Config-Game-Reset-Without-Console 
Avoid using console to reset game settings
 2023-12-10 12:10:18 +00:00
Robert Müller 20d9920d00 Consistent rounding of editor value/color picker buttons 
Fix too large rounding for some editor color picker buttons.
 2023-12-10 11:41:18 +01:00
Robert Müller 140fcea667 Avoid using console to reset game settings 
Prevent potential dead lock when using `/map` chat command in combination with Teehistorian. Closes #7619. I could not reproduce the issue on Windows though.

This also means resetting game settings should actually be efficient now, because it only involves iterating over all game settings and directly resetting their value.
 2023-12-10 11:23:20 +01:00
Dennis Felsing addb3c6980
Merge pull request #7616 from Robyt3/Snapshot-Storage-Separate-Alloc 
Separate snapshot storage holder and snap data allocations
 2023-12-09 21:45:45 +00:00
Robert Müller 7ae7877248
Merge pull request #7593 from archimede67/console-scrolling 
Add ability to scroll in console. Remove pages.
 2023-12-09 18:26:32 +00:00
Robert Müller d3cc932a9b
Merge pull request #7393 from archimede67/editor-undo-redo-v2 
Editor undo/redo v2
 2023-12-09 18:17:38 +00:00
Robert Müller efc451324d Separate snapshot storage holder and snap data allocations 
Previously, only one buffer was allocated to store each snapshot holder structure, the snapshot data and alternative snapshot data. This prevents tools like ASAN from detecting some invalid accesses, e.g. to the snapshot holder structure by underflowing the snapshot data pointer. Now three separate allocations are used instead. This hopefully helps debugging #2677.
 2023-12-09 19:03:07 +01:00
Dennis Felsing 3b58f868d5
Merge pull request #7508 from def-/pr-revert-compat 
Revert "Add flags for compatibility with Windows 8 - 11"
 2023-12-09 17:29:31 +00:00