1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 13:22:55 +08:00
Commit Graph

161 Commits

Author SHA1 Message Date
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo
807794d512 Make Rulesets.Mania use the new judgement result structure 2018-08-02 20:36:54 +09:00
smoogipoo
cd70e5e30b Migrate Rulesets.Mania to the new judgement system 2018-08-02 16:44:01 +09:00
smoogipoo
577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
smoogipoo
f007e71c87 Retrieve the mania key action through DI 2018-07-02 12:31:41 +09:00
smoogipoo
10d1dfa7cd A bit of cleanup 2018-06-11 16:10:27 +09:00
smoogipoo
baaf431b9e Make IScrollingInfo and store direction as bindable 2018-06-11 13:42:13 +09:00
smoogipoo
ca5103615d DI the scrolling info rather than pass by ctor 2018-06-11 13:42:13 +09:00
smoogipoo
0fb4e6b41b Fix hold note body not following the scroll direction 2018-06-08 18:16:55 +09:00
smoogipoo
5c8bea82f8 Fix scroll direction not applying to nested hitobjects 2018-06-08 15:29:08 +09:00
smoogipoo
d73c2a1654 Fix various note elements not following the scroll direction 2018-06-08 15:24:19 +09:00
smoogipoo
80a577f182 Fix notes not scrolling correctly 2018-06-08 15:16:45 +09:00
smoogipoo
55475d129f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 19:19:20 +09:00
smoogipoo
485026da6f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 15:32:31 +09:00
Dan Balasescu
8d0161c2fc Refactoring 2018-06-07 15:11:48 +09:00
Dean Herbert
f9449e841a Improve overall visual clarity and explosion effects 2018-06-07 14:30:27 +09:00
Dean Herbert
dff4b360b7 Fix ticks not getting accent colour 2018-06-07 14:30:27 +09:00
Dean Herbert
56ea1c1d63 Adjust hold note visibility and glow composition 2018-06-07 14:30:27 +09:00
Dean Herbert
dc10277d50 Thicker bar lines and new design colour 2018-06-07 11:16:26 +09:00
smoogipoo
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +09:00
AlFasGD
d504a44dfb Implement mask layering (incomplete) 2018-05-21 23:08:04 +03:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
smoogipoo
43cdbec0a3 Fix hold note hitwindow lenience 2018-05-17 13:59:04 +09:00
smoogipoo
2fc1939d65 Fix hold notes never dying 2018-05-16 19:43:01 +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
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
acf20c079c General improvements around usage of HitWindows for mania 2018-02-02 18:47:54 +09:00
smoogipoo
bfdfb52666 Fix a few usages of AllJudged possibly not being correct 2018-01-15 15:28:08 +09:00
smoogipoo
cae93a1d1f Add comment to fade override of holdnote tail 2018-01-12 17:09:39 +09:00
smoogipoo
03824eccc8 Block fadeout on holdnote heads 2018-01-12 17:09:21 +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
smoogipoo
2d345b2f80 Fix mania hold note tick positioning 2018-01-07 11:43:31 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
ce94c825d1 Fix length of hold notes 2018-01-04 22:05:38 +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
6a29f6020a Make HitObjects construct nested hit objects 2017-12-22 21:42:54 +09:00
smoogipoo
fe00ac7e41 Make DrawableHitObject/ScoreProcessor support rewinding 2017-11-02 21:21:07 +09:00
smoogipooo
12641edb4d Fix incorrect mania hold note tick judgements 2017-09-12 23:36:59 +09:00
Dean Herbert
1194e46ef1 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-12 17:46:21 +09:00
smoogipooo
585e2399bf Add license headers. 2017-09-12 12:02:56 +09:00
smoogipooo
57ee97e27d Add lane glows. 2017-09-12 11:39:34 +09:00
smoogipooo
0765027cb5 Move note glow to a separate class + make it match the design a bit more. 2017-09-12 11:14:16 +09:00
smoogipooo
3c98bc065f Fix osu!mania note masking resulting in miss judgements not occurring. 2017-09-12 09:48:17 +09:00
Dean Herbert
7b92bbfa86 Merge branch 'master' into mania-hit-explosions 2017-09-11 17:34:14 +09:00
smoogipooo
de7d50d384 Better variable + comment naming 2017-09-11 15:08:51 +09:00
smoogipooo
e8efdcf188 Make tick explosions white and lower scale. 2017-09-11 14:37:34 +09:00
smoogipooo
2c3131d391 Remove green coloration when hit. 2017-09-11 13:56:10 +09:00
smoogipooo
2f72dff779 Update with framework changes. 2017-09-11 08:59:56 +09:00
smoogipooo
2086ed209d Fix hold note tick input. 2017-09-11 04:51:44 +09:00
smoogipooo
9cd3af11d5 Fix hold note tick position + lifetime. 2017-09-11 04:45:10 +09:00
smoogipooo
79a9612243 Remove now unnecessary comment. 2017-09-11 04:39:04 +09:00
smoogipooo
8bb8999820 More TestCaseManiaHitObjects fixes. 2017-09-11 04:34:30 +09:00
smoogipooo
3b5e847a31 Better updateGlow methods. 2017-09-11 04:29:32 +09:00
smoogipooo
590a34dc28 Add glow to DrawableHoldNote 2017-09-11 04:22:17 +09:00
smoogipooo
73d77637ef Add glow to DrawableNote 2017-09-11 04:22:05 +09:00
smoogipooo
8797382700 Update body styling of hold notes 2017-09-11 04:21:43 +09:00
smoogipooo
0cc443e618 Remove all generic judgements. 2017-09-06 18:05: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
d8dfcc614a Make mania work with key bindings 2017-08-23 13:42:16 +09:00
smoogipooo
f3c05fe232 CI fixes. 2017-08-07 17:34:57 +09:00
smoogipooo
a3efca9c35 Reduce implementation overhead in actually positioning hitobjects and making them scroll. 2017-08-07 16:02:38 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Dean Herbert
89c8a34025 Merge branch 'master' into better-drawablehitobject-lifetimes 2017-06-21 20:13:57 +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
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
419682b740 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
2017-06-12 13:09:02 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
smoogipooo
1017cf54d9 CI fixes. 2017-06-07 19:17:45 +09:00
Dean Herbert
5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
smoogipooo
5104e65bcd Make hold notes utilize RelativeChildOffset for tick positionings. 2017-06-06 15:57:30 +09:00
smoogipooo
e3d10fc4d3 Update with more framework changes. 2017-06-06 15:52:35 +09:00
smoogipooo
4307242bb6 Update with framework changes. 2017-06-05 20:06:46 +09:00
smoogipooo
d66f114b5b Properly set starting lifetime for mania hit objects. 2017-06-03 18:18:25 +09:00
smoogipooo
586fc782cf Fix line endings. 2017-05-29 16:00:14 +09:00
smoogipooo
4b6f2efa76 Cleanups. 2017-05-29 15:32:58 +09:00
smoogipooo
32550bda4f Make drawable bar line a bit more sane. 2017-05-29 15:18:06 +09:00
smoogipooo
4fce0c1189 Rename Barline -> BarLine. 2017-05-29 15:05:20 +09:00
smoogipooo
ee7158aa95 Implement bar lines. 2017-05-29 14:44:42 +09:00
smoogipooo
e63108bd75 Add base for bar lines. 2017-05-29 11:56:31 +09:00
smoogipooo
f294fef29b Remove holding property in favor of a nullable hold start time. 2017-05-26 18:56:21 +09:00
smoogipooo
871d44d628 Renamings. 2017-05-26 16:39:43 +09:00
smoogipooo
d3206396e7 Rewrite comments. 2017-05-26 16:10:04 +09:00
smoogipooo
946cd4bfa3 General cleanup + more xmldocs. 2017-05-24 21:57:38 +09:00
smoogipooo
ed65b3559a CI fix. 2017-05-24 21:25:01 +09:00
smoogipooo
d6b104d794 Minor visual change for DrawableHoldNoteTick. 2017-05-24 21:24:18 +09:00
smoogipooo
dcf879687d Implement basic hold note + tick input. 2017-05-24 20:45:01 +09:00
smoogipooo
4200e05fe7 Don't handle repeat keys. 2017-05-22 16:42:14 +09:00
smoogipooo
f9eb448f16 Implement DrawableNote hits. 2017-05-22 16:35:15 +09:00
smoogipooo
3dfe88c068 Make Key a bindable, pass down to drawable hit objects. 2017-05-22 15:28:30 +09:00
smoogipooo
2f8556a44a Fix hold notes + make it compile again. 2017-05-17 13:20:33 +09:00