1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

3010 Commits

Author SHA1 Message Date
Dean Herbert
106f1cf90b Merge branch 'master' into combo-colour-brightness-limit 2022-11-11 18:24:39 +09:00
Dan Balasescu
db25e9e9c8 Merge branch 'master' into combo-colour-brightness-limit 2022-11-11 15:31:28 +09:00
Bartłomiej Dach
63270c8619
Merge branch 'master' into improve-ui-control-sound-sync 2022-11-11 05:50:28 +01:00
Dean Herbert
b166e477c2
Merge branch 'master' into editor-background 2022-11-08 17:18:34 +09:00
Salman Ahmed
7ee9018a94 Always display menu cursor when game is not focused 2022-11-08 03:18:12 +03:00
maromalo
b7ef9b176d Make score type consistent 2022-11-06 19:59:27 -03:00
Dean Herbert
e7b543de2f Move disabled check to apply to all calls to updateGlow() 2022-11-07 02:19:13 +09:00
Dean Herbert
700f8b0469
Remove pointless nested if conditional
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-11-07 02:13:04 +09:00
Dean Herbert
75bf023f14 Fix HSPAColour.ToColour not being pure 2022-11-06 23:35:51 +09:00
Bartłomiej Dach
84179fb087
Merge branch 'master' into combo-colour-brightness-limit 2022-11-05 16:48:56 +01:00
Dean Herbert
78bb940e6c Don't play hover sounds on disabled elements 2022-11-04 19:06:08 +09:00
Dean Herbert
0e350f52f5 Fix SliderBar disabled value potentially not transferring to hover sounds 2022-11-04 19:06:08 +09:00
Dean Herbert
a2fdad4afc Fix slider updating glow when disabled 2022-11-04 19:06:08 +09:00
Dean Herbert
a16540dc6d Update Nub hover animation to better suit immediacy of sound effects 2022-11-04 19:06:08 +09:00
Dean Herbert
8b58475ee0 Update OsuButton hover animation to better suit immediacy of sound effects 2022-11-04 18:51:09 +09:00
Dean Herbert
4bbff99f31 Remove unnecessary fade in SeasonalBackground 2022-11-04 17:45:14 +09:00
Dean Herbert
f6c376c090 Minor refactoring 2022-11-03 20:29:27 +09:00
Jamie Taylor
59bbd9c460
Fix some components using wrong sample set 2022-11-03 17:47:49 +09:00
Jamie Taylor
f1c17129eb
Add support for 'disabled' sample variation to HoverClickSounds 2022-11-03 17:47:49 +09:00
Dean Herbert
0e502de8b4 Rename field to match usage 2022-11-02 18:04:42 +09:00
Dean Herbert
c3eb0c6330 Merge branch 'master' into editor-background 2022-11-02 17:43:38 +09:00
cdwcgt
d6b8439121
add xmldoc for DimAmount 2022-11-02 15:11:49 +09:00
cdwcgt
df1f7e2b13
remove #nullable disable 2022-11-02 15:09:40 +09:00
Dean Herbert
a01602e63c Merge branch 'master' into combo-colour-brightness-limit 2022-11-02 12:09:27 +09:00
Dean Herbert
27af91003b Merge branch 'master' into combo-colour-brightness-limit 2022-11-01 17:50:26 +09:00
Dean Herbert
d15585153d Fix breadcrumb display in directory selector overlapping new "show hidden" button
Closes #21034.
2022-11-01 17:07:59 +09:00
Dean Herbert
f9d2c30c3e Add user toggle for application of safe areas 2022-10-28 14:05:45 +09:00
cdwcgt
f9c6190426
Add DimAmount for UserDimContainer 2022-10-25 13:00:53 +09:00
Dean Herbert
247cf589aa
Merge branch 'master' into directoryselector-hidden-toggle 2022-10-24 15:33:10 +09:00
Dean Herbert
447d420c99 Fix adjusting volume via settings playing tick samples twice 2022-10-21 21:03:39 +09:00
Jamie Taylor
7b1edff2b3
Add unique hover/select samples to settings sidebar buttons 2022-10-21 18:06:38 +09:00
Salman Ahmed
39650717ea Improve input detection to not make cursor flicker on combined input 2022-10-20 03:45:25 +03:00
Salman Ahmed
4bf4938b72 Keep cursor hiding feature to gameplay screens for now 2022-10-20 03:44:58 +03:00
Bartłomiej Dach
d0a495717e
Merge branch 'master' into comment-copy-link 2022-10-16 19:56:06 +02:00
Salman Ahmed
06e6713237 Move mouse input detection inside MenuCursorContainer to allow testing 2022-10-15 00:20:22 +03:00
Dan Balasescu
15db65c037 Extract to struct, add dictionary term 2022-10-14 14:12:53 +09:00
Dan Balasescu
b43bae122c Fix incorrect porting of code 2022-10-14 13:46:25 +09:00
ansel
295e6f5a68 Move toast to it's namespace 2022-10-13 23:57:25 +03:00
ansel
e97dbf3dbc Move copy toast to its own file 2022-10-13 22:12:32 +03:00
Dan Balasescu
4149235e63 Limit minimum brightness of combo colours 2022-10-13 14:05:33 +09:00
Dean Herbert
e240f659c2 Refactor visibility states to read better 2022-10-13 11:22:40 +09:00
Salman Ahmed
6199db11a2 Make OsuUserInputManager dependency nullable for tournament client 2022-10-12 17:55:32 +03:00
Salman Ahmed
a44cfe2901 Hide menu cursor when user is idle 2022-10-12 17:50:31 +03:00
Salman Ahmed
8305d886e6 Refactor internal visibility logic to route back to PopIn/PopOut 2022-10-12 17:50:04 +03:00
Salman Ahmed
0a97ee71a9 Hide menu cursor when non-mouse input is applied 2022-10-11 16:23:51 +03:00
Salman Ahmed
60c92c8744 Enable NRT on MenuCursorContainer 2022-10-11 16:23:51 +03:00
Salman Ahmed
9b45a9cf76 Rename various cursor symbols
- `IProvideCursor.MenuCursor` -> `IProvideCursor.Cursor`
 - `MenuCursor` -> `MenuCursorContainer
2022-10-11 16:21:01 +03:00
Dean Herbert
d700040a0d Make country code parsing resilient to invalid cases 2022-10-11 01:39:53 +09:00
Salman Ahmed
a9aba74351 Add markdown country flag support 2022-10-08 21:50:25 +03:00
Salman Ahmed
098a56a784 Add custom container extension support 2022-10-08 21:25:11 +03:00
Salman Ahmed
5e4e3dfc2c Fix markdown container not rendering certain text correctly 2022-09-10 02:55:20 +03:00
Dean Herbert
648c6245bb Add xmldoc 2022-09-09 17:40:03 +09:00
Dean Herbert
27f745b980
Merge branch 'master' into fix_progress_bar_info 2022-09-09 17:34:13 +09:00
Dean Herbert
096d1c3ff3
Merge pull request #20143 from acid-chicken/feat/stats/colored-td
Show judgement colours in hit distribution graph
2022-09-08 19:15:40 +09:00
Acid Chicken (硫酸鶏)
267465df18
chore(osu.Game): combine Osu.Colour.{Draw,Text}ForHitResult into OsuColour.ForHitResult 2022-09-07 23:34:46 +09:00
Jamie Taylor
cb1d886c9c
Add audio feedback for Esc/Back clearing text from a FocusedTextBox 2022-09-07 13:17:04 +09:00
Dean Herbert
2bec8b82b3 Fix textbox sample playback potentially crashing if called before load 2022-09-05 16:26:41 +09:00
Acid Chicken (硫酸鶏)
5f0832ead7
refactor(osu.Game): separate OsuColour.ForHitResult by usage 2022-09-05 01:58:57 +09:00
Salman Ahmed
778d767a12 Revert disposal on SectionsContainer properties 2022-09-03 15:02:57 +03:00
Dean Herbert
bc5340e33a
Merge branch 'master' into fix_progress_bar_info 2022-09-02 18:00:35 +09:00
HiddenNode
7a8fa5c2e4 Fix filenames mismatch 2022-09-02 09:56:00 +01:00
Dean Herbert
8c50ccc48e Fix incorrect specification in SectionsContainer 2022-09-02 16:37:39 +09:00
Dean Herbert
6a35b233e5 Merge branch 'master' into remove-dispose-updates 2022-09-01 23:03:19 +09:00
Dean Herbert
8866250cff Fix seasonal background not being unloaded when changing setting to "Never"
Closes #20065.
2022-09-01 21:42:40 +09:00
HiddenNode
4a630b5384 Implemented SizePreservingSpriteText 2022-08-31 22:05:06 +01:00
HiddenNode
eb02a9a144 Removed GrowToFItContainer 2022-08-31 22:04:28 +01:00
Jamie Taylor
212d76a11f
Add audio feedback for invalid textbox input 2022-08-31 17:31:36 +09:00
Jamie Taylor
cc9dc604a0
Refactor feedback sample playback logic 2022-08-31 17:29:57 +09:00
HiddenNode
cda7faecf7 Added GrowToFitContent Parameter. 2022-08-29 22:01:24 +01:00
Dean Herbert
105aa01e7d Update usages of RemoveInternal 2022-08-29 15:57:40 +09:00
Dean Herbert
a215d009fe Update Remove/RemoveRange/RemoveAll calls in line with framework changes 2022-08-29 15:57:40 +09:00
HiddenNode
62210bce4e Fixed issues found in UprightAspectMaintainingContainer 2022-08-29 00:08:19 +01:00
Dean Herbert
470bec7949 Move private method down 2022-08-26 23:29:03 +09:00
HiddenNode
24edffcbc4 Moved ScaleMode to UprightAspectMaintainingContainer.cs 2022-08-26 12:47:12 +01:00
Dean Herbert
d6359b00ad Fix filename mismatch 2022-08-26 19:20:36 +09:00
Dean Herbert
2c780eab5f Merge branch 'master' into fix_progress_bar_info 2022-08-26 16:14:21 +09:00
Dean Herbert
a40355186a Tidy up constructor field initialisation 2022-08-26 16:00:20 +09:00
Dean Herbert
23efec6505 Fix naming and comment typos 2022-08-26 15:57:36 +09:00
HiddenNode
29f3724047 Changed UprightUnscaledContainer to UprightUnstretchedContainer. 2022-08-26 01:28:57 +01:00
Dean Herbert
510d9ac79f Merge branch 'master' into text-selection-sfx 2022-08-25 19:18:14 +09:00
Jamie Taylor
da7f8270da
Fix incorrect cast 2022-08-24 22:31:28 +09:00
Jamie Taylor
dc829334a1
Update for framework-side changes. 2022-08-24 22:19:32 +09:00
HiddenNode
1098e24c40 Improved UprightUnscaledContainer 2022-08-22 14:24:52 +01:00
Jamie Taylor
41408a3106
Add audio feedback for text selection 2022-08-19 15:51:27 +09:00
its5Q
2499b7f0cd Add localisation support for beatmap editor setup 2022-08-11 03:53:20 +10:00
Dan Balasescu
efc4a129d9
Merge pull request #19658 from peppy/user-button-better-display
Display connecting / failing states on toolbar user display
2022-08-09 17:59:28 +09:00
Dan Balasescu
d80db2aee7
Merge pull request #19639 from peppy/fix-fps-damping
Fix incorrect FPS damping implementation
2022-08-09 17:03:55 +09:00
Dean Herbert
4da9482a3e Add ability for loading layer to not block input 2022-08-09 15:51:11 +09:00
Dean Herbert
c7313ac371 Allow LoadingLayer's spinning circle to scale smaller than before 2022-08-09 15:34:11 +09:00
Dean Herbert
4f7d63be29 Ignore very long periods of no frame drawing when showing FPS counter ms value 2022-08-08 15:21:49 +09:00
Dean Herbert
81c079c937 Fix incorrect damping implementation
I'm not sure what I was thinking with the weighting stuff. It wasn't
correct. Can most easily be noticed if suspending the app on iOS for a
considerable period, or pausing debugger.
2022-08-08 15:21:49 +09:00
its5Q
68e7000620 Fix FPS counter disappearing when hovered over 2022-08-08 15:52:47 +10:00
Dean Herbert
e1189da824 Merge branch 'master' into irenderer-glwrapper 2022-08-08 12:31:53 +09:00
HiddenNode
cfd07cb366 Set InvalidationSource to parent and clean up 2022-08-07 15:04:11 +01:00
HiddenNode
0bfa6fa975 Implement UprightUnscaledContainer 2022-08-07 13:18:29 +01:00
HiddenNode
0243f8d6ac Clean up 2022-08-05 14:28:15 +01:00
Dan Balasescu
cf362a6b4f
Merge pull request #19529 from peppy/locally-modified-pill
Show "locally modified" pill when local modifications have been made
2022-08-05 21:12:13 +09:00
HiddenNode
8618d9ea0d Implement GrowToFitContainer 2022-08-05 12:55:41 +01:00
Dan Balasescu
802dc90cb1 Adjust using directives for vertices 2022-08-05 20:37:33 +09:00
Dan Balasescu
c4b9b2a14b Merge branch 'master' into irenderer-glwrapper 2022-08-05 20:35:06 +09:00
Bartłomiej Dach
ac9321204c
Merge branch 'master' into mod-overlay/create-preset 2022-08-03 21:21:52 +02:00
Dean Herbert
a32149fda1 Convert interface methods to extension methods 2022-08-03 20:07:55 +09:00
Dean Herbert
16ff8d5c38 Use different variable source 2022-08-03 17:47:32 +09:00
Dan Balasescu
9306dd5e30 Apply changes from removal of GLWrapper 2022-08-03 15:02:22 +09:00
Bartłomiej Dach
085080576a
Add button for creating new mod presets 2022-08-02 22:03:32 +02:00
Dan Balasescu
b4e55f7309 Apply IRenderer changes 2022-08-02 19:50:57 +09:00
Dan Balasescu
a2a913ab52 Merge branch 'irenderer-batches' into irenderer-textures 2022-08-02 19:25:08 +09:00
Dean Herbert
258ad7c6b9 Tidy up kiai time access 2022-08-02 18:18:40 +09:00
Dean Herbert
cc4cde2c79 Improve IBeatSyncProvider interface and reduce beatmap track dependence 2022-08-02 17:59:18 +09:00
Dean Herbert
34ffc51c51 Avoid clearing chat overlay textbox when pressing "back" key binding
Generally this is expected behaviour for usages of focused text boxes
(ie. to clear search content), but not so much here.

Addresses https://github.com/ppy/osu/discussions/19403#discussioncomment-3230395.
2022-08-02 13:56:03 +09:00
Bartłomiej Dach
298efa5391
Fix broken ShearedButton autosizing logic 2022-08-01 22:04:16 +02:00
Dean Herbert
0fcae08d38 Show "locally modified" pill when local modifications have been made 2022-08-02 00:52:38 +09:00
Dan Balasescu
09979d44aa Apply DrawNode batching changes 2022-07-29 23:32:09 +09:00
Dan Balasescu
155dac55d0 Apply DrawNode parameter changes 2022-07-29 22:33:34 +09:00
Dean Herbert
f44a4c8652 Reorder file content to match expectations 2022-07-28 12:13:47 +09:00
Dean Herbert
f01c397220 Apply nullability 2022-07-28 12:12:46 +09:00
Andrew Hong
f097064eea Adjust to reviews 2022-07-27 21:52:38 -04:00
Andrew Hong
ac39d3a142 "Copied URL" -> "URL copied" 2022-07-27 21:52:28 -04:00
Andrew Hong
2d4655f61e Add Toast Notification to Copy URL 2022-07-27 02:25:40 -04:00
Dean Herbert
c30e8047ab
Merge pull request #19375 from novialriptide/contextmenu-external-beatmap
Add ContextMenu to beatmap external link
2022-07-26 19:06:10 +09:00
Andrew Hong
aaf6ec05bb Remove notification upon copy 2022-07-26 04:19:54 -04:00
Dean Herbert
ef10145d6f Rename MenuCursorContainer and clean up code 2022-07-26 14:11:52 +09:00
Dean Herbert
ee0c67e114 Add ability to make cursor show even during touch input
I completely disagree with this from a UX perspective, but it's come up
so often that I figure we should just let users bone themselves.
2022-07-26 14:08:00 +09:00
Andrew Hong
a8e315abf0 Refactor 2022-07-25 17:16:33 -04:00
Andrew Hong
46c4e78477 Add notification and another menuitem 2022-07-25 16:59:00 -04:00
Andrew Hong
f1534da683 Formatting issues 2022-07-25 04:13:05 -04:00
Andrew Hong
fcf767e28b Add contextmenu to beatmap external link 2022-07-25 04:07:33 -04:00
Dean Herbert
2dd99ef1fd Refactor FPSCounter to not use scheduled tasks
While on the surface this looks harmless (ignoring allocations),
`Scheduler` doesn't clear cancelled tasks until they reach their
execution time. This can cause an increase in time spent processing the
scheduler itself.

I don't think a per-frame updating component should use scheduled tasks
in this way in the first place, so I've just rewritten the logic to
avoid that overhead altogether.
2022-07-25 16:26:48 +09:00
Salman Ahmed
4332e6cae9 Fix OsuSliderBar throwing on negative draw width 2022-07-24 08:34:24 +03:00
Dean Herbert
b9f5074c13 Merge branch 'fps-counter-no-rolling-counter' into fps-counter-cleanup 2022-07-22 02:22:01 +09:00
Dean Herbert
0eeafea500 Increase responsiveness to change slightly 2022-07-21 23:37:32 +09:00
Dean Herbert
c140601c2d Cleanup pass on FPSCounter 2022-07-21 23:02:31 +09:00
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