1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-29 17:32:56 +08:00
Commit Graph

53703 Commits

Author SHA1 Message Date
vun
7d4593eb6d Fix comments 2022-07-22 18:20:35 +08:00
vun
17d418d319 Merge remote-tracking branch 'ppy/master' into colour-encoding-2 2022-07-22 16:31:28 +08:00
vun
6359c1a4fe Fix outdated comment 2022-07-22 16:31:19 +08:00
Dan Balasescu
1d69090301
Merge pull request from frenzibyte/filter-control-available-area
Fix sorting mode not filling up to usable area in filter control
2022-07-22 17:20:40 +09:00
Dan Balasescu
83f696e757
Merge pull request from peppy/fps-counter-cleanup
Cleanup pass on `FPSCounter`
2022-07-22 17:20:32 +09:00
Dean Herbert
72916d708c
Merge pull request from peppy/fix-timeline-feedback-loop
Fix timeline `alt`+`scroll` zoom not correctly zooming to current mouse position
2022-07-22 16:05:38 +09:00
Dean Herbert
e20458421a Update flaky timeline zoom test to output something useful 2022-07-22 16:05:20 +09:00
Dean Herbert
be0d73f951
Merge branch 'master' into fps-counter-cleanup 2022-07-22 15:39:37 +09:00
Dean Herbert
1774a96455
Merge pull request from Cwazywierdo/timeline-relative-zoom
Make editor timeline zoom relative to song length
2022-07-22 15:37:47 +09:00
Dan Balasescu
5444ce0cc9
Merge pull request from peppy/fps-counter-no-rolling-counter
Avoid using `RollingCounter` in fps counter
2022-07-22 15:28:13 +09:00
Dean Herbert
6eb42d08ce Fix timeline zoom receiving feedback from bindable changes
This causes the focal point zooming to not work (as the focal point is
lost). There's no need to handle ongoing changes to
`BeatmapInfo.TimelineZoom` because it is not a property which is changed
at runtime.
2022-07-22 15:25:57 +09:00
Salman Ahmed
3b913bb9ad Fix sorting mode not filling up to usable area in filter control 2022-07-22 09:15:48 +03:00
Dean Herbert
4cec9a085a Combine both calls to use same pathway 2022-07-22 14:59:20 +09:00
Dan Balasescu
f87efae115
Merge pull request from peppy/skin-editor-save-hotkey
Add the ability to save in the skin editor using system save hotkey
2022-07-22 14:43:34 +09:00
Dean Herbert
de966c2ba1
Merge pull request from LukynkaCZE/editor-save-toast
DIsplay toasts on beatmap/skin save
2022-07-22 14:06:30 +09:00
Dean Herbert
f713253d1b Fix formatting inconsistencies in empty ctors 2022-07-22 14:00:29 +09:00
Dean Herbert
92f59ce9a0 Add the ability to save in the skin editor using system save hotkey 2022-07-22 13:10:18 +09:00
vun
4433f902ea Fix and add comments 2022-07-22 10:49:53 +08:00
LukynkaCZE
ed94d7fce8 Fix requested changes 2022-07-22 02:46:17 +02:00
Adam Baker
997fe00cdc Fix zoom delta math 2022-07-21 17:29:13 -05:00
Adam Baker
d69dc457ba Extract zoom delta method 2022-07-21 17:28:43 -05:00
LukynkaCZE
ebe386c288
Merge branch 'ppy:master' into editor-save-toast 2022-07-22 00:25:23 +02: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
Adam Baker
a4f071fe53 Make zoom sensitivity relative to containers max zoom 2022-07-21 08:26:48 -05:00
Dean Herbert
5db4d9437a Add missing using statement 2022-07-21 21:39:24 +09:00
Dan Balasescu
6fac34c721
Merge pull request from peppy/fix-fps-counter-fps-inaccuracy
Fix draw FPS being inaccurate due to using `ElapsedFrameTime`
2022-07-21 20:55:14 +09:00
Dan Balasescu
2001d79bb2
Merge pull request from peppy/fix-update-button-test-failure
Fix `UpdateBeatmapSetButton` intermittent test failure
2022-07-21 20:36:00 +09:00
vun
e4086b058b Implement stateless colour evaluator and required encoding changes 2022-07-21 19:15:22 +08:00
Salman Ahmed
2987ab6ff7
Merge pull request from peppy/fix-fps-counter-width-calculation
Fix FPS counter not being wide enough to show large fps numbers
2022-07-21 13:31:16 +03: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
Salman Ahmed
559254db31
Merge branch 'master' into fix-update-button-test-failure 2022-07-21 11:15:43 +03:00
Salman Ahmed
8f2287b968
Merge pull request from peppy/change-carousel-item-terminology
Change carousel terminology to not use `Children` / `InternalChildren`
2022-07-21 11:11:01 +03:00
vun
7917a60e3c Move TaikoDifficultyHitObject creation back to TaikoDifficultyCalculator 2022-07-21 15:45:03 +08:00
Salman Ahmed
aa7c16ee5f
Merge branch 'master' into change-carousel-item-terminology 2022-07-21 10:29:13 +03:00
Dan Balasescu
defadeef47
Merge pull request from peppy/fps-counter
Add game-side FPS counter
2022-07-21 16:26:38 +09:00
Dean Herbert
fc0c9f76bd Fix UpdateBeatmapSetButton intermittent test failure
Carousel would only expire items when off-screen. This meant that for a
case (like a test) where items are generally always on-screen,
`UpdateBeatmapSet` calls would result in panels remaining hidden but not
cleaned up.
2022-07-21 16:24:48 +09:00
Dean Herbert
3cfe624af1 Fix one more missed method with incorrect terminology 2022-07-21 16:16:41 +09:00
Dean Herbert
a05d7f4d8c Change carousel terminology to not use Children / InternalChildren 2022-07-21 16:06:06 +09:00
Dean Herbert
55bde4eeb0
Merge pull request from TacoGuyAT/triangles-animation-tweaks
Increase responsiveness of osu! logo triangles to the beat
2022-07-21 15:40:38 +09:00
Salman Ahmed
b72e868b5f
Merge branch 'master' into triangles-animation-tweaks 2022-07-21 09:10:16 +03:00
Dan Balasescu
611c6d5425
Merge pull request from frenzibyte/fix-changelog-overlay
Fix changelog overlay tests failing due to missing `CreatedAt` date
2022-07-21 14:44:59 +09:00
Dean Herbert
07e1763a70 Tweak velocity a bit more (and simplify in multiple places) 2022-07-21 14:25:11 +09:00
TacoGuyAT
2f16174d3d Changed control points set to private; Cleanup 2022-07-21 07:25:44 +03:00
Salman Ahmed
5513a8b6b4 Fix changelog overlay tests failing due to missing CreatedAt date 2022-07-21 07:21:27 +03:00