h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 05:52:54 +08:00
Code Issues Releases Wiki Activity
68,432 Commits 3 Branches 657 Tags 357 MiB
ace1a57242
Commit Graph

409 Commits

Author SHA1 Message Date
Dean Herbert
0bcd0cda6b Fix taiko drawable hit content not correctly being removed on regeneration 2021-05-21 16:41:40 +09:00
Dean Herbert
7bc8a4bb5f Apply same logic changes to IsStrong status 2021-05-21 16:15:27 +09:00
Dean Herbert
a5ca736e37 Fix RecreatePieces being called more than once 2021-05-21 16:10:48 +09:00
Dean Herbert
40c8378d81 Fix type-to-sample mapping being applied too late 2021-05-21 14:37:22 +09:00
Bartłomiej Dach
370f56eadb Make strong hit DHOs public for pool registration 2020-12-20 18:02:34 +01:00
Bartłomiej Dach
0c5333bd58 Adjust top-level hitobjects to support nested pooling 2020-12-20 17:57:19 +01:00
Bartłomiej Dach
ae6dedacaf Implement nested strong hit application 2020-12-20 16:26:39 +01:00
Bartłomiej Dach
d823c77a63 Implement swell tick application 2020-12-20 16:26:39 +01:00
Bartłomiej Dach
3bd4279589 Implement drum roll tick application 2020-12-20 16:26:39 +01:00
Bartłomiej Dach
e3b6eaa390 Implement swell application 
Also removes a weird sizing application that seems to have no effect
(introduced in 27e63eb; compare removals for other taiko DHO types in
9d00e5b and 58bf288).
 2020-12-20 16:26:39 +01:00
Bartłomiej Dach
8b6bc09b8f Implement drum roll application 2020-12-20 16:26:16 +01:00
Bartłomiej Dach
e32b1c34ca Implement hit application 2020-12-20 16:26:16 +01:00
Bartłomiej Dach
7b350fc8e5 Prepare strongable DHO for HO application 2020-12-20 15:42:24 +01:00
Bartłomiej Dach
a25cd910f8 Prepare base DHO for HO application 2020-12-20 15:42:24 +01:00
Dan Balasescu
48805a82f9
Merge branch 'master' into taiko-strong-state-refactor 2020-12-15 11:46:52 +09:00
Dan Balasescu
52d9864818
Merge pull request #11179 from bdach/swell-rewind-crash 
Fix swells crashing on rapid seeks in editor
 2020-12-15 11:21:37 +09:00
