25061 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
smoogipoo	4302412243	Simplify implementation	2019-12-23 19:34:12 +09:00
smoogipoo	c7936e40d5	Protect against potential nullref	2019-12-23 19:13:36 +09:00
smoogipoo	c766477abc	Fix testcase containing bad hitobject	2019-12-23 19:08:16 +09:00
Lucas A	125f4286ae	Move truncate() to a method body	2019-12-23 10:55:44 +01:00
smoogipoo	d5288760a7	Fix test text	2019-12-23 18:50:18 +09:00
smoogipoo	63c96d5a83	Fix tail note not properly capping result	2019-12-23 18:49:08 +09:00
smoogipoo	d6fd1007c4	internal -> public	2019-12-23 18:48:14 +09:00
smoogipoo	7bb4a08f10	Add failing tests	2019-12-23 18:47:58 +09:00
smoogipoo	7ac6f68de8	Rewrite hold note input handling	2019-12-23 17:48:57 +09:00
smoogipoo	42853b5af6	Separate head/tail notes from hold note class	2019-12-23 17:48:57 +09:00
smoogipoo	78b30a076f	Add mania player test scene	2019-12-23 17:48:57 +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
Lucas A	e2b4e3580c	Truncate strings passed to the Discord RPC client to a maximum of 128 bytes	2019-12-22 19:21:21 +01:00
mcendu	796223d3e0	Invert if	2019-12-22 21:39:25 +08:00