h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 09:32:53 +08:00
Code Issues Releases Wiki Activity
59,234 Commits 3 Branches 657 Tags 358 MiB
4ae2661f1b
Commit Graph

3078 Commits

Author SHA1 Message Date
Dean Herbert
fc6445caea Rate limit updates for good measure 2022-07-21 22:55:45 +09:00
Dean Herbert
3d2603e0eb Remove unused classes 2022-07-21 22:51:35 +09:00
Dean Herbert
3fad481a96 Avoid using RollingCounter in fps counter 
It wasn't made to be updated every frame, and it shows. Inaccurate for
reasons I'm not really interested in investigating, because I don't want
to incur the `Transorm` overhead in the first place for an fps counter.

Was only used originally out of convenience.
 2022-07-21 22:50:02 +09:00
Dean Herbert
5db4d9437a Add missing using statement 2022-07-21 21:39:24 +09:00
Dan Balasescu
6fac34c721
Merge pull request #19274 from peppy/fix-fps-counter-fps-inaccuracy 
Fix draw FPS being inaccurate due to using `ElapsedFrameTime`
 2022-07-21 20:55:14 +09:00
Dean Herbert
4c4939d18d Fix draw FPS being inaccurate due to using ElapsedFrameTime 
Had a feeling this would be the case.

Basically, we're calculating on the update thread and checking the last
value of draw thread's `ElapsedFrameTime`. In the case that value is
spiky, a completely incorrect fps can be displayed.

I've left the spike display do use `ElapsedFrameTime`, as
`FramesPerSecond` is too averaged to see spikes.
 2022-07-21 19:17:58 +09:00
Dean Herbert
fb728fbed1 Fix FPS counter not being wide enough to show large fps numbers 2022-07-21 18:56:39 +09:00
Dan Balasescu
defadeef47
Merge pull request #19250 from peppy/fps-counter 
Add game-side FPS counter
 2022-07-21 16:26:38 +09:00
TacoGuyAT
2f16174d3d Changed control points set to private; Cleanup 2022-07-21 07:25:44 +03:00
Dean Herbert
56106e43d2 Avoid div-by-zero 2022-07-21 13:06:43 +09:00
Dean Herbert
311a0a3de0 Always show counter temporarily when aim FPS changes 2022-07-21 12:57:40 +09:00
Dean Herbert
705ff06ea5 Better handle spikes and significant changes 2022-07-21 12:50:39 +09:00
Dean Herbert
285516b111 Fix isDisplayed never actually being set 2022-07-21 12:40:27 +09:00
TacoGuyAT
ed8e065a86 Logo triangles speed and beat sync tweaks 2022-07-21 06:13:45 +03:00
Dean Herbert
728e22fbce Improve tooltip display when running single thread 2022-07-21 12:06:22 +09:00
Dean Herbert
e1a577ea48
Adjust spacing to make things feel more even 
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
 2022-07-21 11:59:51 +09:00
Dean Herbert
57ecc3a6df
Remove unnecessary negative spacing from thread names 
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
 2022-07-21 11:59:26 +09:00
Dean Herbert
c7313b4198
Fix alignment glitching due to non-matching anchor/origin 
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
 2022-07-21 11:58:28 +09:00
Dean Herbert
75453b78c0 Adjust colours and metrics 2022-07-21 00:09:46 +09:00
Dean Herbert
f54aff2ece Add global key binding for FPS toggle 2022-07-21 00:09:46 +09:00
Dean Herbert
0a1744faca Add to game and bind with configuration setting 2022-07-20 23:49:19 +09:00
Dean Herbert
0fb959a565 Stay displayed while hovering 2022-07-20 23:49:19 +09:00
Dean Herbert
03e644e548 Choose colours based on relative performance goals 2022-07-20 23:49:19 +09:00
Dean Herbert
0c3d43026d Add initial structure for fps counter 2022-07-20 23:49:19 +09:00
Dean Herbert
7be5c638e4 Fix floating mouse position not running correctly in single thread mode 
Noticed while testing on iOS. Previously, the interpolation was being
done in input handling but using the update thread clock, leading to
incorrect application.
 2022-07-20 00:22:45 +09:00
Gabe Livengood
d6abdc597d
correct label positioning 2022-07-11 17:12:41 -04:00
Gabe Livengood
8617b94c9d
shorten label 2022-07-11 17:12:14 -04:00
Gabe Livengood
77f5ec3a4e
use checkbox label instead of tooltip 2022-07-11 16:39:53 -04:00
Gabe Livengood
7d26f178c6
use OverlayColourProvider for nub colors when possible 2022-07-11 16:36:17 -04:00
Gabe Livengood
b92979acd6
add tooltip to checkbox 2022-07-08 16:00:48 -04:00
Gabe Livengood
8e84f76bf9
add hidden item toggle to directory/file selectors 2022-07-08 15:49:10 -04:00
Dean Herbert
32c77ddf71 Avoid triggering SeasonalBackgroundChanged unless actually required 2022-07-08 15:07:30 +09:00
Dean Herbert
b83073c2e9 Fix SeasonalBackgroundLoader triggering a background reload when not providing backgrounds 2022-07-08 02:12:01 +09:00
Dean Herbert
ae49aafde2 Fix BeatSyncedContainer unintentionally blocking on beatmap load 2022-07-06 14:58:06 +09:00
Dan Balasescu
9bf91835b6
Merge pull request #18962 from peppy/slider-range-control 
Move star difficulty filter to song select
 2022-07-03 21:58:00 +09:00
Dean Herbert
b626135940 Fix dragging slider bars on nub not performing correctly relative movement 2022-07-02 17:49:38 +09:00
Dean Herbert
545df0a8e8 Display difficulty on nub 2022-07-01 15:17:26 +09:00
Dean Herbert
d54f7fc728 Move slider range control to song select 2022-07-01 14:41:36 +09:00
Dean Herbert
3785027284 Update OsuSliderBar colours to not use transparency 2022-07-01 14:41:36 +09:00
Dean Herbert
2ecab454aa Adjust animations and tolerances to make things feel snappier 2022-06-25 19:50:10 +09:00
Dean Herbert
a039f9878a Adjust menu cursor rotation to follow mouse, rather than be fixated around original click location 2022-06-25 19:33:44 +09:00
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Dean Herbert
f71f6302fd Remove unnecessary null casts 2022-06-24 14:50:11 +09:00
Dean Herbert
730228ec2a
Merge pull request #18818 from nekodex/rearrangeable-list-feedback 
Add audio feedback for rearranging list items
 2022-06-23 23:30:55 +09:00