Bartłomiej Dach
523e803440 Fix swells crashing on rapid seeks in editor 2020-12-15 00:28:00 +01:00
Bartłomiej Dach
2051f49f78 Ensure correct initial state of taiko bar lines 2020-12-14 21:58:17 +01:00
Bartłomiej Dach
512549b4ea Rename DrawableTaikoStrong{-> able}HitObject 2020-12-14 21:47:31 +01:00
Bartłomiej Dach
5af1ac1b53 Rename TaikoStrong{-> able}HitObject 2020-12-14 21:46:02 +01:00
Bartłomiej Dach
7ba04a2cc3 Merge branch 'master' into taiko-strong-state-refactor 2020-12-14 21:44:50 +01:00
Dean Herbert
7041503063 Avoid intermediary delegate 2020-12-14 15:34:32 +09:00
Bartłomiej Dach
a8e86a20e1 Unify bar line types & prepare for pooling 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
f83c5fa81d Add backing bindable for major field 2020-12-13 22:12:26 +01:00
Bartłomiej Dach
080f7a3e32 Add/fix up xmldocs with clarifications 2020-12-13 14:39:32 +01:00
Bartłomiej Dach
091b08b507 Scope drawable nested hits more closely to models 2020-12-13 14:38:16 +01:00
Bartłomiej Dach
61c488cd5e Create HO-specific nested hit types 2020-12-13 13:08:32 +01:00
Bartłomiej Dach
4d444df6b3 Rename DHO CreateStrong{-> Nested}Hit 2020-12-13 13:08:32 +01:00
Bartłomiej Dach
b1635ecd16 Reflect can-be-strong split in DHO structure 2020-12-13 13:08:30 +01:00
Bartłomiej Dach
f74567e8eb Introduce base class for hitobjects that can be strong 2020-12-13 12:36:39 +01:00
Bartłomiej Dach
1ddc896b76 Rename Strong{-> Nested}HitObject 2020-12-13 12:34:14 +01:00
ekrctb
c70b13ecc2 Adjust namespace 2020-12-07 12:30:25 +09:00
ekrctb
f78bd7c739 Move piece files of Taiko ruleset 2020-12-07 12:29:14 +09:00
smoogipoo
5760e1c1fc Make HitSampleInfo immutable 2020-12-01 15:37:51 +09:00
smoogipoo
0414e5c550 Add MaximumJudgementOffset to DrawableHitObject, use in more places 2020-11-26 01:12:42 +09:00
Dean Herbert
a3dc1d5730 Update existing implementations 2020-11-04 17:14:23 +09:00
Dean Herbert
cb96a40dd6 Fix bindable propagation potentially making swells strong 2020-10-09 17:12:10 +09:00
Dean Herbert
144726e3c6 Better guard against taiko swells becoming strong 2020-10-09 17:12:01 +09:00
Bartłomiej Dach
1f0620ffd4 Replace assignment references to HitResult.Miss with Judgement.MinResult 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
903bcd747e Revert unintended changes 2020-09-29 16:39:29 +09:00
smoogipoo
bad48d6d44 Merge branch 'master' into scoring-standardisation 2020-09-29 16:33:38 +09:00
smoogipoo
c45b5690cf Use new hit results in taiko 2020-09-29 16:33:38 +09:00
Bartłomiej Dach
d61a8327da Fix rim flying hits changing colour 2020-09-26 20:59:55 +02:00
Dean Herbert
33fad27ec2 Avoid API change to DrawableHitObject 2020-09-24 13:28:29 +09:00
Dean Herbert
156edf24c2 Change properties to methods and improve naming 2020-09-24 13:22:31 +09:00
Dean Herbert
9a0e5ac154 Handle type/strength changes from samples changes 2020-09-23 18:09:40 +09:00
Dean Herbert
8f3eb9a422 Fix taiko sample selection not updating when changing strong/rim type 2020-09-23 17:59:11 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
Dean Herbert
dd7dbfd548 Rename to IHasDuration 2020-05-29 16:45:47 +09:00
Dean Herbert
534dccc0c3 Move sett from EndTime to Duration 2020-05-29 16:45:47 +09:00
Dean Herbert
280b0adb1d Split out IHasPath from IHasCurve to better define hitobjects 2020-05-29 16:45:47 +09:00
Dean Herbert
a2eec5d963 Fix strong bindable changes for DrumRolls 2020-05-29 16:45:47 +09:00
Dean Herbert
50fcd4149f Support Strong bindable changes 2020-05-29 16:45:47 +09:00
Dean Herbert
4e9631b546 Support HitType bindable changes 2020-05-29 16:45:47 +09:00
Dean Herbert
3487c1fd1b Add menus to mark as rim and strong 2020-05-29 16:45:47 +09:00
smoogipoo
bc35bc5efb Merge branch 'master' into applydefaults-cancellation 2020-05-25 16:45:30 +09:00
Dean Herbert
db4e3047dd Add test for final sample output 2020-05-19 23:28:13 +09:00
Dean Herbert
013683c23b Fix taiko rim markers incorrectly playing as whistle samples 2020-05-19 00:17:13 +09:00
smoogipoo
6534510999 Use cancellation token in taiko swell/drumroll 2020-05-15 19:25:14 +09:00
smoogipoo
98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
Dean Herbert
77041bdbb5 Move implementation to DrawableHit to avoid "breaking" legacy encoding 2020-05-11 16:29:50 +09:00
Dean Herbert
b4d790c076 Fix taiko sample mapping for strong hits 2020-05-11 12:53:54 +09:00
Dean Herbert
52cf1e1859 Fix hit type not being provided and hit time offset not being considered 2020-04-27 16:48:27 +09:00
Dean Herbert
b9f28c8373 Combine hit types and remove old drumroll hits using a more efficient method 2020-04-27 16:13:28 +09:00
Dean Herbert
1cd4fd2ac4
Merge branch 'master' into taiko-drumroll-party 2020-04-27 13:27:10 +09:00
smoogipoo
20ae973e4a Use max result instead of GOOD 2020-04-27 12:29:11 +09:00
smoogipoo
7dc090cc24 Add support for hit explosions 2020-04-27 12:23:53 +09:00
smoogipoo
dd36b839b9 Refactor 2020-04-27 12:01:31 +09:00
Dean Herbert
4ca7ce7715
Merge branch 'master' into taiko-barline-skinning 2020-04-25 18:58:44 +09:00
Tim Oliver
2a197db481 Merge branch 'master' into taiko-drumroll-party 
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
 2020-04-25 13:31:50 +08:00
