1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 08:23:20 +08:00
Commit Graph

55506 Commits

Author SHA1 Message Date
Dean Herbert
03cc6b8af3 Fix parameter name 2022-09-19 23:44:03 +09:00
Dean Herbert
bd28c6f96d
Merge branch 'master' into localisation-settings 2022-09-19 23:37:26 +09:00
Dean Herbert
d4510b72da
Merge pull request #20346 from frenzibyte/fix-input-blocking-mod
Fix `InputBlockingMod` not always clearing last action on break periods
2022-09-19 22:18:24 +09:00
Dean Herbert
cbb4845fa6
Merge pull request #20358 from o-dasher/simplify-flashlight
Fix flashlight shrinking at >100x rather than starting from 100x
2022-09-19 22:03:34 +09:00
Salman Ahmed
5ccffe86bd
Merge pull request #20339 from peppy/fix-notification-count
Fix notification count not always updating when it should
2022-09-19 02:43:56 +03:00
Salman Ahmed
a413c7a3e6
Merge branch 'master' into fix-notification-count 2022-09-19 02:08:20 +03:00
O Thiago
a4e9c7711c Fix when flashlight shrinking takes place 2022-09-18 18:59:17 -04:00
O Thiago
407b104116 Revert changes
This reverts commit beef3b418a.

Revert "Use linq expression for handling breaks"

This reverts commit 8464a1941b.

Revert "renames variables to make more logical sense"

This reverts commit 3b87ecf56c.

Revert "Removes overhead when not combo based size"

This reverts commit ac4229e3d4.
2022-09-18 18:57:53 -04:00
Dean Herbert
1914c41d0d
Merge pull request #20353 from Drison64/fix-timelineZoom-zero
EditorBeatmap's TimelineZoom should never be zero
2022-09-18 18:06:26 +09:00
Dean Herbert
ada4b97ebd
Merge pull request #20359 from smoogipoo/fix-room-component-memory-leak
Fix memory leak due to missing event unbind
2022-09-18 14:59:05 +09:00
Dan Balasescu
2dcaf7cfd8 Fix memory leak due to missing event unbind 2022-09-18 14:25:31 +09:00
O Thiago
ac4229e3d4 Removes overhead when not combo based size 2022-09-18 00:38:01 -04:00
O Thiago
3b87ecf56c renames variables to make more logical sense 2022-09-18 00:19:40 -04:00
O Thiago
8464a1941b Use linq expression for handling breaks 2022-09-17 23:49:23 -04:00
O Thiago
beef3b418a Simplifies size calculation 2022-09-17 23:41:23 -04:00
Dan Balasescu
a634ec8fdb
Merge pull request #20355 from frenzibyte/api-user-score-aggregate-xmldoc
Clarify purpose of `APIUserScoreAggregate` using xmldoc
2022-09-18 11:50:06 +09:00
Drison64
c075d3de08 Create a test and a check if initial zoom value of ZoomableScrollContainer is in range 2022-09-17 22:43:40 +02:00
Ondřej Vajďák
9d94343317
Update osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2022-09-17 19:51:44 +02:00
Drison64
c8768eb399 Changed == to <= on TimelineZoom check 2022-09-17 19:00:50 +02:00
Drison64
88e6ce575a Merge branch 'fix-timelineZoom-zero' of https://github.com/Drison64/osu into fix-timelineZoom-zero 2022-09-17 18:57:36 +02:00
Drison64
3c7ea5c8fa Update 2022-09-17 18:57:09 +02:00
Salman Ahmed
9a10ecb378 Clarify purpose of APIUserScoreAggregate 2022-09-17 19:37:30 +03:00
Ondřej Vajďák
448485a56b
Merge branch 'master' into fix-timelineZoom-zero 2022-09-17 16:24:18 +02:00
Dean Herbert
ea0a995cc9
Merge pull request #20349 from vegguid/master
Fixed Leaderboard tooltip not following time format setting
2022-09-17 23:00:44 +09:00
Drison64
0b6a77bc8b EditorBeatmap's TimelineZoom should never be zero 2022-09-17 15:59:42 +02:00
Dean Herbert
a1d830e47f Fix formatting 2022-09-17 22:22:56 +09:00
vegguid
0bfe967452 moved BindValueChanged to LoadComplete 2022-09-17 12:58:23 +02:00
vegguid
288cc7b201 Fixed Leaderboard tooltip not following time format setting 2022-09-16 21:36:17 +02:00
Salman Ahmed
fe72237118 Remove unused using 2022-09-16 20:08:50 +03:00
Salman Ahmed
557b39b69b Fix InputBlockingMod not always clearing last action on break periods 2022-09-16 20:01:19 +03:00
Salman Ahmed
f512106bee Adjust test scene to match expectations
- Adds a scenario where no button is pressed before second hitobject.
- Adjusts press time to not conflict with break start time.
2022-09-16 20:00:44 +03:00
アズタケ
81d582c051 fix review points and fine tuning 2022-09-16 21:08:25 +09:00
Dan Balasescu
a2492a4ff5
Merge pull request #20264 from peppy/fix-skin-flow
Simplify skin bindable flow
2022-09-16 21:06:14 +09:00
Dan Balasescu
e95983cdb4
Merge branch 'master' into fix-skin-flow 2022-09-16 20:15:51 +09:00
Dan Balasescu
3907464cea
Merge pull request #20328 from peppy/update-framework
Update framework
2022-09-16 20:15:33 +09:00
Dean Herbert
85bb6f0beb Update framework
Update framework (again)