Jamie Taylor
aaf619b35c
Don't play sample if there is no item being actively dragged 2022-06-23 20:13:01 +09:00
Jamie Taylor
9c46592e0e
Move collection change event binding to LoadComplete 2022-06-23 20:04:54 +09:00
Jamie Taylor
4a316fad2f
Add audio feedback for rearranging list items 2022-06-23 17:45:42 +09:00
Dean Herbert
51268d0cc8 Throw on Wait failure in a few remaining cases 2022-06-23 15:28:21 +09:00
Dean Herbert
7ef8b7df5f Add timeout for all ManualResetEventSlim.Wait invocations 
Timeout values were taken as best-guesses of upper values we'd expect
from sane execution.
 2022-06-23 14:46:00 +09:00
Dean Herbert
97fcf8cec9
Merge pull request #18668 from smoogipoo/editor-controlpoint-undo-redo 2022-06-23 04:02:24 +09:00
Bartłomiej Dach
34f1c80b7c
Add and use ILinkHandler interface 2022-06-20 20:04:21 +02:00
Dan Balasescu
e0c82d11ab Convert == usages to ReferenceEquals 2022-06-20 16:56:19 +09:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Dean Herbert
8ea3042435 Move file extensions specification to common class 2022-06-16 18:00:27 +09:00
Jamie Taylor
930ec2a197
Add specific samples for dialog 'Ok' and 'Cancel' buttons 2022-06-15 15:41:27 +09:00
Dan Balasescu
dfc643fd8c Match family string via GetFamilyString() 2022-06-13 12:35:10 +09:00
Salman Ahmed
3aec0fe9b6 Fix torus alternate not mapping "medium" weight to "regular" 2022-06-13 04:45:07 +03:00
Salman Ahmed
7971355660 Fix torus "medium" weight not mapped to "regular" when using With 2022-06-13 04:44:44 +03:00
Salman Ahmed
051aa8f028 Mark family strings as verbatim 2022-06-13 04:43:14 +03:00
Dan Balasescu
561a932d17
Merge pull request #18587 from peppy/skin-editor-fix-sizing 
Fix skin editor not accounting for aspect ratios in base-game sizing logic
 2022-06-07 13:19:50 +09:00
Dean Herbert
da000ee5f0 Centralise video file extensions 2022-06-06 20:11:43 +09:00
Dean Herbert
003a3de270 Adjust transitions to look better 2022-06-06 18:06:46 +09:00
Jamie Taylor
396a566a0e
Add some randomness to click samples 2022-06-03 22:33:11 +09:00
Jamie Taylor
2878bb592f
Use more appropriate sounds for certain components 2022-06-03 22:32:12 +09:00
Jamie Taylor
365819865e
Remove 'submit' sample usages 2022-06-03 22:31:35 +09:00
Salman Ahmed
06832a4baf Fix beatmap badge colours not updated inline with recent changes 2022-05-28 01:05:43 +03:00
Bartłomiej Dach
a94432f3bd
Fix drawable room border colour not matching badge 2022-05-27 16:40:15 +02:00
Dean Herbert
3f5ccd4db8 Update timing screen sections to newer design metrics 2022-05-24 18:43:22 +09:00
Dean Herbert
f00dd27fcd Move OverlayColourProvider provisioning of RoundedButton to SettingsButton for now 2022-05-24 18:11:54 +09:00
Bartłomiej Dach
3847a586f1
Make GlobalAction.Back close all opened dropdown menus 2022-05-23 23:37:40 +02:00
Dan Balasescu
f111d33b25
Merge pull request #18339 from peppy/editor-timing 
Add first pieces of editor timing UI
 2022-05-23 11:12:22 +09:00
Dean Herbert
3a7233bd6e Move interface to more appropriate namespace 2022-05-22 22:49:24 +09:00
Dean Herbert
eabf578282 Use interface to convey beat sync information 2022-05-22 22:44:54 +09:00
Bartłomiej Dach
21e1576b2f
Fix appearance of sheared button borders after click 
The border would previously get brighter after click, but then dim
instantly when the flash layer has fully faded out. The underlying issue
there is https://github.com/ppy/osu-framework/issues/5191, but
`ShearedButton` was placing the flashing layer incorrectly anyway, as
the intent was that it should also apply to the border.
 2022-05-21 20:53:23 +02:00
Dean Herbert
d3f115bfe2 Remove redundant qualifiers 2022-05-21 13:53:58 +09:00
Dean Herbert
7dcb88759a Remove unnecessary using statement 2022-05-21 00:28:17 +09:00
Dean Herbert
4633eed78c Merge branch 'master' into localisable-filter-items 2022-05-20 23:55:16 +09:00
Dean Herbert
2b3ec53fed Merge branch 'safe-file-writes' into localisable-filter-items 2022-05-20 23:51:24 +09:00
Dean Herbert
c3bfbe8880 Allow BeatSyncedContainer to prefer EditorBeatmap when available 2022-05-20 23:24:57 +09:00
Dean Herbert
ce7be940e2 Setup basics for control and test 2022-05-20 17:30:04 +09:00
Dean Herbert
83e781d5a1 Allow localisation of PlaceholderText 2022-05-17 17:42:46 +09:00
Dean Herbert
98e5ad44a7 Add OverlayColourProvider support to OsuDirectorySelector 2022-05-17 17:33:54 +09:00
Dean Herbert
218642c300 Update unsafe file write usages 2022-05-16 18:05:27 +09:00
Dan Balasescu
a633501687 Change FilterTerms to use LocalisableString 2022-05-16 14:09:37 +09:00
Dan Balasescu
8a559ff58a
Merge pull request #18191 from frenzibyte/button-use-overlay-colour 
Fix buttons no longer coloured using `OverlayColourProvider`
 2022-05-10 12:14:10 +09:00