Tim Oliver
2be3a8184d Removed modifications to drum roll object 2020-04-25 00:15:37 +08:00
Dan Balasescu
b3175f9dfa
Merge branch 'master' into taiko-playfield-background-skinning 2020-04-24 19:27:38 +09:00
Tim Oliver
c059588a09 Removed un-needed unproxy method 2020-04-23 18:26:40 +08:00
Tim Oliver
f1ae8af581 Removed un-needed using directives 2020-04-23 18:16:05 +08:00
Dean Herbert
12f156dcec Add taiko barline skinning support 2020-04-23 14:32:48 +09:00
Dean Herbert
58bf288595 Remove DrawableHit's custom sizing logic 
Turns out this was unnecessary and never actually being used.
 2020-04-23 12:17:52 +09:00
Tim Oliver
81c51f0661 Merge branch 'master' into taiko-drumroll-party 
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
#	osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
 2020-04-22 23:15:48 +08:00
Tim Oliver
26779a57b4 Exposed public ability to unproxy content 2020-04-22 22:49:30 +08:00
Tim Oliver
44405d4771 Moved result to load complete for flying hits 2020-04-22 15:50:23 +08:00
smoogipoo
ba12e23d9e Fix inspection 2020-04-22 09:06:04 +09:00
smoogipoo
d8fdd73e17 Implement IHasCurve on DrumRoll 2020-04-22 09:06:04 +09:00
Tim Oliver
5b4f69bb8c Moved flying hit objects to separate files 2020-04-20 13:32:51 +08:00
Dean Herbert
58a1c6e171 Reapply taiko visibility hack at a higher level 2020-04-17 19:52:58 +09:00
Dean Herbert
f36477e39d Add back "filled" property setting 2020-04-16 10:04:09 +09:00
Dean Herbert
07632cd1e5 Remove unnecessary container logic 2020-04-15 18:44:12 +09:00
Dean Herbert
eb165840cb Add remaining taiko hitobject skinnables and expose as SkinnableDrawable for safety 2020-04-15 18:03:23 +09:00
Andrei Zavatski
f4b5a17b65 Fix typo in DrawableTaikoHitObject 2020-04-15 07:00:38 +03:00
Dean Herbert
c3f0475748 Make CirclePiece abstract 2020-04-12 17:40:22 +09:00
Tim Oliver
162a85042a Removed un-needed using 2020-04-12 10:38:22 +08:00
Tim Oliver
3ad36c7b84 Moved flying objects to use ignore hit judgements 2020-04-11 17:20:52 +08:00
Tim Oliver
1c0ad13d82 Added ignore hit object 2020-04-11 17:20:37 +08:00
Dean Herbert
009b138364 Prepare for skinnable versions 2020-04-11 14:19:59 +09:00
Dean Herbert
78db83fd0e Remove TaikoPiece class and localise kiai for now 2020-04-11 14:19:59 +09:00
Dean Herbert
7fba291134 Change inheritance of taiko hit pieces to better allow for skinning 2020-04-11 13:33:49 +09:00
Tim Oliver
b883586add Added logic to allow strong notes 2020-04-08 12:46:02 +08:00
Tim Oliver
9d5a977501 Added judgement forwarder to drumroll tick object 2020-04-08 12:46:02 +08:00
Tim Oliver
1057981c79 Added arbitrary hit handler to drum roll object 2020-04-08 12:46:02 +08:00
Tim Oliver
6e12f1b69b Added “instant fly” variant of hit notes 2020-04-08 12:46:02 +08:00
smoogipoo
5106d275ca Remove CentreHit/RimHit hitobject abstraction 2020-03-23 12:08:15 +09:00
Dean Herbert
0e29d3c4a2 Correctly expire bar lines in osu!taiko and osu!mania 2020-02-23 13:50:05 +09:00
Dean Herbert
ffc7eaa3f2 Fix hitobjects with unknown lifetimes by enforcing non-null judgement 
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.

