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

55513 Commits

Author SHA1 Message Date
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
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
Dan Balasescu
2bd23d7499
Merge pull request #20203 from peppy/fix-beat-sync-stop
Fix beat sync stopping after returning to menu from a failed play
2022-09-09 15:37:46 +09:00
Dean Herbert
ba951b76f7 Unify and simplify input handling code 2022-09-09 15:28:40 +09:00
Dean Herbert
e6ba95ee16 Don't bother calculating active keys if input source was not handled 2022-09-09 15:22:12 +09:00
Dean Herbert
a42c1af09e Tidy up highlighting code and ensure read-only access to dictionary by highlight areas 2022-09-09 15:21:20 +09:00
Dean Herbert
715e9018da Tidy up code and naming 2022-09-09 15:11:26 +09:00
Dean Herbert
2709a4d398 Ensure overlay is always shown when movement is detected on mouse or keyboard 2022-09-09 15:04:25 +09:00
Dean Herbert
856dbbba69 Fix attempting to use "home" key binding while exiting game causing errors 2022-09-09 14:52:51 +09:00
Dean Herbert
d6748d6921 Avoid double call to ProcessFrame 2022-09-09 14:35:47 +09:00
Dean Herbert
64cf6b9014 Compare with decoupled clock directly to avoid including offsets 2022-09-09 14:35:35 +09:00
Dean Herbert
c6c59f050c
Merge pull request #20195 from cdwcgt/SkinEditorShortcut
Add arrow shortcuts to skin editor
2022-09-09 14:17:08 +09:00
Dean Herbert
20ffbc4676 Fix beat sync stopping after returning to menu from a failed play
Closes #20193.

Explanation is inline comment.
2022-09-09 14:13:03 +09:00
Dan Balasescu
08d0c08750 Fix async exception by using difficulty calculator directly 2022-09-09 13:57:01 +09:00
Dean Herbert
eb93a838d4
Merge pull request #20202 from smoogipoo/legacy-score-id-long
Turn score ids into `ulong`s
2022-09-09 12:37:48 +09:00
Dan Balasescu
ba2ef424d4 Turn score ids into ulongs 2022-09-09 11:46:06 +09:00
Dan Balasescu
3b932b46ca Fix entire TPL thread potentially being consumed during gameplay 2022-09-09 10:00:52 +09:00
Dan Balasescu
731d3f3b63 Add MaximumStatistics upgrade for databased scores 2022-09-09 09:56:08 +09:00
Dan Balasescu
28477f3b97 Fix inspection 2022-09-09 08:55:35 +09:00
Dean Herbert
f1fa442287
Merge pull request #19599 from ItsShamed/kps
Add clicks/second counter to HUD
2022-09-09 01:50:12 +09:00
cdwcgt
2e775e6886
Add test for object move 2022-09-08 23:47:55 +08:00