Salman Ahmed
1fcfeac05f Fix RoundedButton not using its default background colour 2022-05-09 21:07:43 +03:00
Salman Ahmed
ace25af949 Revert "Move default background colour specification to OsuButton" 
This reverts commit 172524ff8a.
 2022-05-09 20:55:26 +03:00
Salman Ahmed
172524ff8a Move default background colour specification to OsuButton 2022-05-09 18:21:00 +03:00
Dean Herbert
70a90722e8 Fix dropdown item hover colour not being set in time 
Turns out to be an osu!-side issue. The colour transform was being
shortcutted for the non-displayed case, which meant it was not in a good
state in time for the first hover.

Closes https://github.com/ppy/osu/issues/18163#issuecomment-1120747301
 2022-05-09 19:49:45 +09:00
Bartłomiej Dach
e7e7486a8e
Merge branch 'mod-overlay/back-button' into mod-overlay/integration 2022-05-07 10:59:30 +02:00
Dean Herbert
c38e97c9ec Add full xmldoc to HoldToConfirmContainer 2022-05-06 14:45:53 +09:00
Dean Herbert
a11771c11b Better encapsulate exposed bindables of HoldToConfirmContainer 2022-05-06 14:45:53 +09:00
Dean Herbert
be960eb092 Move dangerous hold specification to base class 2022-05-06 14:34:31 +09:00
Dean Herbert
0d8e42b941 Merge branch 'master' into exit-multiplayer-is-dangerous 2022-05-06 14:25:18 +09:00
Bartłomiej Dach
a56eab2c47
Extract interface for overlay management 2022-05-05 22:16:55 +02:00
Bartłomiej Dach
1744d7e4f0
Fix new mod select overlay dimming itself 2022-05-05 22:16:54 +02:00
Dean Herbert
2896612c5c Make exiting multiplayer a dangerous operation, requiring hold 2022-05-03 16:06:04 +09:00
Dean Herbert
983eed32fc Reduce complexity of icon container nesting 2022-05-03 14:48:00 +09:00
Dean Herbert
b5ea26f2fa Fix incorrect shear masking on nested textbox 2022-05-03 14:45:17 +09:00
Dean Herbert
bc88c4ee8e Reduce container nesting by one level 2022-05-03 14:34:18 +09:00
Dean Herbert
8e0235392f Inline single-use constants 2022-05-03 14:31:20 +09:00
Dean Herbert
4a56297c1c Add localisation and improve visuals of placeholder text 2022-05-03 14:29:04 +09:00
Dean Herbert
4fb66a812f
Merge branch 'master' into sheared-search-textbox 2022-05-03 14:12:59 +09:00
Dean Herbert
04fb0f5e63
Merge pull request #18063 from GSculerlor/split-searchbox 
Split `SearchTextBox` implementation for reusability
 2022-05-03 14:12:44 +09:00
Ganendra Afrasya
a35502a834 Move implementation to ctor instead of bdl method 2022-05-03 11:33:03 +07:00
Ganendra Afrasya
e03d086305 Inherit SearchTextBox instead 2022-05-03 11:24:48 +07:00
Ganendra Afrasya
a436ff877f Apply review 2022-05-03 11:13:07 +07:00
Ganendra Afrasya
e6fbb19951 Implement new search textbox design 2022-05-03 11:13:07 +07:00
Dean Herbert
faeefc5e18
Merge pull request #16576 from frenzibyte/osu-distance-spacing 
Add "distance spacing" support in editor for osu! ruleset
 2022-05-03 12:15:18 +09:00
Ganendra Afrasya
81be69e72e Update search textbox implementation to use BasicSearchTextBox instead 2022-05-03 06:18:42 +07:00
Ganendra Afrasya
d7919f462c Split SearchTextBox into SearchTextBox and BasicSearchTextBox 2022-05-03 06:18:27 +07:00
Dean Herbert
f9a1d9df56 Reduce scale effect slightly (was feeling too bouncy) 2022-05-02 20:32:33 +09:00
Dean Herbert
55949e8407 Make disabled sheared buttons darker 2022-05-02 20:32:33 +09:00
Dan Balasescu
fc21de8138
Merge pull request #18008 from peppy/add-tutorial 
Add first run "beatmaps" screen
 2022-04-29 13:10:45 +09:00
Dean Herbert
652e022fd6
Merge pull request #17973 from bdach/mod-overlay/dim-columns-offscreen 
Dim offscreen columns on new mod select overlay
 2022-04-29 11:55:27 +09:00
Dean Herbert
a75051cd00 Merge branch 'master' into add-tutorial 2022-04-29 11:25:17 +09:00
Dean Herbert
f300b62877 Add ScrollIntoView method which accepts an offset to allow usage in mod select 2022-04-28 20:03:54 +09:00
Dean Herbert
34457078eb
Merge pull request #18005 from nekodex/fix-missing-sfx 
Fix some missing/incorrect UI SFX
 2022-04-28 19:45:59 +09:00
Dean Herbert
b424d20f26 Fix rounded buttons not allowing custom colour specifications 2022-04-28 19:01:21 +09:00
Salman Ahmed
d052321eee Revert "Fix context menus not working" 
This reverts commit 51aa17eb52.
 2022-04-28 12:11:06 +03:00
Jamie Taylor
37816ebc41
Add audio feedback to SwitchButton checkbox 2022-04-28 17:33:51 +09:00
Salman Ahmed
8880ff16c3
Merge branch 'master' into sheared-button 2022-04-26 13:09:10 +03:00
Dean Herbert
4a370f429e Reorder initialisation of bindable action binding to make more sense 2022-04-26 18:21:46 +09:00
Dean Herbert
52a8f3848d Expose font size and add big button test 2022-04-26 18:14:57 +09:00
Dean Herbert
cd197a9380 Reduce the hover lightening effect slightly 2022-04-26 18:11:03 +09:00
Dean Herbert
4bc4ff179a Add flash effect on click 2022-04-26 18:03:34 +09:00
Dean Herbert
4e260e7410 Fix all buttons gamewide not animating properly on click 
Not sure how or when this happened.
 2022-04-26 17:32:25 +09:00
