Aergwyn
4c2554595e
implement hidden (mostly)
...
some things work and others don't, I dunno
2017-12-26 17:25:18 +01: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
14162b5d46
Make InputDrum handle all Normals/Claps, hitobjects all others
2017-12-26 14:18:23 +09:00
smoogipoo
0fb620a8d3
Make HitObject.Samples non-nullable
2017-12-25 16:41:18 +09:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
smoogipoo
68d76d4380
Fix taiko strong hits not being handled
2017-12-23 20:58:09 +09:00
Dean Herbert
aeafa5645a
Make Samples null by default and prepopulate in mania
2017-12-23 18:06:46 +09:00
Dean Herbert
2db68df999
Simplify DrawableHitObject's sample load code
2017-12-23 17:20:14 +09:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Dean Herbert
ff0927e71b
Remove unnecessary newline
2017-12-23 16:23:33 +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
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
smoogipoo
c99ea32574
Merge branch 'master' into beatmap-serialization
2017-12-21 13:39:39 +09:00
smoogipoo
a303bf71cf
Give control over screen space conversion to DrawableHitObject
2017-12-11 22:19:02 +09:00
smoogipoo
b28306d3c0
Fix incorrect SelectionPoint
2017-12-11 18:08:16 +09:00
smoogipoo
4573cc3322
Refactor into a new DragBox class, representing a single drag
2017-12-11 17:45:03 +09:00
FreezyLemon
9e3d439f0a
Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix
2017-12-08 08:30:02 +01:00
smoogipoo
f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
FreezyLemon
43c270ea49
Rolled back the bad earlier implementation
2017-12-07 21:18:51 +01:00
smoogipoo
e573db04d4
Don't serialize HitObject.Kiai
2017-12-07 14:42:36 +09:00
smoogipoo
41b607c165
Dont serialize hitobject sample properties copied from the control point
2017-12-07 03:40:43 +09:00
Aergwyn
db50ad794e
CI adjustments
...
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
Aergwyn
806c0e3b26
restructured OsuLegacyDecoder into LegacyDecoder
...
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
smoogipoo
cf859a6cf2
Make the dragger attach to objects it surrounds
...
Plus a lot more implementation.
2017-12-02 00:26:02 +09: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
Dean Herbert
2610cadd3c
CI fixes
2017-11-21 12:11:29 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
ae8407a3f3
Fix nested hitobject judgements not being removed
2017-11-13 14:00:35 +09:00
smoogipoo
66ee9d1631
Update in-line with framework changes
2017-11-09 17:04:04 +09:00
smoogipoo
348083f589
Update with framework state transformation
...
Removes explicit initial state setting in DrawableOsuHitObjects.
2017-11-09 14:05:05 +09:00
smoogipoo
0620d0bd7a
AllJudged does not need to be virtual anymore
2017-11-02 21:56:09 +09:00
smoogipoo
326891f51c
Add "Final" to better determine when to stop processing the hitobject
2017-11-02 21:54:28 +09:00
smoogipoo
fe00ac7e41
Make DrawableHitObject/ScoreProcessor support rewinding
2017-11-02 21:21:07 +09:00
Dean Herbert
bb6b656ec6
Fix code review issues
2017-10-12 22:27:22 +09:00
Dean Herbert
1a88ffe862
Merge remote-tracking branch 'upstream/master' into catch-improvements
2017-10-11 19:10:18 +09:00
Dean Herbert
03fbf47bc2
Add juicy streams
2017-10-10 20:22:42 +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
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
smoogipooo
093d82ac45
Set depths from playfield add methods instead of DrawableHitObject
2017-09-13 16:17:01 +09:00
smoogipooo
d83a2d4dc6
Disable masking optimisations for scrolling hit objects
...
Lifetime is very tightly controlled here, so all should be okay.
2017-09-13 15:57:40 +09:00
smoogipooo
d5bd005c01
Remove unused code for now
...
I don't think we'll ever be using this anyway.
2017-09-12 18:52:15 +09:00
smoogipooo
92b3e203e8
judgementOccurred should be passed upwards
...
So only one hit object is ever judged in a single frame.
2017-09-12 18:50:30 +09:00
smoogipooo
a38e0062a4
Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement.
2017-09-12 18:49:50 +09:00
Dean Herbert
f32d444d68
Remove generics from Playfield (fixes catch)
2017-09-12 18:19:28 +09:00
Dean Herbert
d7ac02d090
Ensure judgements aren't updated when ArmedState is not idle
2017-09-12 18:00:41 +09:00
Dean Herbert
1194e46ef1
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-12 17:46:21 +09:00
smoogipooo
d6bf5c38b7
Move Kiai bool to HitObject.
2017-09-12 10:01:07 +09:00
Dean Herbert
7b92bbfa86
Merge branch 'master' into mania-hit-explosions
2017-09-11 17:34:14 +09:00
smoogipooo
0cadee998c
Set default AccentColour for hit objects
2017-09-11 13:44:05 +09:00
smoogipooo
2086ed209d
Fix hold note tick input.
2017-09-11 04:51:44 +09:00
smoogipooo
0cc443e618
Remove all generic judgements.
2017-09-06 18:05:51 +09:00
smoogipooo
f158ce814c
Fix state never getting set.
2017-09-06 17:20:41 +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
Dean Herbert
52dadad1e1
Merge branch 'master' into fix-taiko-barlines
2017-08-21 16:46:25 +09:00
smoogipooo
7a5708ce92
Further support for null judgements.
2017-08-21 15:35:16 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
Dean Herbert
bc7621607a
Merge upstream/master in.
2017-08-18 22:20:45 +09:00
MillhioreF
e42c279229
More generic catching for broken hitobject strings
2017-08-10 01:50:20 -05:00
MillhioreF
c16dbc05aa
Add new error for malformed (too many variables) hit objects during import
2017-08-09 23:41:22 -05:00
smoogipooo
d83c218e08
Remove various scrolling container optimisations (removing when not alive).
2017-08-09 16:19:09 +09:00
Dean Herbert
ee7bb1b4f5
Don't set RelativePositionAxes when setting ScrollingAxes
...
(cherry picked from commit debe13629f
2017-08-08 13:02:23 +09:00
smoogipooo
f3c05fe232
CI fixes.
2017-08-07 17:34:57 +09:00
smoogipooo
933740664c
SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.
2017-08-07 16:43:54 +09:00
smoogipooo
a3efca9c35
Reduce implementation overhead in actually positioning hitobjects and making them scroll.
2017-08-07 16:02:38 +09:00
smoogipooo
e1dfe364b2
Fix lifetime performance regression.
2017-08-07 14:07:49 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
4045083dcd
Update sorting comparers in line with framework changes
2017-07-11 21:21:58 +03:00
smoogipooo
3389c8a4dc
CI fixes.
2017-06-21 20:17:15 +09:00
smoogipooo
34ac932fe2
Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.
2017-06-19 10:54:23 +09:00
smoogipooo
28e48eab2b
CI fixes.
2017-06-16 19:30:30 +09:00
smoogipooo
4afe83e74e
Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing.
...
This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.
2017-06-16 19:21:54 +09:00
smoogipooo
c137ee822c
Give velocity a sane default value.
2017-05-29 12:19:51 +09:00
smoogipooo
231b1ae610
We don't need a curve.
2017-05-29 12:19:38 +09:00
smoogipooo
6101fe98e1
Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state.
2017-05-29 12:10:29 +09:00
smoogipooo
cd1da469c7
Cleanup + actually fix possible nullrefs.
2017-05-29 11:14:37 +09:00
smoogipooo
9e5a53aae7
Fix possible nullrefs.
2017-05-29 10:53:55 +09:00
smoogipooo
3ec41a313b
Add base DrawableHitObject + HitObjectStartTimeComparer.
2017-05-26 18:48:18 +09:00
smoogipooo
c2d3b6c05a
Remove late initialization of head + tail, keep them updated with start time and end time.
2017-05-26 15:53:49 +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
9565bb9572
Fix hold notes - remove glow for now.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
2017-05-17 13:09:49 +09:00
smoogipooo
17466a662c
Add hold note conversion.
2017-05-17 13:09:07 +09:00
Dean Herbert
6fd95e0c52
Fix post-merge breakage
2017-05-11 17:16:01 +09:00
Dean Herbert
bc54b3c85f
Merge branch 'master' into mania-notes
2017-05-11 17:13:29 +09:00
Dean Herbert
b0e522345c
Combine DrawableHitObject classes into one
2017-05-11 17:07:46 +09:00
smoogipooo
2d2d1beddd
More concrete method to determine if all hit objects have been judged.
...
Covers the case where nested hit objects are involved.
2017-05-11 14:48:08 +09:00
smoogipooo
956a7288fb
Add basic DrawableNote.
2017-05-03 20:12:27 +09:00
smoogipooo
1fa42b26e8
Make base DrawableHitObject<TJudgement> uninheritable.
2017-05-03 14:02:23 +09:00
Dan Balasescu
22be765323
Update HitObject.cs
2017-04-26 14:45:30 +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
a475f1f237
Remove redundant qualifier.
2017-04-24 14:16:51 +09:00
smoogipooo
2af9bf1423
Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects.
2017-04-22 21:33:11 +09:00
smoogipooo
ec04ceaece
Fix off-by-one on repeatCount.
2017-04-22 20:53:55 +09:00
smoogipooo
1bb0b96ddc
Make IHasCurve not depend on a SliderCurve object.
2017-04-22 20:43:20 +09:00
smoogipooo
d7477955ac
CI fixes.
2017-04-21 20:42:13 +09:00
smoogipooo
5cdbb226f8
Remove CurvedHitObject to make RepeatSamples not tied to curve.
2017-04-21 20:40:11 +09:00
smoogipooo
b8f9a2be6e
Whoops fix xmldoc.
2017-04-21 20:40:05 +09:00
smoogipooo
748f13501a
Remove HeadSamples and TailSamples, combine into RepeatSamples.
2017-04-21 20:04:40 +09:00
smoogipooo
382e656e9f
CI fixes.
2017-04-21 19:51:23 +09:00
Dan Balasescu
6c8bd4dfe4
More trimming.
2017-04-21 19:41:46 +09:00
smoogipooo
47f9b2d55b
Trim whitespace.
2017-04-21 19:38:04 +09:00
smoogipooo
b8c10aa595
Improve xmldoc.
2017-04-21 19:37:16 +09:00
smoogipooo
cae4c7c6e5
Combine construction and assignment.
2017-04-21 19:12:16 +09:00
smoogipooo
a999c42d8a
Split slider samples into head + tail + repeats + body (the original HitObject.Samples).
2017-04-21 18:49:49 +09:00
smoogipooo
a7afde02bf
Oops, apparently normal hit sound should always be added.
2017-04-21 16:27:35 +09:00
smoogipooo
ca824de91c
Implement RepeatSamples in IHasRepeats.
2017-04-21 16:18:34 +09:00
smoogipooo
b4a4597366
Transform legacy HitObjectParsers to give repeat slider sounds, instead of all sounds.
2017-04-21 16:18:11 +09:00
smoogipooo
83f1f9d7e5
Add ability to parse per-repeat sounds.
2017-04-21 14:38:46 +09:00
smoogipooo
bd7341c5a1
Restructure reading normal/add/volume members into class to make code a bit more readable/usable.
2017-04-21 14:36:28 +09:00
smoogipooo
ac9f0ccb48
Fix hit normals always being played, regardless of sound type.
2017-04-21 13:59:55 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
