Commit Graph

915 Commits

Author SHA1 Message Date
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
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
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
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
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
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
7a31986812 resolving the lost code problem 2018-05-22 22:39:55 +02:00
08e423ac5b code sanity 2018-05-22 21:35:17 +02:00
50e2871c89 why this line was ommited 2018-05-22 21:29:41 +02:00
5ec349de78 Reorder methods and remove useless comments 2018-05-21 15:59:33 +09:00
f53164843d Reduce spacing changes 2018-05-21 15:56:02 +09:00
cea935ea40 Merge branch 'master' into osu-hd-setting 2018-05-21 15:21:09 +09:00
92668f07e0 Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
6c00046835 Merge branch 'master' into mania-performance-calculator 2018-05-18 12:34:49 +09:00
8e784d9104 Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
2492e34d3f resolving codefactor styling issues 2018-05-17 19:44:09 +02:00
6a1abf4084 Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
43cdbec0a3 Fix hold note hitwindow lenience 2018-05-17 13:59:04 +09:00
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
397d93660a Don't deep-clone beatmapinfo/control points 2018-05-17 13:17:33 +09:00
c67f372560 Don't create nested hitobjects unless absolutely required 2018-05-17 12:29:33 +09:00
de63a1b578 Remove construction of new ruleset 2018-05-16 01:43:58 +09:00
3f67d04429 Cap CS to 10 also 2018-05-15 21:57:08 +09:00