Dean Herbert
9f33e627de Split out ShearedButton from ShearedToggleButton 2022-04-26 17:31:55 +09:00
Dean Herbert
51aa17eb52 Fix context menus not working 2022-04-24 22:17:38 +09:00
Dean Herbert
83970f009c
Merge branch 'master' into settings-filter-regression-fix-2 2022-04-24 17:40:25 +09:00
Dean Herbert
a40d140353
Merge pull request #17956 from frenzibyte/sections-container-pagination 
Fix page up / down in `SectionsContainer` with fixed header skipping content
 2022-04-24 15:36:35 +09:00
Salman Ahmed
4f8f27a58b Merge branch 'master' into osu-distance-spacing 2022-04-24 05:23:30 +03:00
Salman Ahmed
3700c607d8 Fix sections scroll container not handling fixed header in scrolls 2022-04-24 01:52:13 +03:00
Bartłomiej Dach
e246357b36
Merge branch 'master' into sheared-overlay-container-click-away 2022-04-22 22:26:35 +02:00
Salman Ahmed
0dc3d1041f Revert "Revert "Remove one more unnecessary schedule"" 
This reverts commit 5f3ff51f7e.
 2022-04-22 20:33:34 +03:00
Dean Herbert
5f3ff51f7e Revert "Remove one more unnecessary schedule" 
This reverts commit f282e5b013.
 2022-04-22 21:24:58 +09:00
Dan Balasescu
b1cf917b49
Merge pull request #17823 from peppy/settings-filter-fixes 
Fix incorrect settings state if searching too quickly (during load process)
 2022-04-22 16:38:41 +09:00
Dean Herbert
f282e5b013 Remove one more unnecessary schedule 2022-04-22 15:32:23 +09:00
Bartłomiej Dach
8c6864727e
Merge branch 'master' into first-run-setup 2022-04-21 22:14:57 +02:00
Dean Herbert
832d37b2c2 Update screen transition events to use new event args 2022-04-22 00:52:44 +09:00
Dean Herbert
0f4b40ab15 Add better click-to-dismiss logic for sheared overlays 2022-04-21 16:27:27 +09:00
Dean Herbert
7d8cf1bbb6 Merge branch 'master' into first-run-setup 2022-04-21 15:49:39 +09:00
Joseph Madamba
5e5c8e78a6 Use existing web localisation for most hardcoded strings 2022-04-20 16:31:11 -07:00
Dean Herbert
1032dc235d Rename PopupScreenTitle to ShearedOverlayHeader 2022-04-20 16:01:15 +09:00
Dean Herbert
8d31b0bc01 Split out the base design of sheared overlay into its own abstract class 
This will allow for reuse with the first-run overlay.
 2022-04-20 15:50:16 +09:00
Dean Herbert
1490502d4c Improve overall usability of scale adjust screen 2022-04-19 16:59:04 +09:00
Dean Herbert
043599081b Split out INotificationOverlay to allow for easier testing 2022-04-18 20:14:01 +09:00
Dean Herbert
7582c2a5e8 Remove unnecessary bindable 2022-04-14 19:13:54 +09:00
Dean Herbert
bb4322a4c4 Fix UI scale being applied unevenly, causing elements to move around relative to each other 2022-04-14 19:04:31 +09:00
Dean Herbert
7160a48bab Adjust hold to confirm animation curve to better show intention 2022-04-14 14:11:44 +09:00
Dan Balasescu
d482ab0287 Fix ParticleSpewer outputting NaN in vertices 2022-04-09 22:29:55 +09:00
Bartłomiej Dach
1c7b259f8e
Merge branch 'master' into mod-overlay/sheared-toggle 2022-03-31 22:20:20 +02:00
Bartłomiej Dach
e180db145d
Add constructor argument to facilitate fixed width/autosizing 2022-03-31 22:19:08 +02:00
Bartłomiej Dach
b3896257ca
Move shear amount to constant 2022-03-31 22:09:03 +02:00
Dean Herbert
726b49fdf3 Focus focus not being transferred correctly to parent settings panel on exiting nested panel 
Seemingly harmless schedule delay ommission meant that the textbox may
not be in a state it can handle the incoming focus event. Regressed in
https://github.com/ppy/osu/pull/14345#discussion_r690697501.
 2022-03-31 15:24:21 +09:00
Bartłomiej Dach
3ac0da2da3
Implement sheared toggle button 2022-03-30 22:50:21 +02:00
Dean Herbert
36868dbdb4 Add the ability to override the user setting for hold-to-confirm containers 
Sometimes the user is not right.
 2022-03-21 16:07:27 +09:00
Dean Herbert
b42081dd9b Add DangerousButton for use in popup dialogs 2022-03-21 16:06:45 +09:00
Susko3
ac55fea3c9 Confine the host cursor to area of 'everything' scaling container 2022-03-11 14:04:12 +01:00
Dean Herbert
bd1adaf245
Merge pull request #17115 from frenzibyte/manual-channel-scroll 
Refactor channel scrolling container to handle non-user scrolls
 2022-03-07 11:26:23 +09:00
Dan Balasescu
ba83db0229
Merge pull request #17134 from bdach/mod-overlay/popup-screen-title 
Implement popup screen title component
 2022-03-07 11:03:38 +09:00
Salman Ahmed
e5a6564034
Merge branch 'master' into fix-storyboard-sample-rate 2022-03-07 03:12:40 +03:00
Salman Ahmed
d9be65ea39 Remove no longer necessary CancelUserScroll method 2022-03-06 23:58:06 +03:00
Salman Ahmed
60334046e4 Revert UserTrackingScrollContainer changes 2022-03-06 23:57:51 +03:00
Bartłomiej Dach
54275813b5
Use text flow container in popup screen title 2022-03-06 20:41:31 +01:00
Bartłomiej Dach
df0617f34c
Implement popup screen title component 2022-03-06 16:09:18 +01:00
Bartłomiej Dach
e1eeb9c6bb
Allow tabbing between textboxes in sample point popover 2022-03-06 01:43:56 +01:00
Salman Ahmed
634821e49f Use the term "programmatically" instead 2022-03-06 00:01:45 +03:00
Salman Ahmed
5b3ffb12b7 Refactor channel scrolling container to handle manual scrolls resiliently 2022-03-05 23:27:07 +03:00
Bartłomiej Dach
346cec3577
Merge branch 'add-offset-adjust-tooltip-text' into combine-time-slider-implementation 2022-03-05 14:58:56 +01:00
Dean Herbert
ce51ce49cf Revert changes to GetTooltipText and use TooltipText override directly 2022-03-05 22:46:13 +09:00
Dean Herbert
524b8e02ef Revert "Update all usages of OsuSlider.TooltipText overrides to instead implement GetTooltipText" 
This reverts commit abba49fd8f.
 2022-03-05 22:37:36 +09:00
