748 Commits

Author	SHA1	Message	Date
smoogipoo	2d8e2dc5f7	Merge remote-tracking branch 'origin/master' into osu-default-bindings	2018-07-13 19:32:40 +09:00
Ethan Yang	157ca8b2a4	Change osu key bindings	2018-07-08 11:47:39 -07:00
Dean Herbert	1d6609d9f3	Add common custom words to dotsettings dictionary ... Also fixes some typos and reduces spelling suggestions to hints.	2018-07-05 15:54:41 +09:00
smoogipoo	45a4187923	Tidy up lookups to NestedHitObjects	2018-07-02 16:10:56 +09:00
Dean Herbert	831b11ff97	Remove unnecessary null checks	2018-07-02 14:28:56 +09:00
Dean Herbert	c04bfb96e1	Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix	2018-07-02 14:26:41 +09:00
Dean Herbert	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +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	cacabeb67e	Remove unused field	2018-06-29 17:00:41 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +09:00
Dean Herbert	9d4bc7b630	Fix combo index being wrong	2018-06-29 01:34:47 +09:00
Dean Herbert	0a945e4709	Check whether initialised first	2018-06-28 22:44:40 +09:00
Dean Herbert	e197ebe4c5	Fix slider heads displaying in incorrect colour	2018-06-28 01:55:09 +09:00
Dean Herbert	10220a61a5	Use playfield size constants where possible	2018-06-27 12:18:00 +09:00
smoogipoo	0e6cc78d9a	Add slider ticks conversion test	2018-06-27 12:09:40 +09:00
smoogipoo	6f65ad33f0	Output one value per slider nested hitobject	2018-06-27 12:09:40 +09:00
smoogipoo	0366b0f081	The tail circle will always be the last hitobject	2018-06-27 12:09:40 +09:00
smoogipoo	80501de4b9	Add legacy slider offsets	2018-06-27 12:09:21 +09:00
Roman Kapustin	2a72062c33	Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part.	2018-06-26 00:53:31 +03:00
Dean Herbert	22138d39ca	Merge branch 'master' into more-diffcalc-attributes	2018-06-25 19:53:22 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
smoogipoo	48989df6eb	Make sure that 0 SR is returned when there are no hitobjects	2018-06-21 12:04:14 +09:00
Dan Balasescu	bf11a61d52	Merge branch 'master' into more-diffcalc-attributes	2018-06-21 09:26:50 +09:00
Dan Balasescu	77e03a59a9	Merge branch 'master' into ruleset-container	2018-06-19 21:47:10 +09:00
Tom Arrow	ad883e087a	RulesetContainer<TObject> cannot be derived	2018-06-19 14:31:24 +02:00
Dan Balasescu	0b1b3319aa	Merge branch 'master' into update-framework	2018-06-19 20:57:19 +09:00
Dean Herbert	3819ecb2be	Update framework	2018-06-19 20:19:52 +09:00
Tom Arrow	4aa89de2d7	Fix reverse arrow displayed with incorrect angle	2018-06-18 17:22:01 +02:00
smoogipoo	41abd5990c	Move osu! difficulty attributes to OsuDifficultyCalculator	2018-06-14 16:27:05 +09:00
smoogipoo	af218b3d8d	No need to use properties	2018-06-14 16:13:21 +09:00
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
smoogipoo	47fc18d7c4	Adjust OsuDifficultyCalculator in-line with changes	2018-06-14 15:45:16 +09:00
Dean Herbert	f4cb0d7d8d	Fix memory leak due to incorrect binding	2018-06-13 14:16:58 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	f4fbf27d42	Give ruleset settings a ruleset-specific config manager	2018-06-11 13:28:50 +09:00
Crusensis	fbc0cd6f5f	Split AffectsCombo into IsBonus	2018-06-09 18:14:33 -07:00
Dean Herbert	aaa65c428f	Merge branch 'master' into diffcalc-modtypes	2018-06-09 23:35:17 +09:00
smoogipoo	ff60f69f47	Explicitly construct local beatmaps rather than using GetBoundCopy	2018-06-06 20:19:30 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
smoogipoo	83ff47ec80	Rewrite difficulty mod combinations	2018-06-06 16:20:17 +09:00
Dean Herbert	3567823759	Reverse order of exposed objects in HitObjectContainer ... Closes #2740.	2018-06-06 15:03:47 +09:00
smoogipoo	8274623ad6	Cleanup multi mod constructions	2018-06-06 14:07:50 +09:00
Dean Herbert	f253828d49	Fix regressions	2018-06-06 13:51:51 +09:00
Dean Herbert	ee92986494	Merge branch 'master' into osu-hd-setting	2018-06-06 12:09:12 +09:00
Dean Herbert	4b604bf055	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
smoogipoo	2ccffb9ac4	Add difficulty calculation mod types	2018-06-03 10:59:56 +09:00