961 Commits

Author	SHA1	Message	Date
Dan Balasescu	745d596343	Merge branch 'master' into fix-incorrect-mods	2018-07-17 13:41:02 +09:00
Dean Herbert	dbc538abbe	Use Enum.HasFlag ... With .NET core 2.0+ this is as efficient as the ugly code we've been using.	2018-07-16 16:18:46 +09:00
Dean Herbert	ac078153ae	Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods	2018-07-13 14:20:56 +09:00
Dean Herbert	24054246b8	Fix DI regression	2018-07-11 17:54:01 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dean Herbert	96ef526474	Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse	2018-07-11 17:02:01 +09:00
Dean Herbert	4f894969df	Merge branch 'master' into hitobject-samples	2018-07-05 19:43:19 +09:00
Dean Herbert	d11ba2df0e	Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks	2018-07-05 14:53:31 +09:00
Dean Herbert	e28a610757	Fix mods not correctly resetting when changing ruleset at song select	2018-07-05 13:22:52 +09:00
ekrctb	d71b61c122	Rewrite disable mouse buttons logic	2018-07-03 20:04:15 +09:00
Dean Herbert	1e1ff8339e	Merge branch 'master' into non-null-nestedobjects	2018-07-03 19:43:46 +09:00
smoogipoo	f0ec117bcb	Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds ... # Conflicts: # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-07-02 17:21:18 +09:00
smoogipoo	45a4187923	Tidy up lookups to NestedHitObjects	2018-07-02 16:10:56 +09:00
smoogipoo	7f832e34c0	Reorder sample bank property setters	2018-07-02 14:29:18 +09:00
smoogipoo	73fac2115a	Implement hitobject sample files	2018-07-02 14:20:35 +09:00
Dean Herbert	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +09:00
smoogipoo	9f85c55915	Merge remote-tracking branch 'origin/master' into legacy-custom-banks	2018-07-02 12:34:51 +09:00
Dean Herbert	98fb2e03c0	Fix rulesets not loading in debug builds after running a release build	2018-07-01 18:03:15 +09:00
Dean Herbert	e12ce3c2a8	Adjust xmldoc	2018-06-29 17:21:55 +09:00
Dean Herbert	098aeabc9e	Merge branch 'master' into catch-scoring	2018-06-29 17:16:14 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	99068debc4	Split out into separate interface + add xmldocs	2018-06-29 13:24:33 +09:00
Dean Herbert	70a119dde7	Remove unused/duplicate interface	2018-06-29 12:20:53 +09:00
smoogipoo	781095b96b	Encapsulate the method to apply SampleControlPoints to SampleInfos	2018-06-28 18:29:07 +09:00
Dean Herbert	b1a3f01212	Fix mania maps not being treated as mania maps in release builds	2018-06-28 17:10:30 +09:00
smoogipoo	80501de4b9	Add legacy slider offsets	2018-06-27 12:09:21 +09:00
Dean Herbert	594cc0d21d	Merge branch 'master' into mania-playfield-inversions	2018-06-25 18:36:23 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
Tom Arrow	ad883e087a	RulesetContainer<TObject> cannot be derived	2018-06-19 14:31:24 +02:00
Dean Herbert	57011ff13b	Merge branch 'master' into mania-playfield-inversions	2018-06-15 18:33:40 +09:00
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
smoogipoo	b7a06b9594	Restructure of DifficultyCalculator to cleanup mod + attribute handling	2018-06-14 15:32:07 +09:00
smoogipoo	1431ee1867	Remove unused method	2018-06-14 14:46:25 +09:00
Dan Balasescu	0e0e64895a	Merge branch 'master' into mania-step-interval	2018-06-13 13:55:27 +09:00
Dean Herbert	bcfb092e53	Change step to 200	2018-06-12 18:03:45 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Dan Balasescu	3981f56157	Merge branch 'master' into exponential-scoring-toggle	2018-06-11 18:34:55 +09:00
Dan Balasescu	78daf1c7ad	Merge branch 'master' into exponential-scoring-toggle	2018-06-11 18:19:33 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	b51e714ae5	Fix xmldoc	2018-06-11 15:44:59 +09:00
smoogipoo	563a2667d3	Merge branch 'ruleset-configs' into mania-playfield-inversions	2018-06-11 15:08:48 +09:00
smoogipoo	14b7530994	Use a global ruleset config cache	2018-06-11 15:07:42 +09:00
smoogipoo	be01dbae3a	Move ruleset dependency caching to CreateLocalDependencies ... In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.	2018-06-11 15:07:29 +09:00
smoogipoo	f49b7d6e16	Add mania direction to settings	2018-06-11 14:36:19 +09:00
smoogipoo	93696fb5e5	Merge branch 'ruleset-configs' into mania-playfield-inversions ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-06-11 13:46:39 +09:00
smoogipoo	4fb6a8627e	Merge remote-tracking branch 'origin/master' into mania-playfield-inversions	2018-06-11 13:45:47 +09:00
smoogipoo	f4fbf27d42	Give ruleset settings a ruleset-specific config manager	2018-06-11 13:28:50 +09:00
smoogipoo	eca016ec6c	Move ruleset config managers to Ruleset	2018-06-11 13:17:08 +09:00
smoogipoo	22e8a0bb6e	Make ruleset config manager variants nullable	2018-06-11 13:13:36 +09:00