smoogipoo
|
7414a6aadd
|
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
|
2019-12-26 14:56:54 +09:00 |
|
Dan Balasescu
|
9702cc9809
|
Merge branch 'master' into remove-legacy-id
|
2019-12-25 21:01:12 +09:00 |
|
Dean Herbert
|
504a55e803
|
Merge branch 'master' into better-beatmap-conversion
|
2019-12-25 19:52:06 +09:00 |
|
Dean Herbert
|
911dc2d98d
|
Fix code inspections
|
2019-12-25 15:20:10 +09:00 |
|
Dean Herbert
|
52ba0cd816
|
Rename method to be more appropriate
Also adds xmldoc.
|
2019-12-25 15:20:04 +09:00 |
|
Dean Herbert
|
0677f746aa
|
Provide the ruleset to converter classes
|
2019-12-24 16:02:16 +09:00 |
|
Dean Herbert
|
a324bfbc2c
|
Remove LegacyID from Ruleset
|
2019-12-24 13:48:27 +09:00 |
|
smoogipoo
|
6e7426a098
|
Simplify/improve beatmap conversion precheck
|
2019-12-23 17:44:18 +09:00 |
|
unknown
|
fe73b9f8d3
|
make HP and OD generic and instantiate CS and AR to modes that need it
|
2019-12-22 16:45:32 +08:00 |
|
unknown
|
08b477ed52
|
make ModDifficultyAdjust abstract
|
2019-12-20 18:30:23 +08:00 |
|
smoogipoo
|
76f2fb378f
|
Separate score and health parts of ScoreProcessor
|
2019-12-19 20:03:14 +09:00 |
|
Dean Herbert
|
ea661fce21
|
Merge branch 'master' into adjustable-map-settings
|
2019-12-18 18:44:11 +09:00 |
|
Dean Herbert
|
51a01c7006
|
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
|
2019-12-18 18:42:42 +09:00 |
|
smoogipoo
|
2a128340d0
|
Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats
|
2019-12-18 17:58:37 +09:00 |
|
Dean Herbert
|
6e0802e50c
|
Remove RulesetInfo parameter from Ruleset constructor
|
2019-12-18 14:49:09 +09:00 |
|
Dean Herbert
|
e0ce87adca
|
Move CreateScoreProcessor() to Ruleset (#7244)
Move CreateScoreProcessor() to Ruleset
|
2019-12-17 22:15:42 +09:00 |
|
Dan Balasescu
|
fd2785bab3
|
Merge branch 'master' into fxcop
|
2019-12-17 20:14:45 +09:00 |
|
smoogipoo
|
49bf8d27d1
|
Move CreateScoreProcessor() to Ruleset
|
2019-12-17 20:08:13 +09:00 |
|
Huo Yaoyuan
|
ecfc6dfa3d
|
CA1825: use Array.Empty.
|
2019-12-17 12:59:48 +08:00 |
|
Dean Herbert
|
b5db927d93
|
Merge branch 'master' into cinema-mod
|
2019-12-17 12:56:06 +09:00 |
|
Dean Herbert
|
3f3ba603c1
|
Merge remote-tracking branch 'upstream/master' into nightcore-beats
|
2019-12-16 18:03:32 +09:00 |
|
smoogipoo
|
a554ca728b
|
Don't reuse the same control point references
|
2019-12-16 15:27:54 +09:00 |
|
unknown
|
01c036b0b0
|
implement backing beats for nightcore mods
|
2019-12-15 16:56:02 +08:00 |
|
unknown
|
7f659cd057
|
Merge branch 'update-beatmap-settings' into adjustable-map-settings
|
2019-12-13 09:45:10 +08:00 |
|
unknown
|
002a125b4a
|
make ModDifficultyAdjust generic
|
2019-12-12 21:14:26 +08:00 |
|
Dean Herbert
|
37a94988a3
|
Merge branch 'improve-hud-hiding' into cinema-mod
|
2019-12-12 16:12:19 +09:00 |
|
smoogipoo
|
5861eca80d
|
Make DrawableRuleset take a converted beatmap
|
2019-12-12 15:58:11 +09:00 |
|
Albie
|
4a1c6db3ed
|
Merge branch 'master' into cinema-mod
|
2019-12-11 18:00:17 +00:00 |
|
unknown
|
b0cf44c3be
|
fix appveyor issues
|
2019-12-11 20:12:29 +08:00 |
|
unknown
|
b795532aa5
|
add difficulty adjustment mods
|
2019-12-11 19:43:16 +08:00 |
|
smoogipoo
|
48f1dad4aa
|
Remove abstract ScoreProcessor class
|
2019-12-11 17:25:06 +09:00 |
|
Dean Herbert
|
77b9989e11
|
Fix some weird private field names
|
2019-12-11 14:10:35 +09:00 |
|
Albie
|
a61f8cc2c3
|
Merge branch 'master' into cinema-mod
|
2019-12-10 17:06:53 +00:00 |
|
Dean Herbert
|
5f3d163772
|
Merge branch 'master' into segmented-slider-paths-3
|
2019-12-10 14:28:20 +09:00 |
|
Dean Herbert
|
1e71681916
|
Fix osu!catch catcher not scaling down correctly
|
2019-12-10 02:00:39 +09:00 |
|
smoogipoo
|
fa1468325e
|
Refactor hitobjects to remove default control point
|
2019-12-09 17:48:27 +09:00 |
|
smoogipoo
|
b9d12e5fe4
|
Fix nested hitobjects not updating
|
2019-12-06 20:53:40 +09:00 |
|
Dean Herbert
|
15ee65b8e9
|
Merge branch 'master' into ctb-relax
|
2019-12-04 23:35:55 +09:00 |
|
Dean Herbert
|
f0d49d0cdf
|
Decouple APILegacyScoreInfo from ScoreInfo
|
2019-12-03 15:31:11 +09:00 |
|
Dean Herbert
|
c7305f0b44
|
Simplify implementation structure
|
2019-11-29 18:27:27 +09:00 |
|
Dean Herbert
|
63128c9465
|
Extend mouse hiding in catch to include catcher area
|
2019-11-29 18:25:11 +09:00 |
|
Dean Herbert
|
3864ea6ca3
|
Move position updating logic back to CatcherArea
|
2019-11-29 18:24:46 +09:00 |
|
Dean Herbert
|
4f081f2fe8
|
Remove catch-specific cursor provider
|
2019-11-29 17:38:28 +09:00 |
|
Dean Herbert
|
8ec25a6af2
|
Merge branch 'master' into ctb-relax
|
2019-11-29 16:28:06 +09:00 |
|
Albie
|
7864899249
|
Merge branch 'master' into cinema-mod
|
2019-11-28 16:42:01 +00:00 |
|
Dan Balasescu
|
c6a85a11bd
|
Merge branch 'master' into sharpen
|
2019-11-27 17:09:11 +09:00 |
|
Huo Yaoyuan
|
9425e80a5d
|
Unify to use double in performance calculators.
|
2019-11-26 18:34:23 +08:00 |
|
Huo Yaoyuan
|
c0fe91a84c
|
Merge branch 'master' into sharpen
|
2019-11-26 18:21:50 +08:00 |
|
Albie
|
09158b6b08
|
Merge branch 'master' into cinema-mod
|
2019-11-26 06:57:47 +00:00 |
|
Dean Herbert
|
709ec1404f
|
Centralise End/StartTime retrieval to extension method
|
2019-11-25 19:09:14 +09:00 |
|