1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 03:27:25 +08:00
Commit Graph

55537 Commits

Author SHA1 Message Date
Drison64
a4fae37013 Fixed tests failing 2022-09-20 19:45:39 +02:00
Drison64
6b1cd1bce3 Clamped JuiceStream to Playfield, but broke few tests 2022-09-20 19:13:40 +02:00
Dean Herbert
32e4cf6ccb
Merge branch 'master' into fix-catch-clamp 2022-09-21 01:31:03 +09:00
Dean Herbert
cb8ed1f144 Adjust variables slightly for readability 2022-09-21 01:29:12 +09:00
Dean Herbert
8837618ab1
Merge pull request #20342 from smoogipoo/server-shutdown-countdown
Implement server shutdown countdown + notification
2022-09-20 20:51:16 +09:00
Dan Balasescu
d777afc454 Remove countdown at under 5 seconds 2022-09-20 19:55:44 +09:00
Drison64
979f7f88a1 Fixed TestCatcherWidth and added TestFruitClampedToCatchableRegion 2022-09-20 12:41:06 +02:00
Ondřej Vajďák
50c973a8e3
Merge branch 'ppy:master' into fix-catch-clamp 2022-09-20 12:34:58 +02:00
Dan Balasescu
7f15dc6e6c
Merge pull request #20321 from HiddenNode/fix_graph_info_overlap
Fix Progress bar info text overlapping with progress graph
2022-09-20 19:30:51 +09:00
Dean Herbert
fc6ab9c6a9 Add test coverage of shutdown notifications 2022-09-20 17:42:39 +09:00
Dan Balasescu
80d8eedb7c
Merge pull request #20366 from peppy/fix-nullable-download-progress
Fix multiplayer crashes due to incorrect download state
2022-09-20 17:16:11 +09:00
Dan Balasescu
2499493347
Merge pull request #20375 from peppy/fix-score-reference-leak
Fix mods potentially keeping reference to runtime gameplay elements
2022-09-20 16:26:31 +09:00
Dan Balasescu
b84f716c22 Display seconds when hours>0 to be more lively 2022-09-20 16:02:31 +09:00
Dan Balasescu
ef29987f36 Remove FinalNotification 2022-09-20 15:54:18 +09:00
Dan Balasescu
700000b583 Use custom notification with timer 2022-09-20 15:54:18 +09:00
Dan Balasescu
87f195634e
Merge pull request #20379 from peppy/unmute-notification-ux
Reduce occasions when "game is muted" notification shows
2022-09-20 14:59:03 +09:00
Dean Herbert
b5771ece41 Reduce the amount by which clicking the mute notification incraeses volume 2022-09-20 13:00:08 +09:00
Dean Herbert
a9c120c214 Reduce volume requirement for showing muted notification to 1% 2022-09-20 12:46:35 +09:00
Drison64
981a73d9f8 Merge branch 'fix-catch-clamp' of https://github.com/Drison64/osu into fix-catch-clamp 2022-09-19 17:26:34 +02:00
Ondřej Vajďák
f16b2b4fd9
Merge branch 'master' into fix-catch-clamp 2022-09-19 17:26:20 +02:00
Drison64
4958421303 Moved X clamping from X to EffectiveX 2022-09-19 17:26:04 +02:00
Drison64
18fe37bb22 Reverted changes 2022-09-19 17:25:35 +02: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
Dean Herbert
41e7d271d7 Remove redundant string interpolation 2022-09-19 21:51:54 +09:00
Ondřej Vajďák
67089e1a56
Merge branch 'master' into fix-catch-clamp 2022-09-19 12:51:40 +02:00
Dean Herbert
0a625bd879 Fix mods potentially keeping reference to runtime gameplay elements
As noticed by smoogipoo during multiplayer match on the weekend.
2022-09-19 12:18:46 +09:00
Dean Herbert
454125123d Add failing test coverage showing mod reference leak path 2022-09-19 12:18:35 +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
Drison64
ca9fe9f240 Fixed TestCatcherCatchWidth failing 2022-09-18 22:05:09 +02:00
Drison64
6d7d80a4fb Made X position value of CatchHitObject clamp to CatchPlayfield's width 2022-09-18 17:29:08 +02:00
Dean Herbert
0ac28cbecc Fix potential crash from missing DownloadProgress 2022-09-18 23:42:16 +09: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