Dean Herbert
bbc2b36117 Merge branch 'master' into add-offset-adjust-tooltip-text 2022-03-05 22:37:04 +09:00
Jamie Taylor
1e246bf560
Reduce 'cursor-tap' sample playback volume on MouseUp 2022-03-04 20:14:14 +09:00
Dean Herbert
33862fc0db Centralise implementation of slider bars which display millisecond time values 2022-03-04 12:25:19 +09:00
Dean Herbert
7854a0a913 Use double instead of float for UIHoldActivationDelay configuration value 
All times use double, so let's also use double here.
 2022-03-04 12:22:56 +09:00
Dean Herbert
abba49fd8f Update all usages of OsuSlider.TooltipText overrides to instead implement GetTooltipText 2022-03-04 12:16:05 +09:00
Dean Herbert
b0688cc6dd Merge branch 'master' into fix-storyboard-sample-rate 2022-03-04 12:04:49 +09:00
Dean Herbert
5cfa8b8821
Revert back to private set 
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
 2022-03-03 21:31:56 +09:00
Dean Herbert
7ee30024e8 Restructure OsuSliderBar to allow for custom tooltips 2022-03-03 17:07:26 +09:00
Dean Herbert
cb0d643f70 Add parameter xmldoc to explain what a null rect does 2022-03-03 14:38:20 +09:00
Dean Herbert
29bf7d0bde
Fix shocking grammar and typos in block comment 
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2022-03-03 14:35:52 +09:00
Salman Ahmed
cbb8dc2891 Fix storyboard samples rate not adjusted from actual gameplay mods 2022-03-02 20:56:18 +03:00
Dean Herbert
b5684aaa76 Scale -> Rect to read better 2022-03-02 20:33:28 +09:00
Dean Herbert
8d7cdbd883 Add note about nested masking case 2022-03-02 20:25:34 +09:00
Dean Herbert
29ed419d53 Change how custom scales are applied to ScalingContainer to allow for better transitions 2022-03-02 20:13:01 +09:00
Dean Herbert
1916011ebf Tween corner radius when scaling container becomes non-fullscreen 2022-03-02 20:08:12 +09:00
Bartłomiej Dach
cd3641137b
Add OsuColour method mapping colours from basic theme to mod types 2022-02-22 00:02:54 +01:00
Bartłomiej Dach
2592f0900d
Add comments about OverlayColourProvider vs OsuColour distinction 2022-02-20 21:08:58 +01:00
Bartłomiej Dach
e20ae5b871
Add all colour constants for "basic" colour theme to OsuColour 2022-02-20 21:00:49 +01:00
OctopuSSX
08317b4265 Update ScreenshotManager.cs 2022-02-17 20:43:36 +03:00
Dan Balasescu
ea5bb46fb8
Merge branch 'master' into net6 2022-02-16 00:40:04 +09:00
Salman Ahmed
19ee05c232 Add "distance spacing" multiplier for osu! ruleset 
While osu!catch also implements a distance snap grid, it doesn't rely on
`GetBeatSnapDistanceAt` (unlike osu!), therefore it can't have the
"distance spacing" multiplier yet.
 2022-02-15 02:21:53 +03:00
Dean Herbert
b581ca14cc Update usages in line with BorderColour type change 2022-02-15 02:32:38 +09:00
Dean Herbert
e324287f79 Reduce expansion delay on ExpandingButtonContainer 
Felt too long.
 2022-02-14 18:08:17 +09:00
Dean Herbert
3aa5908de8 Remove unused using statement 2022-02-14 18:01:56 +09:00
Dean Herbert
b9d9fc56af Move files to UI namespace 2022-02-14 17:51:39 +09:00
Dean Herbert
d62885f30b
Don't schedule call to updateSize in LoadComplete to ensure following FinishTransforms runs as expected 
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
 2022-02-04 22:31:41 +09:00
Dean Herbert
e2262bf3b2 Schedule all calls to updateSize for safety 2022-02-04 20:33:15 +09:00
Dean Herbert
503025b970 Fix completely incorrect and dangerous usage of bindable binding 2022-02-04 19:19:44 +09:00
Dean Herbert
30d2c7ba6a Add parenthesis to disambiguify conditionals 2022-02-04 17:07:23 +09:00
Dean Herbert
52fdf0349f Add safe area support via ScalingContainer 2022-02-04 16:37:05 +09:00
Bartłomiej Dach
b613aedeb8
Fix menu item width changing when hovered 2022-02-02 21:23:35 +01:00
Jamie Taylor
6e60e68b80
Change from click to mousedown+mouseup and only play when cursor is visible 2022-02-02 14:44:06 +09:00
Jamie Taylor
4d9b61212b
Add 'cursor tap' audio feedback 2022-01-28 18:13:51 +09:00
Dean Herbert
39c9c4985b
Merge branch 'master' into textbox-AllowIme-false 2022-01-18 17:03:51 +09:00
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01:00
Susko3
a0842838e7 Add AllowIme => false where applicable 
Also adds `AllowWordNavigation => false` to password text box.
 2022-01-12 00:15:17 +01:00