Update framework
2022-09-16 19:35:34 +09:00
アズタケ
3a62d29269 fix tab spacing 2022-09-16 18:43:59 +09:00
アズタケ
b99b10e586 fix code style problem 2022-09-16 18:34:13 +09:00
アズタケ
c0e2ba419e Localize non-localizable setting items 2022-09-16 18:31:02 +09:00
Dean Herbert
38d8d457d9 Add back second completion post attempt for case when notification overlay isn't loaded yet 2022-09-16 17:54:44 +09:00
Dan Balasescu
8d725f7744
Merge pull request #20338 from peppy/fix-follow-point-animation
Fix follow point animations in legacy skins not always starting at correct point in time
2022-09-16 17:31:34 +09:00
Dean Herbert
0d24fda4b9 Fire Notification.Closed immediately to ensure off-screen notifications are closed 2022-09-16 16:36:56 +09:00
Dean Herbert
0ff4e343f8 Add failing test showing incorrect unread notification count 2022-09-16 16:29:54 +09:00
Dean Herbert
289e6ad977 Fix follow point animations in legacy skins not always starting at correct point in time 2022-09-16 15:12:05 +09:00
Dan Balasescu
cbf55732da
Merge pull request #20337 from peppy/catch-unobserved-network-exceptions
Catch any unobserved exceptions during beatmap metadata harvesting
2022-09-16 14:37:08 +09:00
Dean Herbert
21ac3fd88b Catch any unobserved exceptions during beatmap metadata harvesting
The process will retry when a connection is successful, so this doesn't
need to be as loud as it was.

Addresses https://github.com/ppy/osu/discussions/20331.
2022-09-16 14:00:06 +09:00
Dean Herbert
4486fa2546
Merge pull request #20334 from Drison64/fix-scorePanel-timeFormat
Make score panel timestamp adjust to 24-hour time setting
2022-09-16 13:40:34 +09:00
Dan Balasescu
d9499abc33 Refactor to avoid passing around bindables 2022-09-16 13:14:25 +09:00
Dan Balasescu
fcba917419
Merge pull request #20320 from peppy/skin-transformers
Allow skin transformers to be created for all skins
2022-09-16 12:58:46 +09:00
Dan Balasescu
49d2c84646
Merge pull request #19991 from Feodor0090/mods-effect-displays
Move `DifficultyMultiplierDisplay`'s layout and colour logic to a base class
2022-09-16 10:30:30 +09:00