1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 13:22:57 +08:00
Commit Graph

211 Commits

Author SHA1 Message Date
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +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
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
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
unknown
002a125b4a make ModDifficultyAdjust generic 2019-12-12 21:14:26 +08:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
unknown
b795532aa5 add difficulty adjustment mods 2019-12-11 19:43:16 +08:00
Albie Spriddell
20edaf4ba6 add cinema mod support 2019-11-23 17:32:16 +00:00
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Dean Herbert
a15828ab25 Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
smoogipoo
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
smoogipoo
8a64ab0384 Remove generics from IApplicableToBeatmap 2019-08-01 12:39:32 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert
d70b373af9
Merge branch 'master' into mod-wind 2019-03-06 14:04:04 +09:00
smoogipoo
78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00
LeNitrous
c271a3a781 remove ruleset specific mods 2019-03-04 17:36:44 +08:00
LeNitrous
ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Ignacio Conde
a62f150962 Fixed Issue #4159 2019-02-22 02:28:38 -03:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo
68725dc005 Implement new difficulty calculator for Rulesets.Mania 2019-02-18 15:00:20 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
LeNitrous
c6e26a92ec add wind up and wind down mods 2019-01-26 12:15:45 +08:00
Unknown
8ddff673b7 revert previous rename and rename ruleset specific classes instead 2019-01-25 11:14:37 +01:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container 2018-08-06 04:22:21 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
smoogipoo
577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +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
smoogipoo
f49b7d6e16 Add mania direction to settings 2018-06-11 14:36:19 +09:00
smoogipoo
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
Dan Balasescu
4dfc328117
Remove unused array 2018-06-08 17:46:38 +09:00
smoogipoo
279a2844f0 Actually make ManiaHitObjectComposer constructible/testable 2018-06-07 16:08:37 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
smoogipoo
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +09:00
smoogipoo
4019683f6c Implement osu!mania performance calculation 2018-05-16 01:24:53 +09:00
smoogipoo
803200ff6a Apply similar changes to other rulesets 2018-05-15 17:40:19 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b Add support for replay mods 2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
9f644571ea
Merge branch 'master' into mania-difficulty 2018-03-12 13:31:48 +09:00
tgi74000
a4dfeff2d7 Renamed ManiaMirrorMod to ManiaModMirror 2018-03-10 08:44:46 +01:00
tgi74000
1f48cfb79a Added Mirror Mod for Mania 2018-03-08 17:35:20 +01:00
Dean Herbert
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Poyo
e187c6453d Added mania-difficulty mod support 2018-03-05 18:19:06 -08:00
smoogipoo
c9c65cab53 CreateReplayFrame -> CreateConvertibleReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
222ae70062 Populate rulesets with their replay frames 2018-03-01 02:28:14 +09:00
smoogipoo
3d36fd3676 Update xmldoc to be more descriptive of single/dual stages 2018-01-22 16:11:26 +09:00
smoogipoo
ba58b25f01 Fix showing too many keybindings 2018-01-22 15:47:31 +09:00
smoogipoo
1350b68f15 DualStages always doubles the column count in lazer 2018-01-22 15:18:39 +09:00
smoogipoo
eede8333ba getVariantType -> getPlayfieldType 2018-01-22 15:18:11 +09:00
smoogipoo
77c4da5f0f KeyCoop -> DualStages 2018-01-22 15:11:15 +09:00
smoogipoo
65a2e09593 Privatise VariantMappingGenerator to ManiaRuleset 2018-01-22 15:03:05 +09:00
smoogipoo
2674859b54 ManiaKeyBindingVariantType -> PlayfieldType 2018-01-22 14:59:17 +09:00
smoogipoo
286b1bb81f Solo -> Single, Coop -> Dual 2018-01-22 14:57:25 +09:00
smoogipoo
3b47c0fea0 Remove versus-mode variant 2018-01-22 14:54:47 +09:00
smoogipoo
293023d99a Fix keybinding offsets due to special keys 2018-01-22 14:38:41 +09:00
smoogipoo
8a7892b66a Make variant keybindings work 2018-01-15 19:29:51 +09:00
smoogipoo
dd67070b6f ManiaAction.Special -> ManiaAction.Special1 2018-01-15 17:58:04 +09:00
smoogipoo
351afc350e Implement co-op keybindings 2018-01-15 17:43:45 +09:00
ANDY840119-PC\andy840119
cf0d9e4d9b not sure is it a goodway to delete mania ManiaAction.Special or add more 2018-01-14 21:20:01 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
Dean Herbert
679134c030 Add ShortName to rulesets 2017-12-08 18:55:25 +09:00
smoogipoo
62155e6dd5 Make DifficultyCalculator support mod applications
Fixes https://github.com/ppy/osu/issues/476.
2017-11-17 12:36:07 +09:00
smoogipooo
5e32d95ad2 Remove Ruleset's CreateScoreProcessor method 2017-09-13 16:37:05 +09:00
smoogipooo
8737a1b1a5 Implement osu!mania auto replay generation. 2017-09-12 15:52:32 +09:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
Dean Herbert
bdd0a51c6e Fix left keys setting defaults in incorrect order 2017-08-23 16:10:10 +09:00
smoogipooo
68e7cf854f Add variant names. 2017-08-23 14:19:14 +09:00
smoogipooo
0e41fc8842 Add mania bindings. 2017-08-23 12:49:50 +09:00
Dean Herbert
16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
MrTheMake
81289db33b CI fix, fixed nullref and removed abstraction of GetAutoplayMod 2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
MrTheMake
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
Dean Herbert
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0 Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
smoogipooo
a3299809fe Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
2017-06-05 10:19:53 +09:00
smoogipooo
b46a9dd0ef Add gravity mod. 2017-06-02 17:33:58 +09:00
Shawdooow
ecc0d0b11c Daycore mod 2017-05-30 12:49:06 -04:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00