1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 13:47:24 +08:00
Commit Graph

1213 Commits

Author SHA1 Message Date
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions (#6431)
Move editor selections relative to hitobject start positions
2019-10-11 19:35:11 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
smoogipoo
8b661e624d Remove drag from class/method namings + refactor 2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447 Move selection relative to the hitobject start positions 2019-10-08 18:57:03 +09:00
Dean Herbert
0fdb07346b
Merge branch 'master' into fix-mania-placement 2019-10-06 14:22:03 +08:00
smoogipoo
80585d446c Split applyPositionOffset into two methods and add xmldocs 2019-10-03 18:40:48 +09:00
smoogipoo
f1ff22cf8b Fix hold note blueprint placing in the wrong direction 2019-10-03 18:40:48 +09:00
smoogipoo
39369620fa Remove position offset from ColumnAt 2019-10-03 18:40:48 +09:00
smoogipoo
0a409075be Fix note placement offset not working for down-scroll 2019-10-03 18:40:48 +09:00
smoogipoo
754fbc59e1 Fix note placement being offset 2019-10-03 18:40:48 +09:00
smoogipoo
652acac87f Move placement movement event to BlueprintContainer 2019-10-03 16:14:42 +09:00
Bartłomiej Dach
8efab559c8 Remove unused using directives 2019-09-25 01:13:42 +02:00
Bartłomiej Dach
9323df26a1 Decouple bar line hitobjects from generator
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.

This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00
Vperus
2d99d41a6d Remove unused CORNER_RADIUS 2019-09-20 18:17:35 +03:00
Dean Herbert
61b396f235
Remove redundant length check 2019-09-18 17:09:43 +09:00
Dean Herbert
381daffe52 Generate better temporary frames to support framed handling flaws 2019-09-18 16:09:48 +09:00
Dean Herbert
77947e8309 Fix rewind tests failing 2019-09-17 22:33:27 +09: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
624e5644a4 Change osu!catch key trigger to occur on frame before positional change 2019-09-13 23:06:35 +09:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames 2019-09-13 19:23:15 +09:00
Dean Herbert
9fc60aeefc Merge branch 'master' into reset-dho-lifetimes 2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2 Move expire to DrawableHitObject 2019-09-12 19:29:08 +09:00
Dean Herbert
acdfeef1dc Improve how osu!catch stores and replays key actions 2019-09-12 18:33:46 +09:00
Dan Balasescu
f9b64446e9
Merge branch 'master' into mania-note-sizing 2019-09-12 14:20:28 +09:00
smoogipoo
b941f12688 Cleanup 2019-09-12 14:09:21 +09:00
Dan Balasescu
141e83fada
Merge branch 'master' into mania-hit-explosion 2019-09-12 13:53:42 +09:00
smoogipoo
bbf80f63aa Publicly expose column width constant 2019-09-12 13:53:05 +09:00
smoogipoo
b1c0b080ec Fix bad hit explosion anchoring 2019-09-12 13:52:27 +09:00
Dean Herbert
06618b6d02 Fix osu!mania minor barline alpha not being respected 2019-09-11 18:45:47 +09:00
Dean Herbert
b9e71d26b2 Dim column backgrounds further 2019-09-11 18:21:39 +09:00
Dean Herbert
c7186efd53 Reduce opacity of judgement area 2019-09-11 18:21:29 +09:00
Dean Herbert
6bfdadb22f Increase column width 2019-09-11 18:20:41 +09:00
Dean Herbert
8f6bc6fd5c Make osu!mania hit explosions more explodey 2019-09-11 18:19:47 +09:00
Dean Herbert
44d90a4e86 Increase note height 2019-09-11 18:16:14 +09:00
Dean Herbert
da6ba20fc8 Reduce glow on notes 2019-09-11 18:15:03 +09:00
Dean Herbert
e682ca4fd9 Adjust osu!mania scroll speed defaults to be more sane 2019-09-11 12:51:54 +09:00
Dean Herbert
af3bb5a2cd Centralise and share bar line generation code between rulesets 2019-09-10 13:30:54 +09:00
Dean Herbert
f925e781a9 Refactor HitWindows for legibility 2019-09-06 15:24:14 +09:00
Dean Herbert
05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
smoogipoo
8302658186 Fix other potential nullref cases that rider missed 2019-09-02 18:31:33 +09:00
smoogipoo
4c150839c0 Fix potential diffcalc hitwindow nullref 2019-09-02 17:38:58 +09:00
smoogipoo
f3656475de Return null hitwindows for non-time-based objects 2019-09-02 16:10:30 +09:00
Dean Herbert
70e417533f Update naming 2019-08-30 15:13:29 +09: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
6641811125 Add EditorWorkingBeatmap for reuse of the playable beatmap 2019-08-29 19:41:12 +09:00
smoogipoo
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
Dan Balasescu
d8a48a37d1
Merge branch 'master' into editor-refactor 2019-08-29 18:22:42 +09:00
smoogipoo
87e28ab1f9 Remove non-generic DrawableEditRuleset 2019-08-29 18:12:29 +09:00
Dean Herbert
1597cf874e
Merge branch 'master' into relative-beat-lengths 2019-08-28 20:26:20 +09:00
Dean Herbert
ecfcbe3723 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 20:21:56 +09:00
Dean Herbert
9a98f39f06 Share logic with other rulesets (and make default) 2019-08-28 18:12:47 +09:00
smoogipoo
fff2da7289 Fix hold notes disappearing instantaneously 2019-08-27 12:59:57 +09:00
smoogipoo
6014a66804 Add initial fade transform to fix rewind 2019-08-27 12:22:31 +09:00
iiSaLMaN
c11f508400 Use transform management for mania hit objects 2019-08-26 22:06:30 +03:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths 2019-08-26 18:59:50 +09:00
smoogipoo
d4a296f911 Slight refactoring 2019-08-26 17:45:12 +09:00
smoogipoo
fd4c6e08ca Merge remote-tracking branch 'origin/master' 2019-08-26 17:37:06 +09:00
smoogipoo
e30ae57ea6 Scale mania beat lengths relative to each other 2019-08-26 12:51:23 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Desconocidosmh
77e9e89fec Refactoring 2019-08-19 20:45:23 +02:00
Desconocidosmh
b3556403aa Make GetNextObject() a virtual method 2019-08-19 16:18:25 +02:00
Desconocidosmh
0f9706e798 Fix using invalid constant 2019-08-17 00:18:25 +02:00
Desconocidosmh
7de1757aae Small improvements 2019-08-16 12:50:48 +02:00
Desconocidosmh
24d2b504dd Stop autoplay from missing on very dense notes when playing mania 2019-08-16 12:39:54 +02:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Dean Herbert
7e9c100c9b Apply new resharper refactors 2019-08-09 12:29:33 +09:00
smoogipoo
8a64ab0384 Remove generics from IApplicableToBeatmap 2019-08-01 12:39:32 +09:00
Dean Herbert
c3b81bef4a Flip default to the preferred method going forward 2019-07-22 15:55:38 +09:00
Dean Herbert
8327452fe1 Make AccentColour a bindable 2019-07-22 14:48:59 +09:00
Dean Herbert
9bed0094de Merge remote-tracking branch 'upstream/master' into android 2019-07-02 19:40:50 +09:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
Shane Woolcock
17d103181c Merge branch 'master' into android 2019-06-18 20:05:14 +09:30
HoLLy
7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
tangalbert919
6fd1eb5e08 Merge remote-tracking branch 'upstream/master' into android 2019-05-08 08:15:03 -05:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +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
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
smoogipoo
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
smoogipoo
4c5f41e40f Implement hp increase for mania 2019-04-22 17:04:18 +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
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
42eaabe24c Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes 2019-03-29 12:59:51 +09:00
Dean Herbert
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dean Herbert
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
Dean Herbert
09a7950a3b Fix handlers for other rulesets 2019-03-28 15:09:06 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert
39df8cce19 Fix incorrect usage of InternalChildren
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
tangalbert919
00c659a5ca Merge all changes from 2019.321.0 to android 2019-03-20 11:00:27 -05:00
Dean Herbert
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
Dean Herbert
3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
tangalbert919
e865ac2086 Merge remote-tracking branch 'origin/master' into android 2019-03-17 09:39:34 -05:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns 2019-03-13 18:17:42 +09:00
David Zhao
3b3b1e51ee Move hit animation logic into virtual method 2019-03-12 19:41:33 +09:00
David Zhao
12f334035f Create properties for use in DrawableManiaJudgement 2019-03-12 19:23:24 +09:00
Albert Tang
7f30fce3fe
Merge branch 'master' into android 2019-03-08 10:39:24 -06:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
Dean Herbert
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
Dean Herbert
d70b373af9
Merge branch 'master' into mod-wind 2019-03-06 14:04:04 +09:00
tangalbert919
1e6cb3e7d8 Merge remote-tracking branch 'upstream/master' into android 2019-03-05 17:56:13 -06: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
smoogipoo
c722ea0299 Add space 2019-03-01 14:30:58 +09:00
andy840119
e634475bf4 IsDuel -> Dual 2019-02-28 23:40:03 +09:00
andy840119
4b2be4612f support duel mode in mania beatmap 2019-02-28 19:07:43 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Dean Herbert
cd3f3be79d
Merge branch 'master' into master 2019-02-25 09:59:18 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
Ignacio Conde
a62f150962 Fixed Issue #4159 2019-02-22 02:28:38 -03:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
d6a2fe6891
Remove excess newline 2019-02-20 10:29:08 +09:00
smoogipoo
4efc03cdf0 Add beatmap argument + fix crashes 2019-02-19 17:56:38 +09:00
smoogipoo
5457097342 Update with PopulateAttributes() removal 2019-02-19 17:48:00 +09:00
smoogipoo
bf17826363 Fix post-merge errors 2019-02-19 16:30:29 +09:00
smoogipoo
9cce9ce97c Consider aggregate peaks 2019-02-18 15:00:32 +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
smoogipoo
e319a760b8 Add mania difficulty calculator test 2019-02-15 16:25:44 +09:00
tangalbert919
7349a6c527 Merge remote-tracking branch 'upstream/master' into android 2019-02-12 20:41:54 -06:00
HoLLy
ae9d5f999c Use correct DifficultyAttributes where possible 2019-02-06 21:28:42 +01:00
Dean Herbert
2d7c23dd9f Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-02-04 12:15:53 +09:00
tangalbert919
80006109a2 Merge remote-tracking branch 'upstream/master' into android 2019-01-29 18:13:43 -06:00
LeNitrous
03e57d0423 fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp 2019-01-26 20:15:19 +08:00
LeNitrous
73dbf5712d add license headers 2019-01-26 13:43:27 +08:00