Dean Herbert
25aff5d96e
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
2020-01-20 17:08:59 +09:00
Dean Herbert
d57f55f053
Apply remaining changes required to restore previous functionality
2020-01-15 19:09:49 +09:00
mcendu
5d160376c0
nullable-ize Mod.Icon
2020-01-14 21:22:00 +08:00
mcendu
76c70a7622
Move hit target bar height def to defaulthittarget
2020-01-11 21:19:46 +08:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
smoogipoo
dfa6575f75
Adjust mania HP increase values
2020-01-07 15:24:33 +09:00
mcendu
a897f497a2
remove LaneGlowPiece and GlowPiece
2020-01-04 18:35:37 +08:00
Albie Spriddell
3a903339d6
add playingverb and database migrations
2020-01-03 11:39:15 +00:00
Dean Herbert
ee332e0d42
Split out BlueprintContainer functionality further
2020-01-02 18:21:16 +09:00
mcendu
20c5748342
Use hitTarget in place of stageHint
2019-12-29 23:37:28 +08:00
mcendu
51000765dd
remove override
2019-12-29 23:29:00 +08:00
mcendu
61fb9f5613
Remove class StageHint and usage
2019-12-29 23:18:50 +08:00
mcendu
cdfbe96e9b
Make AccentColour of StageHint virtual
2019-12-29 14:52:51 +08:00
mcendu
5d2b5cc950
correct type of field stageHint
2019-12-28 14:05:46 +08:00
mcendu
bf162f148e
Move mania stage hint to its own class
2019-12-28 13:48:10 +08:00
Dean Herbert
3a5015d013
Merge branch 'master' into fix-hold-note-input
2019-12-27 21:48:38 +09:00
Dean Herbert
aa97487f8e
Merge branch 'master' into hp-drain
2019-12-27 14:58:22 +09:00
Dean Herbert
cfa1dfa1a4
Split out into own method
2019-12-27 11:37:05 +09:00
Dean Herbert
5260eb76d0
Merge remote-tracking branch 'upstream/master' into mania-judgement
2019-12-27 11:17:47 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
Dean Herbert
32843ffef5
Merge branch 'master' into fix-hold-note-input
2019-12-26 23:50:53 +09:00
mcendu
92dd1ade17
Attempt to implement mania-specific sprites
2019-12-26 21:03:21 +08:00
smoogipoo
d45556eb6a
Remove whitespace
2019-12-26 17:57:16 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
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
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
63c96d5a83
Fix tail note not properly capping result
2019-12-23 18:49:08 +09:00
smoogipoo
d6fd1007c4
internal -> public
2019-12-23 18:48:14 +09:00
smoogipoo
7ac6f68de8
Rewrite hold note input handling
2019-12-23 17:48:57 +09:00
smoogipoo
42853b5af6
Separate head/tail notes from hold note class
2019-12-23 17:48:57 +09:00
smoogipoo
6e7426a098
Simplify/improve beatmap conversion precheck
2019-12-23 17:44:18 +09:00
unknown
00ef2bd8d3
remove unused usings
2019-12-22 16:57:07 +08: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
Huo Yaoyuan
c457571da6
Use index and range expressions
2019-12-15 20:17:35 +08:00
unknown
01c036b0b0
implement backing beats for nightcore mods
2019-12-15 16:56:02 +08:00
Huo Yaoyuan
ddb2cfc46d
Use GetEndTime in Taiko and Mania
2019-12-14 18:16:13 +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
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
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Huo Yaoyuan
9ddfdab27a
Remove meaningless Convert calls.
2019-12-03 20:47:00 +08:00
Albie
7864899249
Merge branch 'master' into cinema-mod
2019-11-28 16:42:01 +00: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
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod
2019-11-25 07:25:30 +00:00
Berkan Diler
fccdbffa93
Use MathF instead of Math- functions when possible
...
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Albie Spriddell
3b9f59cb33
add cinema mod support
2019-11-23 17:34:53 +00:00
Albie Spriddell
20edaf4ba6
add cinema mod support
2019-11-23 17:32:16 +00:00
Huo Yaoyuan
8239c2da61
Refactor to avoid using try-finally as control flow.
2019-11-22 00:12:03 +08:00
Huo Yaoyuan
4cd7d67fe4
Use early return for if-pattern-matching.
2019-11-22 00:02:40 +08:00
Huo Yaoyuan
20f01ff3e9
Revert false positives of 'unused assignment'.
2019-11-21 23:54:38 +08:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08:00
Berkan Diler
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83
Merge branch 'master' into sharpen
2019-11-20 17:30:58 +08:00
Huo Yaoyuan
b5c20fecee
Merge branch 'master' into netstandard2.1
2019-11-19 21:40:12 +08:00
Huo Yaoyuan
608785b99a
Update .Net Standard projects to 2.1
2019-11-18 18:35:58 +08:00
Huo Yaoyuan
53bc2dcab7
Use costum displaying text for inherited references.
2019-11-18 15:29:18 +08:00
Huo Yaoyuan
b04bca7db6
Reference elements in origin definition.
2019-11-17 20:55:40 +08:00
Huo Yaoyuan
144812669d
Use static local functions.
2019-11-12 19:56:54 +08:00
Huo Yaoyuan
dcfa98414f
Use ??=.
2019-11-12 19:56:51 +08:00
Huo Yaoyuan
31cc0d13da
Use 'out var'.
2019-11-12 19:55:26 +08:00
Huo Yaoyuan
e5e8e70704
Use pattern matching.
2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2
Use compound assignment.
2019-11-12 19:53:50 +08:00
Huo Yaoyuan
4b75e0bf6a
Redundant assignment.
2019-11-12 19:53:47 +08:00
Dean Herbert
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
Huo Yaoyuan
ccc8aa6fa4
Apply brace style.
2019-11-11 20:13:13 +08:00
Dean Herbert
fd7bdc03ab
Merge remote-tracking branch 'upstream/master' into infrastructure
2019-11-11 11:11:59 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure
2019-11-08 19:10:49 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
smoogipoo
1f9f03dc66
Add temporary fix for null references
2019-11-07 13:36:54 +09:00
smoogipoo
8d42e45fd3
Make holdnote notes update lazily
2019-11-07 13:23:00 +09:00
smoogipoo
8141509a71
Split hold note blueprints into separate file
2019-11-07 12:59:05 +09:00
smoogipoo
2c1bfd62ef
Disallow selections to be moved outside of the playfield
2019-11-06 17:28:04 +09:00
Huo Yaoyuan
bcf8e3a9d4
Remove redundant properties from desktop projects.
...
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be
Normalize .props
2019-10-30 21:54:14 +08:00
smoogipoo
38c2c328ff
Rename HitObject -> DrawableObject in selection blueprints
2019-10-21 17:04:56 +09:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply
2019-10-18 19:45:10 +09:00
Dean Herbert
e3740fbc77
Merge pull request #6528 from smoogipoo/fix-mania-selection-movement
...
Fix mania hitobject selections not moving correctly
2019-10-18 16:28:04 +09:00
smoogipoo
c4cc960e15
Fix mania hitobject selections not moving correctly
2019-10-17 18:00:15 +09:00
smoogipoo
510ce9345f
Fix potential blueprint nullrefs with the new structure
2019-10-17 16:14:28 +09:00
smoogipoo
bc41eb176e
Clean up head/tail setting in various DHOs
2019-10-17 14:02:23 +09:00
smoogipoo
f429a8f7c2
Add back/obsolete old AddNested() method
2019-10-17 14:02:08 +09:00
smoogipoo
d8f3678c3c
Rename parameter
2019-10-17 12:53:54 +09:00
smoogipoo
8a284bacba
Make mania use the new nested hitobject structure
2019-10-17 12:37:20 +09:00
smoogipoo
79b2c7b480
Make BeginPlacement() set the hitobject start time
2019-10-16 20:04:15 +09:00
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
