1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 19:32:58 +08:00
Commit Graph

269 Commits

Author SHA1 Message Date
smoogipoo
1b7b6f341c Migrate Rulesets.Taiko to the new judgement system 2018-08-02 16:09:04 +09:00
Dean Herbert
5e6634cd00
Merge branch 'master' into fix-taiko-rewind 2018-06-25 17:10:53 +09:00
smoogipoo
185789bc7f Remove unused variable 2018-06-25 16:13:15 +09:00
Dan Balasescu
26d9e3cc10
Merge branch 'master' into fix-taiko-rewind 2018-06-25 16:08:52 +09:00
smoogipoo
70e9f7cb8d Always proxy taiko hits when hit 2018-06-25 15:55:09 +09:00
Dean Herbert
5b344525e1 Move proxy state check to base class 2018-06-18 00:27:18 +09:00
smoogipoo
4575319102 Privatise the proxied content 2018-06-17 17:56:46 +09:00
smoogipoo
0f9c05d1e6 Fix taiko swells not properly rewinding 2018-06-11 22:32:08 +09:00
Dan Balasescu
1b12820de9
Restore a removed comment 2018-06-11 21:54:11 +09:00
smoogipoo
22dfe46572 Make taiko hitobject properly unproxy when rewound 2018-06-11 21:46:45 +09:00
smoogipoo
b6fb01440b Fix taiko hit states not being reverted on rewind 2018-06-11 20:44:26 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
smoogipoo
7d027098ec Fix drumroll completions always giving GREAT judgements
Due to requiredgoodhits/requiredgreathits being calculated prior to nested hitobjects.
2018-05-14 14:13:07 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
cb3d0db555 Move combo colours completely out of HitObjects 2018-03-20 15:50:12 +09:00
smoogipoo
20acc601bb Fix up breaking taiko changes 2018-03-16 16:10:09 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
smoogipoo
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
smoogipoo
df84b23847 Fix possible nullref when there are 0 drumroll ticks 2018-03-05 21:19:40 +09:00
smoogipoo
7ce3e60722 Fix drumrolls giving GOOD judgements too one tick too late 2018-03-05 21:19:36 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
3d167c40ae Remove now unneeded Math.Abs call 2018-02-08 14:15:58 +09:00
smoogipoo
9225e883c1 Add + use HalfHitWindow 2018-02-02 20:29:50 +09:00
smoogipoo
9bc4bf33a6 Use HitWindows for taiko 2018-02-02 18:53:30 +09:00
smoogipoo
bfdfb52666 Fix a few usages of AllJudged possibly not being correct 2018-01-15 15:28:08 +09:00
smoogipoo
9d00e5bb7d Make ScrollingHitObjectContainer handle nested hitobjects 2018-01-11 15:08:30 +09:00
smoogipoo
6255aaab68 Per-hitobject lifetime management 2018-01-10 19:17:43 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
add68ff068 Fix swells not stopping at the hit position 2018-01-04 21:45:29 +09:00
smoogipoo
4fee76ba0b Fix drumroll lengths 2018-01-04 20:56:28 +09:00
smoogipoo
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
smoogipoo
0c4e4012f8 Taiko drumroll ticks should just play the playfield samples 2017-12-26 19:57:40 +09:00
smoogipoo
9690591593 Make taiko use namespaced hitsounds
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
smoogipoo
35d7fa8a81 Cleanup things that are now not needed with these changes 2017-12-26 14:18:38 +09:00
smoogipoo
14162b5d46 Make InputDrum handle all Normals/Claps, hitobjects all others 2017-12-26 14:18:23 +09:00
smoogipoo
affdd81563 Remove unused usings 2017-12-25 17:29:44 +09:00
smoogipoo
8bfdee586b Rename SwellSampleMapping -> DrumSampleMapping 2017-12-25 17:29:04 +09:00
smoogipoo
d288d8a51f Remove SampleInfoList 2017-12-25 15:40:01 +09:00
smoogipoo
844e39a9f6 Make Swells play samples while they're being hit 2017-12-25 15:04:22 +09:00
smoogipoo
8529eb1d3a Make strong hit misses not count as misses 2017-12-25 14:49:39 +09:00
Dean Herbert
298ac5468f Fix regressions 2017-12-23 17:24:28 +09:00
Dean Herbert
46865bbacd Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
# Conflicts:
#	osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
smoogipoo
6a29f6020a Make HitObjects construct nested hit objects 2017-12-22 21:42:54 +09:00
smoogipoo
ac1d27e925 Fix possible nullref exceptions 2017-12-21 23:02:46 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
FreezyLemon
9d3d9bcdc8 Corrected the return values for taiko DrawableHit and DrawableHitStrong (OnPressed == true if new Judgement occurs and is a hit) 2017-12-08 09:42:10 +01:00
FreezyLemon
43c270ea49 Rolled back the bad earlier implementation 2017-12-07 21:18:51 +01:00
FreezyLemon
3e8db8c5e1 Enabled strong taiko hitobjects playing samples again.
Also removes the first hitsound from the strong hitobject so only the "hitfinish" sound gets played.
2017-11-29 06:27:25 +01:00
FreezyLemon
bc3f11fdb8 Added PlaysSamples property to prevent certain DrawableHitObjects from playing their samples on hit. Also added this to TaikoObjects so their hitsounds won't be played (will be done by the TaikoRulesetContainer) 2017-11-29 06:24:13 +01:00
smoogipoo
5c2b1d4be2 Update xmldoc 2017-11-02 21:58:29 +09:00
smoogipoo
e2b6003f98 Make taiko use the new "Final" field
Ensures that the first hit on HitStrongs is _always_ non-final unless it was a miss. The second hit is always final.
2017-11-02 21:55:50 +09:00
smoogipoo
fe00ac7e41 Make DrawableHitObject/ScoreProcessor support rewinding 2017-11-02 21:21:07 +09:00
Dean Herbert
d5892cf54e Add a bool to specify whether judgements should be visible for certain DrawableHitObjects 2017-10-09 20:17:05 +09:00
smoogipooo
fb05552ac4 Fix one more case of incorrect offset. 2017-09-12 18:36:31 +09:00
Dean Herbert
1194e46ef1 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-12 17:46:21 +09:00
smoogipooo
27e3c9e778 Remove usings. 2017-09-12 11:51:19 +09:00
smoogipooo
d6bf5c38b7 Move Kiai bool to HitObject. 2017-09-12 10:01:07 +09:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo
0cc443e618 Remove all generic judgements. 2017-09-06 18:05:51 +09:00
smoogipooo
29941019a5 Hacky way to make osu! and taiko work again. 2017-09-06 17:44:51 +09:00
smoogipooo
ac8ec31b61 Make judgements able to be "added" plus make everything compile and run. 2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5 Combine Judgement.HitResults into one. 2017-09-06 17:01:48 +09:00
smoogipooo
d080a7e970 Determine size of ScrollingContainer a bit better to avoid taiko weirdness 2017-08-22 20:53:19 +09:00
smoogipooo
6a7e868a2e Make taiko major bar line triangles show up again. Fixes #1081 2017-08-21 15:36:01 +09:00
smoogipooo
7a5708ce92 Further support for null judgements. 2017-08-21 15:35:16 +09:00
Dean Herbert
8364339617 Adjust with proposed formatting 2017-08-20 23:47:07 +09:00
Dean Herbert
a18b2bd5f0 Hook everything up 2017-08-20 22:21:16 +09:00
Dean Herbert
59fc6cbed7 Add action support to InputDrum 2017-08-20 21:51:56 +09:00
Dean Herbert
ff84eb219b Add action support to taiko 2017-08-20 21:38:09 +09:00
smoogipooo
bb8c533802 Fix CI issues. 2017-08-09 17:34:09 +09:00
smoogipooo
8b4f28318f Fix drum roll ticks. 2017-08-09 16:19:31 +09:00
smoogipooo
27e63eb7c4 Fix up sizing issues. 2017-08-09 10:54:00 +09:00
smoogipooo
a95ee7494f Initial conversion of taiko to use ScrollingPlayfield. 2017-08-08 16:01:18 +09:00
smoogipooo
ba31bfcdf1 CI fixes. 2017-08-03 20:44:05 +09:30
smoogipooo
351d255355 Fix brokenness due to relative sizes. 2017-08-03 20:12:31 +09:30
smoogipooo
0a4464bbe8 Merge remote-tracking branch 'origin/master' into taiko-fixes
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
2017-08-03 20:02:19 +09:30
smoogipooo
74e9449a75 Make symbol pieces relative sized. 2017-08-03 15:57:45 +09:30
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
dc0d0a3602 CI. 2017-08-03 14:31:20 +09:30
smoogipooo
c2475f6721 Fix gravity. 2017-08-03 14:18:54 +09:30
smoogipooo
e55a406e4d Fix DrawableTaikoHitObject + drawable hit objects. 2017-08-03 13:54:13 +09:30
smoogipooo
786bad3d71 Simplify + fix up circle pieces. 2017-08-03 13:53:12 +09:30
smoogipooo
22ffc78757 Rework consts in TaikoHitObject to be relative size values. 2017-08-03 13:36:04 +09:30
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
440878945e Remove remaining usages of AddDelay 2017-07-17 18:16:15 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
John Neijzen
2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
Dean Herbert
391134b1d3 Adjust glow a bit 2017-05-24 17:16:02 +09:00
smoogipooo
c29f4b2ee8 Fix weird glow + add small pre-beat transition. 2017-05-24 15:40:34 +09:00
smoogipooo
445b469e47 Use ligher hue instead of white. 2017-05-24 15:22:46 +09:00
smoogipooo
c25f995506 Merge remote-tracking branch 'origin/master' into taiko-visual-update 2017-05-24 14:21:16 +09:00
smoogipooo
9255297075 Cleanup. 2017-05-23 17:59:45 +09:00
smoogipooo
25a48d832f Make kiai time hit object pulse on bar line beats. 2017-05-23 17:36:43 +09:00
smoogipooo
4c66157a07 Merge branch 'beat-sync-container-improvements' into taiko-visual-update 2017-05-23 16:51:45 +09:00
smoogipooo
a4823bca91 CI fixes. 2017-05-23 16:47:47 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
6cef3021c7 Adjust sizing to better fit glows within the playfield. 2017-05-22 19:50:01 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
94c259bd59 Remove most usages of DelayReset
ButtonSystem requires some more work.
2017-04-27 18:39:40 +09:00
Dean Herbert
49c02f5ad6 Merge branch 'master' into fix-drumroll-conversion 2017-04-26 19:16:40 +09:00
smoogipooo
47cd91fa63 CI fixes. 2017-04-26 17:04:57 +09:00
smoogipooo
d9dec9d444 Implement Taiko difficulty calculation. 2017-04-26 15:50:08 +09:00
smoogipooo
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
Dean Herbert
2d53ad4c0a
Remove xmldoc-only using usage. 2017-04-21 14:01:58 +09:00
smoogipooo
ef56058ad2 Drum roll ticks shouldn't be able to result in miss judgements. 2017-04-20 15:09:49 +09:00
smoogipooo
a958c99e22 Make ticks smaller (as per flyte's suggestion). 2017-04-20 13:12:43 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00