This fixes BananaShower and JuiceStreams in osu!catch.

This also makes HitObject abstract and cleans up convert HitObject implementations.
 2020-02-23 13:49:06 +09:00
Dean Herbert
cd6902a312 Make EndTime and RepeatCount settable 2020-02-05 17:52:51 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
smoogipoo
0f8a76afde Remove manual hitobject sample namespacing 2020-01-02 14:27:27 +09:00
Huo Yaoyuan
40b43b85f1 CA1715: use prefix for generic parameters. 2019-12-17 13:00:25 +08:00
Huo Yaoyuan
ddb2cfc46d Use GetEndTime in Taiko and Mania 2019-12-14 18:16:13 +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
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08: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
d49ef6a36b Make taiko use the new nested hitobject structure 2019-10-17 11:57:00 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +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
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
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
smoogipoo
5efd455ce4 Fix taiko sample namespace 2019-09-04 12:47:10 +09:00
smoogipoo
8302658186 Fix other potential nullref cases that rider missed 2019-09-02 18:31:33 +09:00
smoogipoo
f3656475de Return null hitwindows for non-time-based objects 2019-09-02 16:10:30 +09:00
Dean Herbert
13bb0676b1
Merge branch 'master' into fix-taiko-swell-tick-display 2019-09-02 13:47:04 +09:00
smoogipoo
1df422e591 Hide taiko swell ticks 2019-09-02 13:30:55 +09:00
smoogipoo
5b685c4cd2 Fix swell ticks having non-zero time offsets 2019-09-02 13:25:39 +09:00
Dean Herbert
9a98f39f06 Share logic with other rulesets (and make default) 2019-08-28 18:12:47 +09:00
smoogipoo
3723c441d2 Merge remote-tracking branch 'origin/master' into fix-taiko-proxy-rewind 
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
 2019-08-27 17:42:45 +09:00
smoogipoo
2b22fd799d Use constant value for offset 2019-08-27 15:33:53 +09:00
smoogipoo
bc7a81e733 Add initial fade transform 2019-08-27 15:33:53 +09:00
smoogipoo
dba3679817 Fix DrawableSwell not proxying its content in time/correctly 2019-08-27 15:33:28 +09:00
smoogipoo
b85e62a6e2 Fix taiko proxies being removed on rewind 2019-08-27 15:24:49 +09:00
iiSaLMaN
0eef398ca7 Remove redundant using directive 2019-08-27 05:19:21 +03:00
iiSaLMaN
cd68d030bd Remove unnecessary UpdateState overrides 2019-08-27 05:04:34 +03:00
iiSaLMaN
843da26dba Use transform management for taiko hit objects 2019-08-27 05:03:56 +03:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dean Herbert
c3b81bef4a Flip default to the preferred method going forward 2019-07-22 15:55:38 +09:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +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
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
7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +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
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00