Robert Müller
668e6fb14e
Use member variables for demo player snapshot data
...
Use member instead of static variables for demo player snapshot data. The static variables would otherwise cause issues when multiple demo players are playing at the same time, especially demo players used in background jobs for replay demo slicing. This hopefully closes #7068 .
2023-10-14 10:51:45 +02:00
Dennis Felsing
90466689d3
Merge pull request #7343 from Robyt3/Engine-Demo-Editor-Type-Preservation
...
Preserve demo type when slicing
2023-10-13 21:58:20 +00:00
Dennis Felsing
c4a6955fb1
Merge pull request #7342 from Robyt3/Demo-Render-Slice-Disable
...
Disable demo slice button while demo is being rendered
2023-10-13 21:58:19 +00:00
Robert Müller
3af7de307a
Preserve demo type when slicing
...
Previously all sliced demos used type "client", even if the original demo had type "server". Now the type of the original demo is copied when slicing.
2023-10-13 22:11:49 +02:00
Robert Müller
172f316a40
Disable demo slice button while demo is being rendered
...
There is no reason to slice a demo while currently rendering it and it may cause issues because multiple demo players would access the same `IVideo` instance.
2023-10-13 22:06:17 +02:00
Dennis Felsing
151394630f
Merge pull request #7341 from Robyt3/Engine-Demo-Editor-Refactoring
...
Refactor engine demo editor, minor refactoring of demo recorder/player
2023-10-13 19:37:14 +00:00
Robert Müller
9030c5b155
Refactor CDemoEditor
, fix clang-tidy NOLINT
...
Use composition instead of inheritance for demo player listener to avoid temporarily storing a pointer to a local variable in a member variable.
Fix demo player file not being closed when demo recorder file cannot be opened during demo slicing.
2023-10-13 20:46:08 +02:00
Robert Müller
a0b708a0b2
Assert that demo recording/playback are properly started/stopped
...
Add assertions to check that demo recording/playback is not started when already running.
Add assertions to check that demo recording/playback is stopped before the respective demo recorder/player is destroyed.
2023-10-13 20:45:22 +02:00
Robert Müller
543e63ee71
Use IO_MAX_PATH_LENGTH
for demo recorder/player filenames
2023-10-13 20:45:07 +02:00
Robert Müller
7a624d7911
Ensure demo player listener is initialized
...
Using `SetListener` is optional.
2023-10-13 20:02:13 +02:00
Robert Müller
a19c51f545
Remove unused CHUNKFLAG_BIGSIZE
2023-10-13 20:02:13 +02:00
Dennis Felsing
c746f70c12
Merge pull request #7338 from Robyt3/Demo-Render-Popup-Layout
...
Improve layout of demo render popup on 5:4 resolutions
2023-10-12 21:24:31 +00:00
Robert Müller
aeb1530966
Improve layout of demo render popup on 5:4 resolutions
2023-10-12 19:20:12 +02:00
Dennis Felsing
01958378f1
Merge pull request #7336 from Robyt3/Demo-Render-Popup-Android
...
Remove Android-specific layout code for demo render popup
2023-10-11 21:54:21 +00:00
dobrykafe
ee115bf824
dont go below default zoom
2023-10-11 21:08:37 +02:00
Robert Müller
1dfdd752f8
Remove Android-specific layout code for demo render popup
...
The filename editbox and buttons of the demo render popup were rendered excessively large on Android. While too small buttons could be an issue with smaller screens, this should not be implemented solely this popup, if Android support is revived in the future, as it makes the UI layout code harder to maintain.
2023-10-11 18:20:11 +02:00
heinrich5991
5fbf02ae91
Merge pull request #7333 from Robyt3/Clang-Tidy-Remove-Nolint
...
Remove obsolete clang-tidy `NOLINT` comments
2023-10-11 15:49:46 +00:00
Robert Müller
aa03aa0f60
Remove obsolete clang-tidy NOLINT
comments
...
The TODO in the `Dilate` function is removed, as the code already appears to be safe without additional checks. The variable `k` is at most `(w * h - 1) * BPP`, as `ix` and `iy` are clamped to maximum `w - 1` and `h - 1` respectively. Because `p < BPP - 1` the index `k + p` is therefore always valid for the buffers. (The caller must ensure that the source and destination buffers are of size `w * h * BPP`.)
2023-10-11 17:22:59 +02:00
Dennis Felsing
60fa51ff13
Merge pull request #7309 from infclass/kaffeine/merge-client-data-structs
...
Extract client 'six' data types and use them for 'seven' data
2023-10-10 21:55:55 +00:00
Dennis Felsing
7171a8872e
Merge pull request #7330 from Zwelf/pr-fix-save-dry
...
Fix save_dry command
2023-10-09 14:58:59 +00:00
Zwelf
1d6771ea9d
Fix save_dry command
2023-10-09 16:36:40 +02:00
Dennis Felsing
f81af726e9
Merge pull request #7328 from Zwelf/pr-save-ninja
...
Save/load ninja
2023-10-09 09:40:02 +00:00
Zwelf
9be7ad554d
Save/load ninja
...
Add ninja state to save string. Previously ninja was lost during load.
2023-10-09 11:11:55 +02:00
Dennis Felsing
1fb0235f4b
Merge pull request #7327 from furo321/correct-max-length
...
Show correct max length in help text for `MACRO_CONFIG_STR`
2023-10-09 06:52:43 +00:00
furo
f39792f330
Show correct max length in help text for MACRO_CONFIG_STR
2023-10-09 00:53:28 +02:00
Dennis Felsing
cc62d958c6
Merge pull request #7253 from JSaurusRex/midTickAim
...
firing/hooking takes aim when action happened not when tick
2023-10-08 21:29:34 +00:00
JSaurusRex
3c7ad1490b
done requested code changes
2023-10-08 17:31:43 +02:00
Robert Müller
34b91fc63c
Merge pull request #7326 from def-/pr-notif
...
Make sure notification object exists
2023-10-08 12:39:50 +00:00
Dennis Felsing
1f5a764cf5
Make sure notification object exists
2023-10-08 14:01:02 +02:00
Dennis Felsing
1130ebc3b7
Merge pull request #7324 from furo321/solo-kill-team
...
Don't announce team killed if it's a solo server.
2023-10-08 11:38:26 +00:00
furo
703db2c124
Don't announce team killed if it's a solo server.
2023-10-08 13:06:39 +02:00
Dennis Felsing
f7d23844db
Merge pull request #7322 from Robyt3/Editor-External-Image-Name-Fix
...
Fix names of external images not being loaded in editor
2023-10-08 10:59:53 +00:00
Dennis Felsing
dc57cc38c4
Merge pull request #7323 from furo321/move-background-setting
...
Move "Regular background color" setting to background
2023-10-08 10:59:34 +00:00
furo
88e1988d96
Move "Regular background color" setting to background
...
Fixed capitalization (only captialize first letter)
2023-10-08 12:26:03 +02:00
Robert Müller
97ae362bd6
Fix names of external images not being loaded in editor
...
The entire `CEditorImage` was being overwritten when loading external images, which was causing the already loaded image name to be cleared, due to the changed order of operations (regression from #7008 ). This is fixed by using `CImageInfo` to load the image and only copying the relevant members to the `CEditorImage`.
2023-10-08 11:38:13 +02:00
Robert Müller
d4fed2360e
Merge pull request #7208 from dobrykafe/pr-editor-toolbar-sounds
...
Enhance editor toolbar sounds
2023-10-08 09:06:15 +00:00
Dennis Felsing
e4ccd79851
Merge pull request #7318 from furo321/editor-mode-icons
...
Use icons for editor mode switching.
2023-10-08 08:17:07 +00:00
furo
e1979d9c9b
Use icons for editor mode switching.
...
Make the icons bigger.
Make it the same size as "group"
2023-10-08 01:17:20 +02:00
Dennis Felsing
454194489b
Merge pull request #7319 from furo321/reset-zoom-on-change
...
Reset zoom when adjusting default zoom in settings
2023-10-07 22:09:43 +00:00
Dennis Felsing
7034ca84ec
Merge pull request #7314 from furo321/keep-practice
...
Don't disable practice on death.
2023-10-07 21:28:28 +00:00
furo
8c9597667a
Reset zoom when adjusting default zoom in settings
2023-10-07 23:24:36 +02:00
Robert Müller
a91374b276
Merge pull request #7316 from dobrykafe/pr-server-info-colors
...
server info: show clanmates in different color
2023-10-07 15:41:47 +00:00
dobrykafe
0838fd9d04
fix requested changes
2023-10-07 15:52:36 +02:00
dobrykafe
fc23f451b2
show clanmates in different color
2023-10-07 15:05:36 +02:00
dobrykafe
8adbbc433c
fix requested changes
2023-10-07 14:49:51 +02:00
Robert Müller
093edb7803
Merge pull request #7308 from Marmare314/add-editor-object
...
Add `CEditorObject` class
2023-10-07 10:26:28 +00:00
furo
d4ec8cf8b4
Don't disable practice on death.
2023-10-07 09:34:20 +02:00
marmare314
719b2bdadd
add editor object class
...
This class is slightly more light-weight than a CEditorComponent
and its naming makes it more natural to inherit for envelope points,
proof-mode positions etc.
2023-10-07 00:46:47 +02:00
Dennis Felsing
d6aa18e5b4
Merge pull request #7310 from infclass/fix-cmake-versioning
...
Fix cmake versioning
2023-10-06 21:46:31 +00:00
Dennis Felsing
9e30ce3c2d
Merge pull request #7311 from Robyt3/Demo-Browser-Overhaul
...
Overhaul demo browser UI
2023-10-06 21:42:25 +00:00