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

22613 Commits

Author SHA1 Message Date
Dean Herbert
ead3ee3b41 Merge branch 'master' into hold-to-press-setting 2019-09-19 20:05:14 +09:00
Dean Herbert
cffee1fd5e Fix imported beatmap paths not correctly matching files 2019-09-19 20:02:45 +09:00
Dean Herbert
ddff9882cf Fix importing archives which are nested in a single folder within a zip 2019-09-19 19:11:04 +09:00
Dean Herbert
0640b2eb35
Fix judgement sizes not matching legacy skins (#6145)
Fix judgement sizes not matching legacy skins
2019-09-19 18:49:35 +09:00
Dean Herbert
3abcd898a6
Add hit lighting (#6144)
Add hit lighting

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:22 +09:00
Dean Herbert
28342baa8f
Add auto-restart functionality to sudden death and perfect mods (#6159)
Add auto-restart functionality to sudden death and perfect mods

Co-authored-by: Paul Teng <plankp@outlook.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:09 +09:00
Dean Herbert
62dda81711
Add query-based filter modes to song select search field (#6161)
Add query-based filter modes to song select search field

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:28:01 +09:00
Dan Balasescu
027d6194f2
Merge branch 'master' into add-hit-lighting 2019-09-19 18:07:29 +09:00
smoogipoo
bc9941a990 Newline required when xmldocs are involved 2019-09-19 18:00:11 +09:00
smoogipoo
65276cd235 Remove whitespace 2019-09-19 17:58:10 +09:00
smoogipoo
db24cfbead Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
smoogipoo
da15b900f7 Remove virtual member from ModBlockFail 2019-09-19 17:44:24 +09:00
Dean Herbert
646d762468
Merge branch 'master' into songselect-advanced-filtering 2019-09-19 17:42:32 +09:00
Dean Herbert
558068a988
Merge pull request #3569 from MaxOhn/traceable-mod
Traceable mod
2019-09-19 17:41:27 +09:00
Dean Herbert
fa54a0bfd3 Fix test failures 2019-09-19 17:40:46 +09:00
Dan Balasescu
0dfce5d15d
Merge branch 'master' into traceable-mod 2019-09-19 17:38:15 +09:00
smoogipoo
5120d82ef8 Fix crash with multiple range criterias 2019-09-19 17:36:44 +09:00
Dean Herbert
e6c36a8bc7 Fix scaling mode being applied to judgements 2019-09-19 17:36:32 +09:00
smoogipoo
96ea507320 Reorder comparison for readability 2019-09-19 17:21:22 +09:00
smoogipoo
e075dd7ea8 Fix equals operator not working 2019-09-19 17:16:34 +09:00
smoogipoo
7683f7ff23 Make OnlineStatus use OptionalRange 2019-09-19 17:12:07 +09:00
smoogipoo
d7831d8f5d Use non-generic IComparable interface 2019-09-19 17:11:43 +09:00
smoogipoo
167bb9fcc1 Fix ugly casts 2019-09-19 17:11:28 +09:00
smoogipoo
0915a94470 Make BeatDivisor use OptionalRange 2019-09-19 16:53:27 +09:00
smoogipoo
3c21b68b73 Make OptionalRange generic 2019-09-19 16:51:57 +09:00
Dean Herbert
2cd7c769e1 Merge remote-tracking branch 'upstream/master' into fix-judgement-size 2019-09-19 16:32:37 +09:00
Dean Herbert
929f05884b Always confirm exit when button is clicked 2019-09-19 16:28:06 +09:00
Dean Herbert
a214e7e72f Add confirmation dialog when exiting game 2019-09-19 16:26:22 +09:00
Dean Herbert
39a5a3eebe Merge remote-tracking branch 'upstream/master' into hold-to-press-setting 2019-09-19 16:26:14 +09:00
Dean Herbert
83657239bd
Disallow failing for replay players (#6162)
Disallow failing for replay players

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 16:00:37 +09:00
Dean Herbert
e2f7d4bc62 Remove unnecessary ToMetric avoidance 2019-09-19 15:45:43 +09:00
Dean Herbert
48ee95955b Remove unnecessary redirection 2019-09-19 15:45:08 +09:00
smoogipoo
c1daa187fe Reduce default tolerance 2019-09-19 15:44:14 +09:00
Dean Herbert
36d0695e5c Add spacing 2019-09-19 15:44:05 +09:00
Dean Herbert
033c68a428 Fade in score, not container 2019-09-19 15:44:00 +09:00
Dean Herbert
ecaf3328bf
Add back combo colours for osu!classic (#6165)
Add back combo colours for osu!classic

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 15:43:19 +09:00
Dean Herbert
2b6c9aeb26 Move top score container to more local namespace 2019-09-19 15:38:40 +09:00
Dean Herbert
e0fd8609d1 Fix margins and clean up implementation 2019-09-19 15:34:46 +09:00
smoogipoo
80f46e02d8 Add equals (=) query operator variants 2019-09-19 15:33:54 +09:00
Dean Herbert
9b35de9ce1 Update tests 2019-09-19 15:23:37 +09:00
Dean Herbert
098e89cb66 Improve state reset flow 2019-09-19 15:23:33 +09:00
Dan Balasescu
9f8c9af3b4
Merge branch 'master' into add-class-combo-colours 2019-09-19 15:13:00 +09:00
Dan Balasescu
e686bcf8e0
Merge pull request #6151 from peppy/state-update-on-skin-change
Always update drawable hitobject state on skin change
2019-09-19 15:12:49 +09:00
Salman Ahmed
865425d35e
Merge branch 'master' into block-failing-on-replays 2019-09-19 09:09:56 +03:00
smoogipoo
c76e27549a Remove spacing 2019-09-19 14:56:52 +09:00
Dan Balasescu
1f0f4d52f3
Merge branch 'master' into state-update-on-skin-change 2019-09-19 14:55:21 +09:00
Dean Herbert
4967ffd8e5 Move inside leaderboard 2019-09-19 14:52:31 +09:00
iiSaLMaN
da4d83063e Simplify LINQ expression 2019-09-19 08:31:11 +03:00
Dean Herbert
a7b6895d4c Revert changes to BeatmapDetailArea 2019-09-19 14:26:15 +09:00
smoogipoo
762adb783a Fix duplicate invocation of updateState on load complete 2019-09-19 14:15:06 +09:00