Bartłomiej Dach
76d5225bb9
Rewrite storyboard clock management in slightly different way 2022-01-11 22:00:04 +01:00
Bartłomiej Dach
970e0cc85a
Merge branch 'master' into beatmap-background-with-storyboard-stopping 2022-01-11 21:39:49 +01:00
Dan Balasescu
906e700b60 Improve quality of beatmap background blurs 2022-01-11 21:22:16 +09:00
Dean Herbert
2bf6b55b19 Fix failing test due to changed reset page logic 2022-01-05 14:53:32 +09:00
Dean Herbert
5ed69338a6 Add omission of pages when there are too many 2022-01-04 19:05:14 +09:00
Dean Herbert
86f72b71b1 Prepare tests and general structure to support omission of pages 2022-01-04 18:46:44 +09:00
Dean Herbert
e75c9519f3 Adjust font weighting on selection 2022-01-04 18:19:23 +09:00
Dean Herbert
5a11ee7810 Use OverlayColourProvider and fix font weight 2022-01-04 18:14:42 +09:00
Dean Herbert
ee4f5c0e79 Rename button classes to make more sense 2022-01-04 17:52:40 +09:00
Dean Herbert
db58f5de8e Clean up unnecessary complexity 2022-01-04 17:51:37 +09:00
Dean Herbert
1c899e4402 Fix post-merge issues 2022-01-04 16:46:42 +09:00
Dean Herbert
69e7ee0f48
Merge branch 'master' into page-selector 2022-01-04 16:44:22 +09:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Bartłomiej Dach
568cab6808
Add clarification comment about explicit ProcessFrame() call 2021-12-27 21:13:04 +01:00
Bartłomiej Dach
9f8ad9f833
Fix menu background storyboard stopping after track reload 2021-12-27 12:30:53 +01:00
Dan Balasescu
18c144395a Rename to dimColour 2021-12-24 17:03:29 +09:00
Dan Balasescu
f44af1ad69 Move bind to LoadComplete 2021-12-24 17:00:59 +09:00
Dan Balasescu
c973739b08 Fix OsuButton event binding + inital-enablement colour 2021-12-24 11:56:12 +09:00
Dan Balasescu
c8073000c5 Fix initally-disabled OsuAnimatedButton colour fading 2021-12-24 11:56:12 +09:00
Salman Ahmed
9a22a082ca
Merge branch 'master' into master 2021-12-16 16:58:24 +03:00
Dean Herbert
eecb1ce9f5 Avoid applying mouse down effects to menu cursor when it isn't visible 
Closes #16114.
 2021-12-16 20:20:06 +09:00
Dean Herbert
434aa0367f Add back .ToLocalTime() call to DrawableDate 
This is required because the class is used in many other places that
don't locally call it.
 2021-12-16 18:25:29 +09:00
Imad Dodin
b3e83a47a4 Convert to Local Time in Date Tooltip 2021-12-15 21:36:35 -08:00
Susko3
643cee4f83 Merge branch 'master' into number-textbox-only-numbers 2021-12-15 09:13:19 +01:00
Susko3
b326ccc196 Move logic to framework and update all usages 2021-12-15 07:13:24 +01:00
Dean Herbert
8fa73fcbf6 Move helper method to end of class 2021-12-08 18:30:08 +09:00
Susko3
de89e321c8 Add sounds for IME composition 2021-12-08 09:57:53 +01:00
Susko3
af1e97b7c7 Move playing text added samples to private helper and fix it never playing the last sample 
`RNG.Next` is exclusive of the upper bound, meaning that the last sample would never be played.
 2021-12-08 09:49:36 +01:00
ColdVolcano
81215b9f0e Use correct effect points when EarlyActivationMilliseconds is not zero 2021-12-04 22:31:55 -06:00
Dean Herbert
f921acc681 Fix chat tab dropdown not being reachable at default sizing 
Would have liked to fix this in a more local way, but the structure of
the dropdowns is just a pain in the ass to work with, so this will do
for now.
 2021-11-30 13:01:46 +09:00
Dean Herbert
183b95cbc2 Rename BeatmapSetOnlineStatus to BeatmapOnlineStatus 
This variable is used at more than just a set level.
 2021-11-24 18:42:49 +09:00
Dean Herbert
3de8125eac Update UI cases where repeat should not be handled 2021-11-18 13:13:36 +09:00
Bartłomiej Dach
d567d2be97
Fix multiple issues with textbox content display 
- Sometimes would display too many decimal digits due to floating point
  representation errors.

- Placeholder would also look wrong if text was removed during a
  multiple (but determinate) selection.
 2021-11-12 23:32:12 +01:00
Leon Gebler
9000d19c9e Update difficulty colour spectrum 2021-11-12 14:58:18 +01:00
Dean Herbert
6b6dd93e9e Fix LinkFlowContainer not creating user links supporting full IUser specification 2021-11-08 14:17:47 +09:00
Dean Herbert
62600b47b1 Merge branch 'master' into user-class-cleanup 2021-11-08 12:51:12 +09:00
Bartłomiej Dach
6d30248cef
Merge branch 'master' into use-class-rename 2021-11-07 15:41:00 +01:00
Dean Herbert
0ecf5f201c Rename User to APIUser and move to correct namespace 2021-11-07 11:26:01 +09:00
Bartłomiej Dach
6a1c27d67a
Merge branch 'master' into fix-more-null 2021-11-06 15:36:15 +01:00
Salman Ahmed
f013a1e37f Move CreateContent() to BDL 2021-11-05 10:13:42 +03:00
Dean Herbert
6399c695e8 Update usages of BufferedContainer in line with framework changes 2021-11-05 15:54:49 +09:00
Dean Herbert
1f5ca122b0 Merge branch 'master' into user-class-cleanup 2021-11-05 13:55:22 +09:00
Bartłomiej Dach
4c8d6a77be
Fix labelled drawable descriptions not showing 2021-11-04 21:44:08 +01:00
Dean Herbert
86540d1fb6 Update existing usages of Author as string to access Username directly 2021-11-04 18:57:54 +09:00
Dean Herbert
b9983add15 Rename User to APIUser and move to correct namespace 2021-11-04 18:21:31 +09:00
Bartłomiej Dach
11de924704
Use LocalisableStrings where possible to leverage localisable text flow 2021-11-02 21:42:02 +01:00
Bartłomiej Dach
b95c95527e
Accept LocalisableStrings in LinkFlowContainer 2021-11-02 21:42:01 +01:00
Bartłomiej Dach
61f0339c1d
Avoid double-adding chunks in link flow container 2021-10-29 06:34:08 +02:00
Bartłomiej Dach
6f863ca204
Adjust game-side text flow containers to part-based model 2021-10-29 06:34:08 +02:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Dean Herbert
370775af68 Fix some surrounding code formatting 2021-10-26 14:05:07 +09:00
Dean Herbert
53ff0802cb Merge branch 'master' into use-ShowFileInNativeExplorer 2021-10-26 13:58:30 +09:00
Bartłomiej Dach
5ab3337a10
Update beatmap set status pill appearance 2021-10-24 20:40:34 +02:00
Susko3
51c5d0aec7 Update to be in line with framework changes 2021-10-24 13:21:41 +02:00
Susko3
4a425b5c3e Merge remote-tracking branch 'upstream/master' into use-ShowFileInNativeExplorer 2021-10-23 10:01:24 +02:00
Dean Herbert
7bc8f5cd5c Change selection colour to also match the colour provider scheme 2021-10-21 13:01:13 +09:00
Bartłomiej Dach
1ec881ce1d
Recolour focused text box variant 2021-10-20 22:49:25 +02:00
Bartłomiej Dach
addcef4f5d
Recolour text box using OverlayColourProvider 2021-10-20 22:49:25 +02:00
Dean Herbert
4b2eb7736c Move helper method to bottom of file 2021-10-20 12:52:38 +09:00
Bartłomiej Dach
f29eb08d93
Improve contrast in default OverlayColourProvider-themed appearance 2021-10-19 22:55:49 +02:00
Bartłomiej Dach
61127a389c
Fix tab dropdown receiving accent colour too early 2021-10-19 22:09:51 +02:00
Bartłomiej Dach
ef03787fe0
Split dropdown accent colour into hover and selection colours 2021-10-19 22:09:51 +02:00
Bartłomiej Dach
818f35c35f
Restyle default value indicator 2021-10-17 21:50:03 +02:00
Susko3
25f172fae8 Update usages of OpenInNativeExplorer to use ShowFileInNativeExplorer 
Also updates WrappedStorage to override ShowFileInNativeExplorer.
 2021-10-17 12:56:29 +02:00
