603 Commits

Author	SHA1	Message	Date
Dean Herbert	a6e94dd491	Add back extended limits support	2021-07-08 17:49:00 +09:00
Dean Herbert	c4313d6e96	Initial implementation of new flow (only working for approach rate)	2021-07-08 17:48:08 +09:00
Dean Herbert	0e4f4a6fde	Initial storage changes	2021-07-08 14:28:13 +09:00
PercyDan54	e1c646b9b2	Remove redundant arguments	2021-07-05 23:52:39 +08:00
Henry Lin	6a0c5b54c3	Fix obsolete message in Mod.Ranked	2021-07-02 15:55:25 +08:00
Dean Herbert	0396a03bbc	Rename Mod.Ranked back to avoid breaking ruleset API	2021-07-02 12:50:58 +09:00
Henry Lin	0cceef8da5	Moved the string to int? conversion logic into SettingsNumberBox	2021-06-28 11:00:07 +08:00
Henry Lin	3b822cd5cf	Refactor SeedSettingsControl and related controls	2021-06-26 11:19:14 +08:00
Henry Lin	31c786e1c3	Use SettingsNumberBox.NumberBox instead of OsuNumberBox	2021-06-25 09:51:34 +08:00
ekrctb	e1b2c63e09	Add IApplicableToBeatmapProcessor mod interface	2021-06-23 14:46:30 +09:00
Dean Herbert	54084f8a9c	Move SeedSettingsControl to own file	2021-06-23 13:40:05 +09:00
smoogipoo	6fd020d91d	Remove unnecessary public accessibility ... All interface members are implicitly public.	2021-06-23 12:00:57 +09:00
Henry Lin	fc224c53f4	Remove extra usings	2021-06-22 14:49:37 +08:00
Henry Lin	3745101f32	Extract seed setting control to IHasSeed	2021-06-22 14:43:41 +08:00
smoogipoo	97cd1217a4	Move IApplicableToDrawableHitObjects to its own file	2021-06-18 13:06:13 +09:00
ekrctb	c59a3ce83f	Obsolete plural IApplicableToDrawableHitObjects	2021-06-16 18:52:16 +09:00
ekrctb	af80418ee8	Implement IApplicableToDrawableHitObject for mods ... A breaking change in `ModWithVisibilityAdjustment` if the method was overriden.	2021-06-16 18:52:01 +09:00
ekrctb	e69bb67afe	Add IApplicableToDrawableHitObject that is taking a single DHO ... Less cumbersome to implement than old version taking an enumerable. The implementation was always using `foreach` for the enumerable. The new interface is not used yet.	2021-06-16 18:42:28 +09:00
Pasi4K5	ef9cb2c958	Rename nested classes	2021-06-12 18:37:31 +02:00
Pasi4K5	b79d57b68c	Move OsuSettingsNumberBox into SettingsNumberBox	2021-06-12 17:57:40 +02:00
Pasi4K5	c728f673d6	Rename classes	2021-06-12 17:37:01 +02:00
Pasi4K5	29f3880415	Move classes into SettingsTextBox	2021-06-12 17:34:02 +02:00
Pasi4K5	fe39a47797	Add OsuModSettingsTextBox and OsuModSettingsNumberBox	2021-06-12 00:34:53 +02:00
PercyDan54	510fc93d76	Merge branch 'master' of https://github.com/ppy/osu into auto-restart	2021-06-09 18:05:47 +08:00
Dean Herbert	d0e9f8ef90	Replace and obsolete Ranked flag with IsUserPlayable	2021-06-09 14:17:03 +09:00
Pasi4K5	7a4fc9ffc8	Move seed to base class	2021-06-03 18:16:11 +02:00
Dean Herbert	a3c78674a1	Add new interface for autoplay mods	2021-05-25 18:09:24 +09:00
PercyDan54	166974506e	Duplicate implementions	2021-05-15 11:55:50 +08:00
PercyDan54	6e5c4ed7c6	Revert "Remove empty override" ... This reverts commit a86a4bab91.	2021-05-15 11:45:14 +08:00
PercyDan54	a86a4bab91	Remove empty override	2021-05-14 21:55:32 +08:00
PercyDan54	67dfeeb1b7	Cleanup code in ModHidden	2021-05-14 21:29:13 +08:00
Dean Herbert	e69ec91c07	Add xmldoc for CurrentRotation	2021-04-30 11:25:39 +09:00
Andrei Zavatski	7bf3498e2a	Calculate playfield scale locally	2021-04-30 02:49:19 +03:00
Andrei Zavatski	25e0fb1cf9	Refactor OsuModBarrelRoll to allow it's usage by other rulesets	2021-04-30 01:59:59 +03:00
Salman Ahmed	e90d791754	Add base "classic" mod	2021-04-21 09:14:19 +03:00
smoogipoo	8c4804dd7a	Use nameof	2021-04-16 15:40:06 +09:00
smoogipoo	d1c72f5e13	Apply changes resulting from IBindable interface updates	2021-04-16 15:10:53 +09:00
Dean Herbert	346e36d32a	Make Mod.Description abstract and add missing descriptions	2021-04-15 14:36:26 +09:00
Dean Herbert	7654df94f6	Merge pull request #12395 from frenzibyte/fix-cinema-ignore-settings ... Fix beatmap background displayed if storyboard is hidden on "Cinema" mod	2021-04-14 14:31:03 +09:00
Salman Ahmed	36510309d1	Merge EnableUserDim and IgnoreUserSettings to one bindable	2021-04-13 10:58:56 +03:00
Salman Ahmed	92fab653e1	Take current mod settings value into account on equality comparsion	2021-04-12 20:51:13 +03:00
Salman Ahmed	18fb9f5ac9	Merge branch 'master' into mod-using-reference-equality	2021-04-11 19:48:55 +03:00
Dean Herbert	67773c42ef	Merge pull request #11888 from H2n9/modtimeramp-new-behaviour	2021-02-25 14:01:57 +09:00
Bartłomiej Dach	421b7877d4	Avoid mixing precision across time ramp bindables ... Bears no functional difference, it's just a bit less of an eyesore.	2021-02-24 19:16:10 +01:00
Ronnie Moir	73d6a3687e	Change rate correction logic to be more explicit	2021-02-24 14:40:56 +00:00
smoogipoo	0b44d2483b	Make some properties virtual ... I think they were intended to be this way from the beginning.	2021-02-24 15:03:41 +09:00
smoogipoo	14160b897e	Fix references to ModSuddenDeath	2021-02-24 14:44:53 +09:00
smoogipoo	30a58691f0	Make SD and PF incompatible with each other	2021-02-24 14:34:37 +09:00
Ronnie Moir	f6d3cd6413	Change SamplePlaybackWithRateMods to use rate calulated from the sample ... Replace hardcoded numbers	2021-02-23 21:25:59 +00:00
PercyDan	b55a1acbea	Merge 2babb7ecb0 into e679a1916f	2021-02-23 21:49:03 +01:00
Ronnie Moir	7394c62cc8	Make ModTimeRamp and ModRateAdjust incompatible	2021-02-23 18:10:03 +00:00
Ronnie Moir	a6e840634b	Adjust scrubbing behaviour to allow dragging through rate values	2021-02-23 15:52:53 +00:00
Ronnie Moir	f45cedeb85	Adjust initial and final rate ranges and prevent them from overlapping	2021-02-23 15:38:09 +00:00
Dean Herbert	f84ea30637	Expose Mods in DrawableRuleset to avoid using external DI	2021-02-11 17:47:29 +09:00
Dean Herbert	aaa0362b12	Merge branch 'master' into autoplay-rate-independence	2021-02-11 17:39:45 +09:00
smoogipoo	be9b07a4cf	Merge branch 'master' into difficulty-adjustment-extension	2021-02-10 20:42:08 +09:00
Dean Herbert	8204d360a8	Always reset local user settings when a mod is deselected in ModSelectOverlay	2021-02-09 13:44:42 +09:00
Dean Herbert	be379e0e3c	Change CopyFrom to always overwrite all settings with incoming values	2021-02-09 13:44:11 +09:00
Bartłomiej Dach	0229851c9c	Apply rounding to ModTimeRamp to improve SPM consistency	2021-02-07 19:02:09 +01:00
Bartłomiej Dach	7daeacaff2	Add and implement IApplicableToRate interface	2021-02-07 18:35:34 +01:00
Bartłomiej Dach	68c20a2a37	Allow autoplay score generation to access mod list	2021-02-07 18:35:34 +01:00
Bartłomiej Dach	a0de1cbfd0	Handle no-duration single-object edge case	2021-01-31 21:09:41 +01:00
Bartłomiej Dach	547b3d8bed	Fix speed change calculation in time ramp mods	2021-01-31 20:34:56 +01:00
Bartłomiej Dach	81b052b866	Add failing test cases	2021-01-31 20:34:22 +01:00
Dean Herbert	dee0d3c33a	Merge branch 'master' into apply-sv-to-taiko-hr-ez	2021-01-25 14:28:06 +09:00
Bartłomiej Dach	4b4adc927c	Rename param to match method body	2021-01-10 15:35:53 +01:00
Salman Ahmed	0aad0c7c6c	Target logic at this and adjust variables	2021-01-09 00:31:18 +03:00
Salman Ahmed	375ecf92ed	Merge remote-tracking branch 'upstream/master' into fix-mod-buttons-not-copying-settings	2021-01-09 00:26:18 +03:00
Bartłomiej Dach	303cc62ee7	Transfer flags indicating if settings were changed	2021-01-06 22:46:46 +01:00
Dean Herbert	b3f08b29ca	Ensure that all changes to screen backgrounds are on the correct thread	2021-01-05 15:22:50 +09:00
Bartłomiej Dach	9e4a925ab1	Clarify & cleanup comments some	2021-01-03 13:44:29 +01:00
Bartłomiej Dach	a3e29b9154	Rename parameters for readability	2021-01-03 13:25:44 +01:00
Dean Herbert	2501707d7d	Copy values using Bind to also copy defaults	2021-01-03 20:45:03 +09:00
Dean Herbert	29dbb1cc0d	Add internal pathway for ensuring correct application of bindable mods	2021-01-03 15:48:28 +09:00
Dean Herbert	23e216fa0b	Simplify some default value checks (we are sure the return is an IBindable)	2021-01-03 15:47:15 +09:00
Salman Ahmed	c1a1e3acc5	Revert drive-by changes	2021-01-01 15:40:40 +03:00
Salman Ahmed	a031c8e0b6	Apply documentation suggestions ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2021-01-01 15:34:09 +03:00
Salman Ahmed	b4df2d6d43	Add method for copying properties from another mod	2021-01-01 03:46:09 +03:00
Firmatorenio	013b9b62a1	add SV multipliers to taiko difficulty mods	2020-12-29 20:22:56 +06:00
Salman Ahmed	41b79d938b	Fix wrong checks..	2020-12-28 15:30:52 +03:00
Salman Ahmed	5efcdbd431	Fix IMod now using reference equality as well	2020-12-28 15:19:28 +03:00
Salman Ahmed	43f8f3638a	Fix mod using reference equality unless casted to IMod	2020-12-27 02:42:13 +03:00
PercyDan54	2babb7ecb0	Fix CI	2020-12-18 18:33:38 +08:00
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