520 Commits

Author	SHA1	Message	Date
PercyDan54	560a0174df	Make auto restart toggleable	2020-12-18 17:54:09 +08:00
smoogipoo	ac91f0e270	Add extended limits to difficulty adjustment mod	2020-12-10 00:37:19 +09:00
Bartłomiej Dach	8da40ce2dc	Reduce duplication by extracting ModEasyWithExtraLives	2020-11-16 19:54:00 +01:00
Bartłomiej Dach	128adce017	Merge branch 'master' into change-taiko-ez	2020-11-16 19:37:47 +01:00
PercyDan54	f2ef7bee5d	Fix checks	2020-11-16 18:17:50 +08:00
PercyDan54	d7acfd5413	Remove retires from ModEasy	2020-11-16 18:15:15 +08:00
Bartłomiej Dach	5ace7abaa8	Add abstract non-generic ModNightcore to pattern-match over	2020-11-15 15:32:02 +01:00
Dean Herbert	2d50a7b616	Fix a few xmldoc typos	2020-11-05 17:38:02 +09:00
smoogipoo	9d5b1ec28c	Add removal dates	2020-11-05 17:04:11 +09:00
smoogipoo	cc518feca7	Make methods abstract	2020-11-05 16:03:10 +09:00
smoogipoo	a219aa7ba2	Add xmldoc	2020-11-05 15:53:35 +09:00
smoogipoo	628b8be15d	Implement ModWithVisibilityAdjustment	2020-11-05 15:40:25 +09:00
Dean Herbert	2ea4aa0a37	Fix incorrect specification on some sample lookups	2020-10-30 11:59:41 +09:00
Dean Herbert	8b864c8c22	Merge branch 'master' into fix-multimod-copy	2020-10-14 22:29:38 +09:00
smoogipoo	f04aec538f	Fix MultiMod throwing exceptions when creating copies	2020-10-14 18:12:19 +09:00
smoogipoo	d536a1f75e	Fix breaks being culled too early	2020-10-09 21:04:56 +09:00
Dean Herbert	6649cb2204	Fix incorrect first object logic	2020-10-09 06:41:53 +09:00
Dean Herbert	2d0275ba95	Fix first hitobject in osu! hidden mod not getting correct fade applied	2020-10-09 03:07:01 +09:00
smoogipoo	cb6b35116a	Merge branch 'master' into scoring-standardisation	2020-10-01 12:28:51 +09:00
Dean Herbert	367b35bb10	Merge branch 'master' into fix-storyboard-sample-pausing	2020-09-30 22:42:26 +09:00
Dean Herbert	414c40d298	Reverse inheritance order of SkinnableSound's pause logic	2020-09-30 15:45:14 +09:00
smoogipoo	bc8f6a58fd	Update PF/SD with new hit results	2020-09-29 16:33:38 +09:00
Dean Herbert	136843c8e4	Make DrawableStoryboardSample a SkinnableSound ... Allows sharing pause logic with gameplay samples.	2020-09-29 14:25:39 +09:00
smoogipoo	1143d5d992	Update class exclusion for dynamic compilation	2020-09-04 20:41:08 +09:00
Dean Herbert	357fb3a10e	Merge branch 'master' into beatmap-track-rework	2020-08-21 12:53:09 +09:00
smoogipoo	583760100a	Implement mania invert mod	2020-08-18 01:40:55 +09:00
Dean Herbert	e465afa280	Merge branch 'master' into beatmap-track-rework	2020-08-14 20:02:43 +09:00
smoogipoo	3cb22fad82	Fix mods sharing bindable instances	2020-08-13 19:48:31 +09:00
smoogipoo	e47a1eb313	Use adjustable ITrack	2020-08-12 01:41:21 +09:00
smoogipoo	7c3ae4ed42	Remove generics from IApplicableToTrack	2020-08-06 18:25:34 +09:00
smoogipoo	e8ab3cff3c	Add class constraint	2020-08-06 17:02:47 +09:00
smoogipoo	5c05fe3988	Expose track from MusicController	2020-08-06 16:24:14 +09:00
smoogipoo	6e42b8219c	Move track to MusicController, compiles	2020-08-06 16:24:14 +09:00
Dean Herbert	c1442568b9	Make perfect mod ignore all non-combo-affecting hitobjects	2020-07-21 17:04:45 +09:00
Dean Herbert	b59e4f8a7e	Change difficulty adjust mod to match stable range of 0-10	2020-07-14 08:15:14 +09:00
Joehu	d66b97868c	Adjust rank when flashlight is enabled	2020-07-02 12:39:37 -07:00
smoogipoo	bd1f38cc3e	Fix crash due to unsafe mod deserialisation	2020-06-26 23:21:44 +09:00
Dan Balasescu	1eaa25e75e	Merge branch 'master' into storyboard-sample-rate	2020-06-26 17:29:38 +09:00
Dean Herbert	14ad3835ff	Update naming	2020-06-23 21:27:01 +09:00
Ronnie Moir	bed5e857df	Add missing license header and remove unused usings	2020-06-17 15:30:23 +01:00
Ronnie Moir	c3e268616f	Implement grouping interface IApplicableToAudio	2020-06-17 14:11:00 +01:00
Ronnie Moir	4138f6119f	Update rate adjust mods to also use IApplicableToSample	2020-06-16 15:05:37 +01:00
Ronnie Moir	1cf16038a7	Create IApplicableToSample	2020-06-16 14:54:05 +01:00
Bartłomiej Dach	e6ddd0380e	Rename bool arguments for readability	2020-06-14 18:50:07 +02:00
Bartłomiej Dach	5f0a345eeb	Unify method naming	2020-06-14 18:48:49 +02:00
Bartłomiej Dach	9907b4763b	Remove redundant default argument value	2020-06-14 18:39:41 +02:00
Ronnie Moir	dc5bb12fa8	Use local helper for selecting adjusted property	2020-06-13 16:32:43 +01:00
Ronnie Moir	77eb428184	Use consistent setting casing	2020-06-13 16:30:21 +01:00
Ronnie Moir	201bfda338	Give ModTimeRamp an adjust pitch setting. ... Implement in ModWindDown and ModWindUp	2020-06-13 15:16:27 +01:00
Dean Herbert	3ae1df07b0	Fix a couple more new formatting issues	2020-06-10 00:09:29 +09:00
Dean Herbert	7dc19220e5	Apply new resharper formatting fixes	2020-06-09 23:38:54 +09:00
Dean Herbert	de50b725d5	Fix mod failure checks executing actual game logic	2020-05-12 20:08:35 +09:00
Dean Herbert	9dda7da489	Fix spinners being considered the "first object" for increased visibility in hidden	2020-04-16 14:11:38 +09:00
Dean Herbert	2abb8a37df	Merge branch 'master' into show-mod-settings-tooltip	2020-03-29 14:35:04 +09:00
Dean Herbert	6d81da5419	Merge branch 'master' into video-offset	2020-03-25 11:28:59 +09:00
Liam DeVoe	2fa42ed644	use N2 for ModTimeRamp, add x text	2020-03-23 12:54:08 -04:00
Dean Herbert	205f4dcb54	Simplify string construction logic	2020-03-23 15:20:56 +09:00
smoogipoo	e3a5be71cc	Implement random mod for taiko	2020-03-23 12:09:30 +09:00
Liam DeVoe	64fc116d67	use two decimal points for ModRateAdjust format	2020-03-22 23:08:00 -04:00
Liam DeVoe	5cc626d37b	move SettingDescription override to ModRateAdjust	2020-03-22 22:57:46 -04:00
Liam DeVoe	1da590c63f	use N1 format instead of 0.#	2020-03-22 22:54:21 -04:00
Liam DeVoe	889608a408	remove redundant ToString call	2020-03-22 22:51:29 -04:00
Liam DeVoe	98b8f82810	simplify SettingDescription default definition	2020-03-22 22:07:09 -04:00
Liam DeVoe	ea87afd577	use string.Empty in IconTooltip	2020-03-22 22:06:54 -04:00
Liam DeVoe	cb6e602556	enforce single signficiant digit precision for other mods	2020-03-22 22:06:35 -04:00
Liam DeVoe	67667b3d22	enforce precision for ModDifficultyAdjust and derived classes	2020-03-22 21:22:46 -04:00
Liam DeVoe	63e9b2a299	use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust	2020-03-22 18:50:09 -04:00
Liam DeVoe	4907fb8fd1	remove another ToString statement	2020-03-20 17:04:22 -04:00
Liam DeVoe	eab705a9b6	remove another ToString statement	2020-03-20 17:00:36 -04:00
Liam DeVoe	ac202ba7ea	remove unused using directive	2020-03-20 16:57:37 -04:00
Liam DeVoe	55568ee6a5	remove extra parentheses	2020-03-20 16:44:38 -04:00
Liam DeVoe	6a63ba1bb8	use humanizer for ModEasy lives setting	2020-03-20 16:42:35 -04:00
Liam DeVoe	cda1efef0b	move overridability to SettingDescription method	2020-03-20 16:34:36 -04:00
Liam DeVoe	7bdbdd25f8	Revert "use SettingSource to define IconTooltip format" ... This reverts commit 5a6d8f1932.	2020-03-20 16:05:12 -04:00
Liam DeVoe	3d95592130	use var for list declaration ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-20 14:37:31 -04:00
Liam DeVoe	9e3bff3b97	oops, missed a newline	2020-03-20 13:36:16 -04:00
Liam DeVoe	9dc8146811	fix style issues	2020-03-20 13:21:44 -04:00
Liam DeVoe	5a6d8f1932	use SettingSource to define IconTooltip format	2020-03-20 12:47:17 -04:00
Liam DeVoe	18bf7c913b	show mod settings in ModIcon tooltip	2020-03-18 23:43:26 -04:00
Liam DeVoe	e59d7fee26	fix comment grammar	2020-03-18 23:42:14 -04:00
Dan Balasescu	1d556bfc5f	Merge branch 'master' into video-offset	2020-03-11 15:13:18 +09:00
voidedWarranties	76c832518f	Render video as a part of the storyboard	2020-03-07 21:32:03 -08:00
smoogipoo	6d051d9e42	Fix perfect mod failure cases	2020-03-02 13:25:56 +09:00
Dean Herbert	53b62816f8	Add index constants for cross-class safety	2020-02-13 14:07:37 +09:00
voidedWarranties	ca237fd987	Simplify ordering by using only numbers, add xmldoc	2020-02-10 16:21:49 -08:00
voidedWarranties	ea521b466f	Switch numerical consts to an enum	2020-02-09 21:37:40 -08:00
voidedWarranties	137181017b	Naming consistency with osu!web	2020-02-09 20:36:54 -08:00
voidedWarranties	88a56d00bf	Allow specifying order to SettingSource	2020-02-09 20:11:37 -08:00
smoogipoo	17294b1b09	Make wind down max value 200%	2020-01-29 15:34:36 +09:00
unknown	d9e21a572f	remove unecessary comment	2020-01-28 07:13:28 +08:00
unknown	7f538cfa74	allow setting initial rate instead of reversing	2020-01-27 07:56:18 +08:00
unknown	12b9e8146e	Merge remote-tracking branch 'upstream/master' into reverse-winding	2020-01-26 16:19:57 +08:00
ProTheory8	02f26e4a4d	Update comment ... Co-Authored-By: Salman Ahmed <email@iisalman.me>	2020-01-21 08:44:22 +05:00
ProTheory8	41295bc27c	Difficulty Adjust mod customisation menu opens automatically now	2020-01-20 21:06:36 +05:00
mcendu	12cf304598	Update ModDaycore icon	2020-01-14 21:23:09 +08:00
mcendu	5d160376c0	nullable-ize Mod.Icon	2020-01-14 21:22:00 +08:00
Dean Herbert	5efb7e8015	Always update default value	2019-12-27 23:01:52 +09:00
Dean Herbert	2c8879f0fb	Lock user adjusted difficulty settings when changing beatmap	2019-12-27 19:05:17 +09:00
Dan Balasescu	ecfe1d361b	Merge branch 'master' into fix-mod-read-setting	2019-12-27 17:29:13 +09:00
Dean Herbert	a4d4efc312	Fix missing comments	2019-12-26 19:33:59 +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	f603dd82bc	Fix difficulty adjust mod not correctly reading settings while leaderboard visible	2019-12-26 14:52:08 +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	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
Lucas A	e3753ae29f	Make the easy mod's extra life count customizable	2019-12-24 10:13:12 +01: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
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
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
Dean Herbert	ea661fce21	Merge branch 'master' into adjustable-map-settings	2019-12-18 18:44:11 +09:00
smoogipoo	2a128340d0	Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats	2019-12-18 17:58:37 +09:00
Dan Balasescu	fd2785bab3	Merge branch 'master' into fxcop	2019-12-17 20:14:45 +09:00
Huo Yaoyuan	ecfc6dfa3d	CA1825: use Array.Empty.	2019-12-17 12:59:48 +08:00
Dean Herbert	b5db927d93	Merge branch 'master' into cinema-mod	2019-12-17 12:56:06 +09:00
Dean Herbert	87035f8251	Simplify complex method	2019-12-17 12:12:15 +09:00
Dean Herbert	438d97f4f5	Rename variable for clarity	2019-12-16 19:42:28 +09:00
Dean Herbert	cfd8111120	Better initial beat handling	2019-12-16 19:41:02 +09:00
Dean Herbert	72404bff9a	Add support for simple triple time	2019-12-16 19:16:54 +09:00
Dean Herbert	210fecc951	Fix incorrect hat logic; add support for first barline omission	2019-12-16 18:57:11 +09:00
Dean Herbert	0f9ff32cdc	Fix beat playing while paused	2019-12-16 18:51:22 +09:00
Dean Herbert	c883c97bab	Fix off-by-one starting bar	2019-12-16 18:50:58 +09:00
Dean Herbert	3e0fda58ea	Play finish in addition to kick, not isolated	2019-12-16 18:47:06 +09:00
Dean Herbert	9de6b62fb1	Fix nightcore beat not playing if song doesn't hit beat index 0	2019-12-16 18:24:29 +09:00
unknown	88d3a1707d	ensure beatIndex is 0 before starting beats	2019-12-16 06:35:18 +08:00
unknown	c06e558f87	add setting to start fully wounded	2019-12-15 18:12:37 +08:00
unknown	154bc57c6e	remove unused dependency	2019-12-15 17:46:44 +08:00
unknown	6da168118e	remove unused usings	2019-12-15 17:02:29 +08:00
unknown	01c036b0b0	implement backing beats for nightcore mods	2019-12-15 16:56:02 +08:00
smoogipoo	72ea871bff	Make constructor protected	2019-12-13 21:55:20 +09:00
Dean Herbert	af15662856	Fix WindUp applying too much change	2019-12-13 21:55:07 +09:00
unknown	ab5aa8594d	remove whitespace	2019-12-13 15:46:58 +08:00
unknown	0311cc83ad	add whitespace	2019-12-13 15:27:34 +08:00
unknown	ababe7b6c9	refactor mod to make use of #7175	2019-12-13 15:22:07 +08:00
unknown	002a125b4a	make ModDifficultyAdjust generic	2019-12-12 21:14:26 +08:00
Dean Herbert	623ab1ef3b	Update time ramp preview on setting change	2019-12-12 17:38:18 +09:00
Dean Herbert	d15f49f60f	Also hide the break overlay	2019-12-12 16:13:02 +09:00
Dean Herbert	99280db694	Add note about AlwaysPresent requirement	2019-12-12 16:12:40 +09:00
Dean Herbert	e4297ffead	Hide HUD in a better way	2019-12-12 16:12:32 +09:00
Dean Herbert	4c4199269c	Use protected constructors	2019-12-12 15:25:37 +09:00
unknown	472fa9822c	make ModDifficultyAdjust incompatible with ModEasy and ModHardRock	2019-12-12 08:25:51 +08:00
Albie	4a1c6db3ed	Merge branch 'master' into cinema-mod	2019-12-11 18:00:17 +00:00
Albie	caa9286a90	update tests, change binding and reduce lines in cinema mod	2019-12-11 17:39:40 +00:00
unknown	b0cf44c3be	fix appveyor issues	2019-12-11 20:12:29 +08:00
unknown	b795532aa5	add difficulty adjustment mods	2019-12-11 19:43:16 +08:00
smoogipoo	40f918dce6	Remove unused using	2019-12-11 19:49:32 +09:00
smoogipoo	c34b6b59ed	Remove time ramp and rate adjust mod incompatibility	2019-12-11 19:48:57 +09:00
smoogipoo	404d3207ff	Refactor ModNightcore/ModDaycore	2019-12-11 19:43:32 +09:00
Albie	a61f8cc2c3	Merge branch 'master' into cinema-mod	2019-12-10 17:06:53 +00:00
Dean Herbert	138b83c9ea	Merge branch 'master' into customized-mods	2019-12-10 19:13:32 +09:00
Dean Herbert	f7f4a57c5f	Update bindable types in line with framework	2019-12-10 16:48:24 +09:00
Dean Herbert	dc9775742c	Fix incorrect code migration ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2019-12-10 02:23:17 +09:00
Dean Herbert	12bdb1dafd	Pin DC/NC pitch	2019-12-09 20:40:38 +09:00
Dean Herbert	edc8220554	Add time ramp settings	2019-12-09 19:58:51 +09:00
Dean Herbert	7fd52c21f5	Update mods and user adjust to use adjustments	2019-12-09 19:41:31 +09:00
Dean Herbert	ba538cf09b	Merge branch 'apply-to-track' into adjustable-double-time	2019-12-09 17:45:19 +09:00
Dean Herbert	eb074b7058	Allow mods to apply to track, not clock	2019-12-09 17:44:45 +09:00
Dean Herbert	0c7e5a2e3b	Add bindable adjustments for DT/HT rate	2019-12-09 16:54:00 +09:00
Dean Herbert	a5d5099868	Use SettingsSource for mod cusomisation	2019-12-06 17:09:48 +09:00
Dean Herbert	01a37771bc	Merge branch 'master' into customized-mods	2019-11-27 19:44:32 +09:00
Albie	09158b6b08	Merge branch 'master' into cinema-mod	2019-11-26 06:57:47 +00:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Albie	9fdbb2a58e	change name of interface and expose method instead of seperate values	2019-11-25 07:24:29 +00:00
Albie	1d6665fe57	improve code quality using resharper and codefactor advice	2019-11-24 07:42:39 +00:00
Albie	b8e5796af5	add forced video/storyboard and disabled dim for mod inside new interface	2019-11-24 07:37:06 +00:00
Albie Spriddell	20edaf4ba6	add cinema mod support	2019-11-23 17:32:16 +00:00
Andrei Zavatski	458496206c	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-21 18:49:37 +03:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Andrei Zavatski	2592a0489b	Use existing ModNoMod	2019-11-15 11:57:40 +03:00
unknown	2bc6932567	make interface mod applicable	2019-11-05 00:55:55 +08:00
LeNitrous	59b2f02828	initial implementation of customizable mods	2019-10-08 18:34:09 +08:00
Dean Herbert	c99b48f934	Bring up-to-date and use IApplicableFailOverride	2019-09-21 23:30:54 +09:00
Dean Herbert	4c4b71eeec	Merge branch 'master' into master	2019-09-21 22:45:05 +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	da15b900f7	Remove virtual member from ModBlockFail	2019-09-19 17:44:24 +09:00
Dean Herbert	2296ea75d7	Add reference to xmldoc ... Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>	2019-09-19 02:03:30 +09:00
Dean Herbert	1150e9fdfb	Bring other mods up-to-date	2019-09-19 01:45:42 +09:00
Dean Herbert	ff3a7c1d13	Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect	2019-09-19 01:36:29 +09:00
Dean Herbert	b0e0659715	Dispose instead	2019-08-07 17:33:30 +09:00
Dean Herbert	c6d481238d	Move QuadBatch to a local variable to stop resharper complaining	2019-08-07 16:56:22 +09:00
smoogipoo	8a64ab0384	Remove generics from IApplicableToBeatmap	2019-08-01 12:39:32 +09:00
smoogipoo	776757545d	Fix FTB causing flashlight to block vision correctly	2019-07-23 15:17:02 +09:00
Dean Herbert	d5ee4cbc9c	Move TouchDevice mod to new "system" category	2019-07-23 13:14:28 +09:00
Dean Herbert	84919d70bb	Health bar -> Health display ... Also inverts logic	2019-07-07 05:30:30 +09:00
Salman Ahmed	1f13b94c72	Fix build error	2019-07-06 18:44:55 +03:00
Salman Ahmed	a42c79895d	Remove unnecessary private field	2019-07-06 18:38:41 +03:00
iiSaLMaN	530e07110f	Use a descriptive name for the setting	2019-07-06 06:32:25 +03:00
Salman Ahmed	98daaf634a	Simplify changes	2019-07-03 06:44:17 +03:00
Salman Ahmed	3f39541cc2	Fade health bar on value change	2019-07-03 05:11:11 +03:00
Salman Ahmed	a8e8650ddd	Move blocking fail logic into a base class	2019-07-02 01:47:39 +03:00
iiSaLMaN	41597efdf7	Hide health bar in no fail	2019-06-29 04:25:52 +03:00
iiSaLMaN	d37cefbad8	Implement IApplicableToHUD	2019-06-29 04:23:59 +03:00
David Zhao	de59e038ac	Prevent non-combo affecting judgements from triggering sudden death	2019-06-21 14:29:16 +09:00
smoogipoo	c7d0fcd42a	Update drawnodes	2019-06-06 16:49:35 +09:00
smoogipoo	117f8bdd01	Merge remote-tracking branch 'Joehuu/master' into flashlight-dim	2019-05-08 13:25:01 +09:00
smoogipoo	13b9b04bb8	Apply more cases/fix some existing ones	2019-05-07 13:23:09 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
David Zhao	abc163fa36	Fix merge	2019-05-07 12:07:45 +09:00
David Zhao	732b0b22a3	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-05-07 12:04:58 +09:00