Commit Graph

751 Commits

Author SHA1 Message Date
Dean Herbert 22138d39ca
Merge branch 'master' into more-diffcalc-attributes 2018-06-25 19:53:22 +09:00
Dean Herbert a397827841 Reduce line length 2018-06-25 19:28:38 +09:00
Dean Herbert 594cc0d21d
Merge branch 'master' into mania-playfield-inversions 2018-06-25 18:36:23 +09:00
Jean-Denis Boivin 55364af56c
I guess you meant an "or" ? 2018-06-24 14:55:27 -04: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
Dean Herbert 1d9d240454
Merge branch 'master' into mania-playfield-inversions 2018-06-18 04:41:17 +09:00
Dean Herbert 6fa72c510f Avoid listing the base mods twice 2018-06-18 00:48:35 +09:00
smoogipoo 0a99d21938 Use the passed-in ruleset 2018-06-17 18:01:28 +09:00
Dean Herbert 57011ff13b
Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
Dean Herbert 719056ca4a
Merge branch 'master' into mania-keymod-optimisation 2018-06-15 18:29:27 +09:00
Dean Herbert f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes 2018-06-15 18:29:20 +09:00
Dean Herbert a6437c005c
Merge branch 'master' into diffcalc-rework 2018-06-15 18:02:18 +09:00
Dean Herbert 30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions 2018-06-15 17:52:53 +09:00
smoogipoo fd84afb89b Fix non-inverted calculation 2018-06-14 19:38:48 +09:00
smoogipoo a3bf16e481 Fix missing convert type 2018-06-14 19:37:32 +09:00
smoogipoo b25a6a33cc Fix 1K breaking hitcircle / slider conversions 2018-06-14 19:37:21 +09:00
smoogipoo 08b9cf75e9 Don't compute keymod difficulties for mania-specific beatmaps
These don't affect the number of keys in the beatmap at all for mania-specific beatmaps.
2018-06-14 17:10:08 +09:00
smoogipoo 22add2abc5 Move mania difficulty attributes to ManiaDifficultyCalculator 2018-06-14 16:25:44 +09:00
smoogipoo 8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
smoogipoo 966099fabc Adjust ManiaDifficultyCalculator in-line with changes 2018-06-14 15:54:05 +09:00
Dean Herbert ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
smoogipoo 7651819fb0 Add same change to mania's hit explosions 2018-06-12 12:53:53 +09:00
Dan Balasescu 9994c69d58
Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
smoogipoo 3bad319dd2 Fix filename 2018-06-11 16:19:57 +09:00
smoogipoo 10d1dfa7cd A bit of cleanup 2018-06-11 16:10:27 +09:00
smoogipoo b9bf3a1829 Make mania scroll downwards by default 2018-06-11 15:56:30 +09:00
smoogipoo 162237dc46 Fix bar lines being offset 2018-06-11 15:43:15 +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 baaf431b9e Make IScrollingInfo and store direction as bindable 2018-06-11 13:42:13 +09:00
smoogipoo ca5103615d DI the scrolling info rather than pass by ctor 2018-06-11 13:42:13 +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
Dean Herbert aaa65c428f
Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
smoogipoo 0fb4e6b41b Fix hold note body not following the scroll direction 2018-06-08 18:16:55 +09:00
Dan Balasescu 4dfc328117
Remove unused array 2018-06-08 17:46:38 +09:00
smoogipoo 5c8bea82f8 Fix scroll direction not applying to nested hitobjects 2018-06-08 15:29:08 +09:00
smoogipoo 7deaffdb62 Fix hit explosions not following the scroll direction 2018-06-08 15:24:19 +09:00
smoogipoo d73c2a1654 Fix various note elements not following the scroll direction 2018-06-08 15:24:19 +09:00
smoogipoo 80a577f182 Fix notes not scrolling correctly 2018-06-08 15:16:45 +09:00
smoogipoo ee64760406 Add mania stage test case 2018-06-08 14:28:27 +09:00
smoogipoo 32037701bf Make the column hitobject area follow the scroll direction 2018-06-07 21:40:12 +09:00
smoogipoo 0c35908802 Reorder fields 2018-06-07 21:19:31 +09:00
smoogipoo 207cdbdefe Make the column key area follow the scroll direction 2018-06-07 21:13:57 +09:00
smoogipoo 11f067d7d6 Fix background input 2018-06-07 21:13:29 +09:00
smoogipoo d49758d149 Make background handle its own lit state 2018-06-07 20:59:04 +09:00
smoogipoo 4af8baefc1 Make the column background follow the scroll direction 2018-06-07 20:49:31 +09:00