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

55489 Commits

Author SHA1 Message Date
Dean Herbert
a56cadcf90 Ensure drag position is reset when transferred to tray 2022-09-11 22:03:29 +09:00
Dean Herbert
b5a2f7003e Disallow flinging when not in toast state 2022-09-11 21:47:45 +09:00
Dean Herbert
d6f90e3b9f Add basic fling-to-dismiss support 2022-09-11 21:32:22 +09:00
Dean Herbert
aa823161f1
Merge pull request #20236 from smoogipoo/fix-countdown-serialisation
Fix countdown serialisation
2022-09-11 19:31:04 +09:00
Dan Balasescu
1eb2c74e57 Fix countdown serialisation 2022-09-11 18:50:51 +09:00
ansel
324a3723a5 Rewrite DMD 2022-09-10 23:23:04 +03:00
ansel
3f93ec8538 Expose counter to inheritors 2022-09-10 23:20:28 +03:00
ansel
064fe832c7 Fix test 2022-09-10 23:18:59 +03:00
ansel
667854b034 Make effect display have a built-in counter 2022-09-10 23:18:48 +03:00
Mk-56spn
d2ac25870b Merge remote-tracking branch 'origin/Freeze_frame_implementation' into Freeze_frame_implementation 2022-09-10 14:08:38 +02:00
Mk-56spn
23d435bc42 name changes 2022-09-10 14:08:04 +02:00
Dean Herbert
a9094c6b03 Add test coverage of clicking close button to dismiss 2022-09-10 15:18:32 +09:00
Dean Herbert
efe3b1aa7b Allow dismissing notifications without performing action using middle / right click 2022-09-10 15:10:37 +09:00
ansel
b056cac10a Remove generic and add default implementation for CalculateEffect 2022-09-10 08:34:29 +03:00
andy840119
3d7367a842 Move the CreateConvertibleReplayFrame() into the base ruleset class for avoid api breaking change in the customized ruleset. 2022-09-10 11:07:23 +08:00
andy840119
1398a7e11e Property should accept the nullable state. 2022-09-10 10:46:40 +08:00
andy840119
2f91b5c846 Add missing import. 2022-09-10 10:46:10 +08:00
andy840119
ec86700f29 Add the nullable disable annotation back becuse it will cause the api broken if remove the nullable disable annotation in the mania ruleset. 2022-09-10 10:45:51 +08:00
andy840119
e62999fb16 Merge branch 'master' of https://github.com/ppy/osu into remove-the-nullable-disable-in-the-ruleset
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Osu/OsuRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
#	osu.Game/Rulesets/Ruleset.cs
2022-09-10 10:40:12 +08:00
Dan Balasescu
7f5fe56c1d
Merge pull request #20213 from frenzibyte/osu-markdown-extensions
Fix markdown container not rendering certain text correctly
2022-09-10 10:02:47 +09:00
Salman Ahmed
5e4e3dfc2c Fix markdown container not rendering certain text correctly 2022-09-10 02:55:20 +03:00
MK56
33a435e2ef
Merge branch 'ppy:master' into Freeze_frame_implementation 2022-09-10 00:54:46 +02:00
Mk-56spn
cb17fb2091 Create Test Scene 2022-09-09 23:13:19 +02:00
Salman Ahmed
95062c2cc8 Remove center origin specification to avoid single-frame layout issues 2022-09-09 19:42:58 +03:00
Salman Ahmed
ae53e27e6c Adjust test coverage to read better 2022-09-09 19:39:06 +03:00
Salman Ahmed
dd10a06e3d Merge branch 'master' into top-rank-badge-order 2022-09-09 19:38:44 +03:00
solstice23
823078ed2d
Merge branch 'master' into search-filter 2022-09-09 23:12:37 +08:00
Dean Herbert
602ffebd54 Apply NRT and fix code style 2022-09-09 23:29:04 +09:00
Dean Herbert
d961b96897 Merge branch 'master' into search-filter 2022-09-09 23:25:54 +09:00
Dean Herbert
8f9df9c7b4
Merge pull request #18642 from Joehuu/fix-play-button-touch
Fix beatmap card play button not working with touch inputs when not hovered
2022-09-09 19:41:05 +09:00
Dean Herbert
8ea739ef25
Merge pull request #18769 from Pasi4K5/enhance-randomisation
Enhance angle calculations of the Random mod
2022-09-09 19:40:47 +09:00
Dean Herbert
e479a022ef
Merge pull request #19556 from HiddenNode/fix_progress_bar_info
Fix progress bar text orientation and scale
2022-09-09 18:46:34 +09:00
Dean Herbert
7d100c5eec Fix test in line with new expectations 2022-09-09 18:10:10 +09:00
Dean Herbert
e9ce968ae3 Merge branch 'master' into fix-play-button-touch 2022-09-09 18:08:18 +09:00
Dean Herbert
31cd7cdca0 Refactor IsHitObjectOnBeat to be understandable 2022-09-09 18:00:51 +09:00
Dean Herbert
a2f96ea120 Make random implicitly null to avoid potential incorrect behaviour in randomBool 2022-09-09 17:55:54 +09:00
Dean Herbert
5defb8b471
Merge branch 'master' into enhance-randomisation 2022-09-09 17:53:13 +09:00
Dean Herbert
bd4723d89d
Merge pull request #20200 from smoogipoo/lazer-maximum-statistics
Populate `MaximumStatistics` for scores imported into lazer
2022-09-09 17:50:53 +09:00
Dean Herbert
9ec399a25a Remove NRT overrides in new tests 2022-09-09 17:49:31 +09:00
Dean Herbert
68d1b7d7cf Reduce test count 2022-09-09 17:48:51 +09: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
Dan Balasescu
1b0edaead2
Merge pull request #20206 from peppy/ramp-mod-multipliers
Reduce ramp mod multipliers in line with other difficulty change mods for now
2022-09-09 17:32:23 +09:00
Dean Herbert
8cfeaa28a0
Merge pull request #19774 from josh-codes/master
Add basic touch support for osu!catch
2022-09-09 17:15:46 +09:00
Dean Herbert
ec21ab8171 Reduce ramp mod multipliers in line with other difficulty change mods for now
Closes https://github.com/ppy/osu/issues/20204.

Will require reprocessing of everything server-side.
2022-09-09 16:39:57 +09:00
Dan Balasescu
fd6d67d0f6
Merge pull request #20205 from peppy/fix-go-home-during-exit
Fix attempting to use "home" key binding while exiting game causing errors
2022-09-09 16:27:27 +09:00
Dean Herbert
bffc9555bf Adjust visuals slightly further (and remove double-gray application) 2022-09-09 16:12:54 +09:00
Dan Balasescu
280b1dd484 Revert async Task change 2022-09-09 16:12:18 +09:00
Dean Herbert
f3fc8af6ee Adjust visuals 2022-09-09 16:04:37 +09:00
Dean Herbert
64eaf461ac Simplify input handling even further 2022-09-09 16:04:37 +09:00