Dan Balasescu
1e15b5a5a0
Merge pull request #15113 from peppy/rounded-button-colour-provider 
Change `RoundedButton` to source from overlay colour provider
 2021-10-15 13:52:52 +09:00
Dean Herbert
7ab028576e Change RoundedButton to source from overlay colour provider 2021-10-15 12:54:19 +09:00
Dean Herbert
f73e505ee6 Further adjustments to glow to be less bright on settings overlay 2021-10-15 12:35:19 +09:00
Dean Herbert
e1ac5fbed9 Remove externally exposed Expanded state and change behaviour and visuals surrounding it 2021-10-15 12:13:42 +09:00
Dean Herbert
35d776078c Ensure sliderbar nub stays glowing while dragging an adjustment 2021-10-15 11:51:08 +09:00
Dean Herbert
be3b88a5c3 Adjust glow to look good 2021-10-15 11:48:19 +09:00
Bartłomiej Dach
a10a7e7903
Refresh nub/slider appearance and use overlay theming 2021-10-15 00:31:05 +02:00
Dean Herbert
b1fc870130 Adjust item selection and chevron animation slightly 2021-10-14 13:34:08 +09:00
Bartłomiej Dach
d8450a7375
Recolour "slim dropdown" in online lounge screens 2021-10-13 22:57:37 +02:00
Bartłomiej Dach
d067159435
Recolour elements of editor setup screen to match dropdown theming 2021-10-13 22:32:54 +02:00
Bartłomiej Dach
a6c2848460
Fix hovered dropdown item chevron not using OverlayColourProvider 2021-10-13 22:08:23 +02:00
Bartłomiej Dach
7e7b747755
Always use OverlayColourProvider in scroll containers if available 2021-10-13 22:05:48 +02:00
Bartłomiej Dach
d4e3460912
Always use OverlayColourProvider in dropdowns if available 2021-10-13 22:04:48 +02:00
Bartłomiej Dach
d205483a36
Revert ThemedDropdown-related changes 2021-10-13 21:57:50 +02:00
Bartłomiej Dach
7c5bd2db7b
Allow using ThemedDropdown even if OverlayColourProvider not available 
This is to accommodate `SettingsDropdown` usages without an available
`OverlayColourProvider`, such as mod settings controls and tournament
client usages.
 2021-10-12 23:12:16 +02:00
Bartłomiej Dach
7139c832b0
Add support for changing scrollbar accent colour & use in themed dropdown 2021-10-12 22:20:07 +02:00
Bartłomiej Dach
a2f3a7cba8
Add "themed" dropdown variant and use in settings sidebar 2021-10-12 21:58:43 +02:00
Bartłomiej Dach
5ddb7f74e2
Adjust default dropdown dimensions & spacings 2021-10-12 21:41:29 +02:00
Dean Herbert
e982f485c7 Remove drop shadow from RoundedButton 
As per @arflyte's spec, this should not have been there in the first
place.
 2021-10-12 13:17:49 +09:00
Dan Balasescu
696193198a
Merge pull request #15049 from bdach/settings-panel-rounded-buttons 
Update appearance of buttons in settings sidebar
 2021-10-12 09:32:52 +09:00
