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 |
|
Dan Balasescu
|
5a11fe9a84
|
Merge pull request #7347 from peppy/fix-sample-lookup
Fix sample lookup not working correctly for custom rulesets
|
2019-12-26 12:40:55 +09:00 |
|
Dean Herbert
|
a47e5aeead
|
Fix sample lookup not working correctly for custom rulesets
|
2019-12-26 00:51:44 +09:00 |
|
Dan Balasescu
|
19ce3eba28
|
Merge pull request #7338 from peppy/remove-legacy-id
Fix missing ruleset IDs in non-legacy rulesets
|
2019-12-25 21:41:46 +09:00 |
|
Dean Herbert
|
9b0af901ef
|
Merge branch 'master' into remove-legacy-id
|
2019-12-25 21:25:33 +09:00 |
|
Dean Herbert
|
3862bbfa25
|
Allow ctrl-tabbing on more tab controls (#7319)
Allow ctrl-tabbing on more tab controls
|
2019-12-25 21:09:27 +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
|
0e1eca6c0b
|
Simplify/improve beatmap conversion precheck (#7328)
Simplify/improve beatmap conversion precheck
|
2019-12-25 20:08:47 +09:00 |
|
Dean Herbert
|
504a55e803
|
Merge branch 'master' into better-beatmap-conversion
|
2019-12-25 19:52:06 +09:00 |
|
Dean Herbert
|
871f594061
|
Update framework (#7342)
Update framework
|
2019-12-25 19:51:49 +09:00 |
|
Dean Herbert
|
4e419cabdc
|
Merge branch 'master' into update-framework
|
2019-12-25 19:32:17 +09:00 |
|
Dan Balasescu
|
c63963fbd9
|
Merge pull request #7303 from peppy/settings-source-value-changed
Update song select statistics when mod changes settings
|
2019-12-25 19:16:42 +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 |
|
Dean Herbert
|
6d89fe97e9
|
Merge pull request #7157 from LeNitrous/adjustable-map-settings
Add difficulty adjustment mod
|
2019-12-25 17:37:37 +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
|
1455b9e796
|
Fallback to current skin combo colours if none provided on beat… (#6449)
Fallback to current skin combo colours if none provided on beatmap skin
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-12-25 15:19:24 +09:00 |
|
Dean Herbert
|
3485ef33a7
|
Rename tests and add missing coverage
|
2019-12-25 15:05:08 +09:00 |
|
Dean Herbert
|
9090d13e05
|
Simplify tests
|
2019-12-25 15:01:05 +09:00 |
|
Dean Herbert
|
783159f7a0
|
Remove redundant logic
|
2019-12-25 14:55:22 +09:00 |
|
Dean Herbert
|
04cbdd9c6c
|
Make test easier to visually examine
|
2019-12-25 14:55:13 +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 |
|
Dean Herbert
|
a5e30859a9
|
Truncate rich presence status strings to 128 bytes (#7318)
Truncate rich presence status strings to 128 bytes
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-12-25 12:28:44 +09:00 |
|
smoogipoo
|
1a7937bcf7
|
Apply suggested optimisations
|
2019-12-25 12:04:28 +09:00 |
|
smoogipoo
|
36dd0e6998
|
Make ellipsis length into a static
|
2019-12-25 11:14:40 +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
|
babaa4d5de
|
Make OsuTextBox use BasicTextBox (#7337)
Make OsuTextBox use BasicTextBox
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-12-24 18:50:10 +09: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 |
|
Dean Herbert
|
5e8afccfee
|
Protect against potential nullref when exiting player (#7330)
Protect against potential nullref when exiting player
|
2019-12-24 03:20:54 +09:00 |
|
Dan Balasescu
|
3dcfee9294
|
Merge pull request #7332 from peppy/disable-discord-rpc-reconnections
Disable automatic retry of failed discord RPC connections
|
2019-12-23 20:06:42 +09:00 |
|
smoogipoo
|
f1f9e1f658
|
Don't truncate with exactly 128 bytes
|
2019-12-23 19:56:05 +09:00 |
|
Dean Herbert
|
b9bc1c954e
|
Disable automatic retry of failed discord RPC connections
|
2019-12-23 19:50:35 +09:00 |
|
Dan Balasescu
|
bc0c331c33
|
Merge branch 'master' into fix-discord-rpc
|
2019-12-23 19:37:00 +09:00 |
|