1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 04:47:25 +08:00
Commit Graph

15738 Commits

Author SHA1 Message Date
Dean Herbert
033bb15500
Fix early-escape not continuing to results screen (#7362)
Fix early-escape not continuing to results screen
2019-12-26 23:50:21 +09:00
Dean Herbert
3d5561b02e
Separate health and score processing components (#7358)
Separate health and score processing components
2019-12-26 23:48:55 +09:00
Dean Herbert
a041f32072 Use cleaner solution via cancellation of older schedule 2019-12-26 19:05:32 +09:00
smoogipoo
8903f286ef Fix escape not continuing to results screen 2019-12-26 18:27:48 +09:00
smoogipoo
96a4f9ae53 Fix nub position getting offset by size changes 2019-12-26 15:14:19 +09:00
smoogipoo
7414a6aadd Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dean Herbert
a47e5aeead Fix sample lookup not working correctly for custom rulesets 2019-12-26 00:51:44 +09:00
Dean Herbert
9b0af901ef
Merge branch 'master' into remove-legacy-id 2019-12-25 21:25:33 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00
Dean Herbert
41d99df73c
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls 2019-12-25 20:49:45 +09:00
Dean Herbert
1b1c255394
Make the Easy mod's extra life count customizable (#7331)
Make the Easy mod's extra life count customizable
2019-12-25 20:19:08 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion 2019-12-25 19:52:06 +09:00
Dean Herbert
4e419cabdc
Merge branch 'master' into update-framework 2019-12-25 19:32:17 +09:00
Dean Herbert
81c330ec26 Update framework 2019-12-25 18:51:44 +09:00
Dan Balasescu
38219255c7
Merge branch 'master' into settings-source-value-changed 2019-12-25 18:03:36 +09:00
Dan Balasescu
a265a0c7c5
Merge branch 'master' into settings-source-value-changed 2019-12-25 17:23:08 +09:00
Dean Herbert
d84b319a3a Merge remote-tracking branch 'upstream/master' into adjustable-map-settings 2019-12-25 15:20:17 +09:00
Dean Herbert
911dc2d98d Fix code inspections 2019-12-25 15:20:10 +09:00
Dean Herbert
52ba0cd816 Rename method to be more appropriate
Also adds xmldoc.
2019-12-25 15:20:04 +09:00
Dean Herbert
783159f7a0 Remove redundant logic 2019-12-25 14:55:22 +09:00
Dean Herbert
145ac8e0b5 Remove redundant setter 2019-12-25 14:55:05 +09:00
Dean Herbert
f84d98223f
Merge branch 'master' into fallback-to-skin-combo-colours 2019-12-25 14:38:09 +09:00
Dean Herbert
e019ea408a
Merge branch 'master' into adjustable-map-settings 2019-12-25 13:16:47 +09:00
Dean Herbert
89886ceb79
Fix incorrect dialog button animating on requesting quit twice (#7325)
Fix incorrect dialog button animating on requesting quit twice
2019-12-25 13:15:30 +09:00
Joseph Madamba
2a5f661408
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls 2019-12-24 08:29:56 -08:00
Dean Herbert
bc75bd34f6 Fix caret width having changed 2019-12-24 18:23:09 +09:00
Lucas A
e3753ae29f Make the easy mod's extra life count customizable 2019-12-24 10:13:12 +01:00
Dean Herbert
e088a85662 Update framework 2019-12-24 17:12:12 +09:00
smoogipoo
00546787c8 Remove unused method 2019-12-24 16:52:49 +09:00
Dean Herbert
fcb7a9ade5 Update RulesetStore to read from populated defaults 2019-12-24 16:16:55 +09:00
Dean Herbert
5738267642 Copy ruleset info over default 2019-12-24 16:05:20 +09:00
Dean Herbert
d87203857b Move default construction into constructor 2019-12-24 16:02:35 +09:00
Dean Herbert
0677f746aa Provide the ruleset to converter classes 2019-12-24 16:02:16 +09:00
smoogipoo
0bfd757936 Make OsuTextBox use BasicTextBox 2019-12-24 14:21:16 +09:00
Dean Herbert
a324bfbc2c Remove LegacyID from Ruleset 2019-12-24 13:48:27 +09:00
smoogipoo
c7936e40d5 Protect against potential nullref 2019-12-23 19:13:36 +09:00
smoogipoo
3e03916c39 Add length check back to workingbeatmap 2019-12-23 17:45:59 +09:00
smoogipoo
6e7426a098 Simplify/improve beatmap conversion precheck 2019-12-23 17:44:18 +09:00
Joehu
b038c192d1 Rename property to IsSwitchable 2019-12-22 19:47:47 -08:00
mcendu
796223d3e0 Invert if 2019-12-22 21:39:25 +08:00
mcendu
1f41acc5b9 Integrate auto click into exit confirmed check 2019-12-22 21:20:55 +08:00
mcendu
5d29ff29cb Animate "Good bye" instead on exit 2019-12-22 20:52:00 +08:00
unknown
fe73b9f8d3 make HP and OD generic and instantiate CS and AR to modes that need it 2019-12-22 16:45:32 +08:00
Joehu
119b48ccb0 Remove redundant tab item override 2019-12-21 10:48:11 -08:00
Joehu
1342556894 Allow ctrl tabbing navigation to chat and song select leaderboards 2019-12-21 10:48:11 -08:00
Salman Ahmed
ff5e6c0dcf Make DefaultComboColours a property 2019-12-21 12:36:34 +03:00
Salman Ahmed
55be4478aa Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-21 12:36:09 +03:00
unknown
1bd44529dd add full-stop to mod description for consistency 2019-12-20 18:31:16 +08:00
unknown
08b477ed52 make ModDifficultyAdjust abstract 2019-12-20 18:30:23 +08:00
Dean Herbert
a6bdf04f6b Remove unused using 2019-12-20 18:36:39 +09:00