Bartłomiej Dach
b30dd2d4ed
Use rounded button in settings sidebar 2021-10-10 21:45:41 +02:00
Bartłomiej Dach
21ee24ea6d
Add rounded button variant 2021-10-10 21:45:41 +02:00
Dean Herbert
794b4c46cf Split score counter class into two distinct classes to simplify usages 2021-10-10 17:56:32 +09:00
Dean Herbert
06cce0119c Use localisable format string for comma separator mode 2021-10-10 17:41:16 +09:00
Dean Herbert
49a878dc20 Fix comma separator support not actually working 2021-10-10 16:06:05 +09:00
Dean Herbert
676df55a0e Fade display out during rewind (as the value displayed is no longer valid) 2021-10-05 15:39:29 +09:00
smoogipoo
031c5a441e Merge branch 'master' into realtime-pp-display 2021-10-04 20:19:37 +09:00
Dean Herbert
5aaafce597 Make AuthenticateWithLogin throw instead of return a bool success status 2021-10-04 15:40:00 +09:00
Bartłomiej Dach
86240cc8ec
Add alternate Torus font 2021-10-03 23:36:39 +02:00
smoogipoo
98badd644f Add xmldocs 2021-10-01 20:09:39 +09:00
smoogipoo
d2a8f35b4c Update styling 2021-09-30 17:54:52 +09:00
Joseph Madamba
9b9c30c8a1 Fix text overflowing on dropdown headers 2021-09-24 22:04:45 -07:00
smoogipoo
6246bbc262 Also add to ParticleExplosion 2021-09-21 14:37:09 +09:00
smoogipoo
bad3f0b1e9 Disable FtB pass for particle spewer 2021-09-21 14:25:44 +09:00
Opelkuh
9c90dd539f Use Interpolation.Lerp 2021-09-19 15:06:15 +02:00
Opelkuh
0b593fac5c Scope down DrawNode's source parameter 2021-09-19 14:49:09 +02:00
Opelkuh
d5a10e9221 Fix particles not spawning if Time.Current is negative 2021-09-19 14:47:20 +02:00
Opelkuh
761da45f6a Revert af4c3727d77a16e2534df9bbf452336b5c544342 2021-09-19 14:00:56 +02:00
Opelkuh
1d7d779f66 Merge branch 'master' into add-legacy-star-particles 2021-09-19 04:34:35 +02:00
Opelkuh
3f8454cb76 Remove abstract from ParticleSpewer 2021-09-19 03:19:16 +02:00
Opelkuh
ef530ed87c Normalize particle velocity based on max duration 2021-09-18 23:45:58 +02:00
Opelkuh
846cde53b3 Add RelativePositionAxes support 2021-09-18 22:54:12 +02:00
Dean Herbert
6b43e955be Merge branch 'limit-max-triangles' into update-framework 2021-09-16 22:49:50 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
Dean Herbert
9127a706ac Use private for internally used property 2021-09-16 16:54:56 +09:00
Dean Herbert
2df4073946 SpawnParticle -> CreateParticle (and set time outside of virtual call) 
Allows easier overriding (no need to call the `base.CreateParticle` call
and worry about overwriting the time value.
 2021-09-16 16:52:46 +09:00
Dean Herbert
07fec268c0 Limit maximum triangles to avoid GL buffer overflow 2021-09-15 18:32:59 +09:00
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling 2021-09-14 22:58:20 +02:00
Dean Herbert
e17b800470 Move shake logic into extension method 2021-09-14 14:44:23 +09:00
Opelkuh
9fd616c578 Tiny refactor 2021-09-14 00:16:42 +02:00
Opelkuh
224244801f Remove Particles namespace 2021-09-13 21:44:27 +02:00
Opelkuh
cfcb46034c Remove ParticleJet 2021-09-13 21:44:23 +02:00
Opelkuh
99eff4f41f Move cursor particles under OsuCursorContainer 2021-09-13 21:44:22 +02:00
Opelkuh
c2f7b01ca4 Change particle AngularVelocity into StartAngle and EndAngle 2021-09-13 21:44:21 +02:00
Opelkuh
6d68da8ff0 Remove StartScale from ParticleSpewer particles 2021-09-13 21:44:20 +02:00
Opelkuh
db662f8c5c Add ParticleParent option to ParticleSpewer 2021-09-13 21:44:20 +02:00
Opelkuh
328c9a5dd0 Change ParticleSpewer.Active to a Bindable 2021-09-13 21:44:18 +02:00
Opelkuh
4c753420d3 Fix ParticleSpewer gravity calculation 2021-09-13 21:44:17 +02:00
Opelkuh
714cf33aac Change ParticleSpewer to use screen space 2021-09-13 21:44:17 +02:00
Opelkuh
1a60ce164e Add ParticleJet 2021-09-13 21:44:16 +02:00
AbstractQbit
9c1fc2ec65 Tweak filled nub border width value 2021-09-13 14:19:33 +03:00
Dean Herbert
4d2373ffb9 Combine similar value changed calls 2021-09-13 20:08:46 +09:00
AbstractQbit
0f5ed81a7a Fix dimmed checked nub artifact 
This adds transition that extends nub's border to fill it.
Fill fade can be removed, but combined effect looks nicer imo,
and the fill is still needed because if removed, border
becomes invisible for some reason.
 2021-09-13 13:31:13 +03:00
sh0ckR6
e018071be4
Remove OnShakeFinish event 2021-09-11 19:50:41 -04:00
Bartłomiej Dach
addba43e7d
Merge branch 'master' into fix-password-popover-back-button 2021-09-11 14:18:25 +02:00
Bartłomiej Dach
0e5659acb2
Remove leftover exception throw 2021-09-11 14:10:29 +02:00
Dean Herbert
344bf2ab7c Allow popovers to be closed via back button press 
Closes https://github.com/ppy/osu/issues/14669.
 2021-09-10 02:15:37 +09:00
Dean Herbert
c101d1f205 Fix beatmap listing overlay not hiding via keyboard control when scrolled 
Closes https://github.com/ppy/osu/issues/14684.
 2021-09-10 01:57:57 +09:00
ekrctb
9637326f0c Allow customizing link style by override in LinkFlowContainer 2021-09-08 15:52:54 +09:00
sh0ckR6
b1f91596a7
Give user feedback on password attempt fail 
Shake the popover
Set the input box's color to red and set the placeholder text to "incorrect password"
 2021-09-07 20:05:24 -04:00
Dean Herbert
ab1c64591f Move sample playback debounce time to central const 2021-09-05 13:25:10 +09:00
Dean Herbert
1d23ac0f2d Initial clean up pass on notification logic 2021-09-05 12:54:21 +09:00
Dean Herbert
f0b128b6ec
Merge pull request #14592 from frenzibyte/cleanup-tooltips 
Update remaining tooltip implementations to use generics
 2021-09-01 17:03:59 +09:00
Bartłomiej Dach
1e4fa87648
Merge branch 'master' into setup-screen-countdown-settings 2021-08-31 22:43:18 +02:00
Bartłomiej Dach
b969398e2d
Merge branch 'master' into adjust-triangle-speed 2021-08-31 20:44:09 +02:00
Salman Ahmed
da7ff4b160 Update remaining tooltip implementations to use generics 2021-08-31 20:01:13 +03:00
Dean Herbert
529a9a6ff8 Adjust minimum triangle movement speed to avoid "static" triangles in logo 
Closes #14584.
 2021-08-31 14:08:23 +09:00
Bartłomiej Dach
48e56adcfe
Add labelled number box control 2021-08-30 21:52:24 +02:00