Commit Graph

933 Commits

Author SHA1 Message Date
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
594cc0d21d Merge branch 'master' into mania-playfield-inversions 2018-06-25 18:36:23 +09:00
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
ad883e087a RulesetContainer<TObject> cannot be derived 2018-06-19 14:31:24 +02:00
57011ff13b Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
b7a06b9594 Restructure of DifficultyCalculator to cleanup mod + attribute handling 2018-06-14 15:32:07 +09:00
1431ee1867 Remove unused method 2018-06-14 14:46:25 +09:00
0e0e64895a Merge branch 'master' into mania-step-interval 2018-06-13 13:55:27 +09:00
bcfb092e53 Change step to 200 2018-06-12 18:03:45 +09:00
ae136e89a4 Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
3981f56157 Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:34:55 +09:00
78daf1c7ad Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:19:33 +09:00
9994c69d58 Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
b51e714ae5 Fix xmldoc 2018-06-11 15:44:59 +09:00
563a2667d3 Merge branch 'ruleset-configs' into mania-playfield-inversions 2018-06-11 15:08:48 +09:00
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
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
f49b7d6e16 Add mania direction to settings 2018-06-11 14:36:19 +09:00
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
4fb6a8627e Merge remote-tracking branch 'origin/master' into mania-playfield-inversions 2018-06-11 13:45:47 +09:00
f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
22e8a0bb6e Make ruleset config manager variants nullable 2018-06-11 13:13:36 +09:00
63ec36b3be Explicitly handle null settings case + add annotations 2018-06-11 12:57:56 +09:00
b219c17115 Move dependency creation under ctor 2018-06-11 12:57:26 +09:00
86fb9666b2 Rename "Exponential" to "Classic" 2018-06-10 01:45:05 +09:00
cc37a355d2 Add comment about matching stable scoring
Also updated equation to be close to what is expected
2018-06-10 01:44:46 +09:00
aaa65c428f Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
9bdb3113ce Revert "Always update children when ruleset input manager is updated"
This reverts commit 4eb7a34944.
2018-06-08 21:05:28 +09:00
2a48e0e44a Fix sequential speed change visualiser not working with 0 control points 2018-06-08 15:11:43 +09:00
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
2c25e5e8da Merge branch 'master' into mania-step-interval 2018-06-07 20:26:33 +09:00
55a5dfa9b6 Add column testcase 2018-06-07 20:24:33 +09:00
5e9a1961cb Greatly increase the playfield scroll speed adjust step
It was so small previously that I believe many people didn't even realise it was working.
2018-06-07 14:35:33 +09:00
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
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
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
3567823759 Reverse order of exposed objects in HitObjectContainer
Closes #2740.
2018-06-06 15:03:47 +09:00
d3cd267036 Formatting fixes 2018-06-06 14:20:51 +09:00
e19ca0c120 Add nomod mod type 2018-06-06 14:08:02 +09:00
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
a5679f7bf5 Improve readability of code 2018-06-06 14:04:20 +09:00
ee92986494 Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
26569b434c Merge branch 'master' into fix-replay-updates 2018-06-06 09:40:46 +09:00
4b604bf055 Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +09:00
88628812c6 Logexceptions when loading ruleset DLLs 2018-06-03 00:28:29 +09:00
4eb7a34944 Always update children when ruleset input manager is updated 2018-05-31 18:02:10 +09:00
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00