1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:52:54 +08:00
Commit Graph

391 Commits

Author SHA1 Message Date
John Neijzen
9e17549d7f Update HitObjectPatternGenerator.cs 2017-08-08 22:56:27 +08:00
smoogipooo
c5ce86b9f3 Add reversing capability to ScrollingPlayfield. 2017-08-08 12:59:50 +09:00
smoogipooo
12f9793fec Fix mania bar lines not working. 2017-08-07 17:46:22 +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
c6447e40f9 Reduce implementation overhead for nested playfields (e.g. playfield + columns). 2017-08-07 14:56:26 +09:00
smoogipooo
b1d25ed388 Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection).
Also removing a lot of mania code relating to gravity mod for now.
2017-08-04 23:07:08 +09:00
smoogipooo
54503eef71 Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract. 2017-08-04 22:50:29 +09:30
smoogipooo
4a9f3aa70d Merge remote-tracking branch 'origin/master' into timingchange-improvements 2017-08-04 20:11:24 +09:30
smoogipooo
0f901c99a0 Implement SpeedAdjustedPlayfield and a new HitRenderer derivation. 2017-08-04 20:11:18 +09:30
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
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
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
21d07428fe Fix some test regressions 2017-07-19 15:16:59 +09:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +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
Thomas Müller
e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Dean Herbert
89c8a34025 Merge branch 'master' into better-drawablehitobject-lifetimes 2017-06-21 20:13:57 +09:00
smoogipooo
fc0e44b214 Update framework. 2017-06-21 11:28:27 +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
ea87aca032 We no longer need to pass in the control point. 2017-06-16 13:12:36 +09:00
smoogipooo
874db28478 CI fixes. 2017-06-16 13:09:06 +09:00
smoogipooo
5bac0919f0 Remove gross autoSizingAxes and life time. 2017-06-16 13:00:08 +09:00
smoogipooo
5d7336b235 A bit more cleanup. 2017-06-16 10:06:47 +09:00
smoogipooo
fda220acbc Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer. 2017-06-15 19:34:28 +09:00
Dan Balasescu
6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +09:00
Dean Herbert
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
smoogipooo
56244e0134 Add small test case to demonstrate usage. 2017-06-12 17:31:24 +09:00
smoogipooo
ba8014bbd9 Cleanups + xmldoc rewordings/improvements. 2017-06-12 15:20:34 +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
de35ea22b1 Make bar lines work again. 2017-06-09 22:03:28 +09:00
smoogipooo
1f56848442 Rewrite the way speed adjustments are applied. 2017-06-09 19:57:03 +09:00
smoogipooo
921350128d Rename SpeedAdjustment -> MultiplierControlPoint + reworking. 2017-06-09 16:57:17 +09:00
smoogipooo
4b2669e65d Namespace movement. 2017-06-09 16:20:55 +09:00
smoogipooo
d11002e499 Use new naming structure + VisibleTimeRange bindable. 2017-06-09 16:11:49 +09:00
smoogipooo
cd435f7ec6 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
2017-06-09 03:37:55 +09:00
smoogipooo
8de6bdf340 Rewrite mania to use the new timing section stuff. 2017-06-09 02:43:48 +09:00
smoogipooo
55f238f6a9 Remove IHasTimeSpan, add rename to TimingSection. 2017-06-08 23:40:24 +09:00
Dean Herbert
a454ca606f Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
Tom94
5f7270ee4b Use new invalidation rules 2017-06-08 09:53:45 +02:00
John Neijzen
2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
John Neijzen
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
John Neijzen
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
smoogipooo
8641379424 Not sure how these CI issues were missed. 2017-06-07 19:27:22 +09:00
smoogipooo
1932b58663 g -> gravity + one more xmldoc. 2017-06-07 19:21:31 +09:00
smoogipooo
1017cf54d9 CI fixes. 2017-06-07 19:17:45 +09:00
smoogipooo
6f191193a1 Rename timing changes, simplify + improve columns/dictionary usage. 2017-06-07 19:15:51 +09:00
smoogipooo
7aee8ee547 Make TimeSpan a double again. 2017-06-07 19:08:32 +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
a3299809fe Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
2017-06-05 10:19:53 +09:00
smoogipooo
d66f114b5b Properly set starting lifetime for mania hit objects. 2017-06-03 18:18:25 +09:00
smoogipooo
7022c8d496 Move timing change stuff to osu.Game project. 2017-06-02 20:17:44 +09:00
smoogipooo
e5720b9477 CI fixes. 2017-06-02 19:53:30 +09:00
smoogipooo
d6e49b94ec Add comment. 2017-06-02 19:36:47 +09:00
smoogipooo
c7dcb54d45 Simplify gravity. 2017-06-02 19:34:55 +09:00
smoogipooo
a4cd409835 Super huge abstraction changes to (hopefully) make this TimingChangeContainer usable for non-mania rulesets.
Also includes commenting improvements/fixes.
2017-06-02 19:27:22 +09:00
smoogipooo
186fecca82 Add missing license headers. 2017-06-02 18:20:14 +09:00
smoogipooo
1d3f5d8649 CI fixes. 2017-06-02 18:19:21 +09:00
smoogipooo
97dd80b874 Make life time set after children are updated (for now). 2017-06-02 18:11:36 +09:00
smoogipooo
5ebe08ed2a Make default mania playfield timespan 1.5s for now. 2017-06-02 17:45:48 +09:00
smoogipooo
519f5f785b Add gravity mod icon. 2017-06-02 17:43:24 +09:00
smoogipooo
b46a9dd0ef Add gravity mod. 2017-06-02 17:33:58 +09:00
smoogipooo
8f6118ffb8 Set lifetime for timing change containers very naively for now. 2017-06-02 16:39:31 +09:00
smoogipooo
1eddc278a4 Cleanup + make travel time equal to the time span. 2017-06-02 16:04:14 +09:00
smoogipooo
563f746acf Add gravity timing change. 2017-06-02 15:30:59 +09:00
smoogipooo
d75bbb2b88 Fix incorrect sorting. 2017-06-02 15:28:30 +09:00
smoogipooo
1da5d508fa aaaaa 2017-06-02 11:35:51 +09:00
smoogipooo
d30706f640 Move drawable timing changes to Timing/Drawables. 2017-06-01 15:13:52 +09:00
smoogipooo
3e2aa26722 Add bar line timing changes. 2017-06-01 15:08:41 +09:00
smoogipooo
f612914e87 Initial rewrite of timing changes to allow them to be more extensible. 2017-06-01 14:26:21 +09:00
Shawdooow
cb5fcf2572 change mania multiplier 2017-05-30 13:27:10 -04:00
Shawdooow
ecc0d0b11c Daycore mod 2017-05-30 12:49:06 -04:00
Dean Herbert
476526714d Merge branch 'master' into mania-judgements 2017-05-29 21:31:48 +09:00
Dean Herbert
a0c542f461 Merge branch 'master' into mania-barlines 2017-05-29 20:36:50 +09:00
smoogipooo
e529ced131 Fix mania-specific beatmaps not setting samples correctly. 2017-05-29 16:18:01 +09:00
smoogipooo
586fc782cf Fix line endings. 2017-05-29 16:00:14 +09:00
Dan Balasescu
0327adcba8 Update HoldNote.cs 2017-05-29 15:35:50 +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
44f1d906ea Store tick count locally, remove HoldNote TickCount. 2017-05-29 14:47:51 +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
f17b8acd13 Remove erroneous tab. 2017-05-29 11:45:16 +09:00
smoogipooo
e5e73b31b6 Cleanup + slight xmldoc improvements. 2017-05-29 11:42:43 +09:00
smoogipooo
79cdba58c1 Merge branch 'mania-holdnote-input' into mania-judgements 2017-05-29 11:23:32 +09:00
smoogipooo
cdf4fcea02 Fix input being reversed. 2017-05-29 11:07:17 +09:00
smoogipooo
b28b7af887 Scale HP with drain rate a bit. 2017-05-26 20:42:03 +09:00
smoogipooo
3715171948 Ticks can't be missed. 2017-05-26 20:32:21 +09:00
smoogipooo
ca08011734 Add basic (new) hp calculations. 2017-05-26 20:26:26 +09:00
smoogipooo
95908af677 Fix resetting scoreprocessor. 2017-05-26 20:26:06 +09:00
smoogipooo
10f62eb8da Fix incorrect combo score. 2017-05-26 20:25:24 +09:00
smoogipooo
ab5e1bfc89 Add basic score calculations. 2017-05-26 19:56:50 +09:00
smoogipooo
9ec6e0b692 Fix hold note ticks changing combo. 2017-05-26 19:56:35 +09:00
smoogipooo
02f582a3f8 Add hold note tick judgement. 2017-05-26 19:29:47 +09:00
smoogipooo
4c67c13410 Add hold note tail judgement. 2017-05-26 19:28:14 +09:00
smoogipooo
43a7923199 Implement base mania judgement score. 2017-05-26 19:22:17 +09:00
smoogipooo
f294fef29b Remove holding property in favor of a nullable hold start time. 2017-05-26 18:56:21 +09:00
smoogipooo
e4b59314ea Use new HitObjectStartTimeComparer. 2017-05-26 18:52:43 +09:00
smoogipooo
871d44d628 Renamings. 2017-05-26 16:39:43 +09:00
smoogipooo
3f4cbd02cd Fix warnings. 2017-05-26 16:29:20 +09:00
smoogipooo
47e1b7b389 Fix tick construction loop. 2017-05-26 16:28:39 +09:00
smoogipooo
d3206396e7 Rewrite comments. 2017-05-26 16:10:04 +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
946cd4bfa3 General cleanup + more xmldocs. 2017-05-24 21:57:38 +09:00
smoogipooo
a5b79b2192 Fix notes not getting accent colours. 2017-05-24 21:56:49 +09:00
smoogipooo
ed65b3559a CI fix. 2017-05-24 21:25:01 +09:00
smoogipooo
21cdee02f3 Get tickSpacing from beatmap. 2017-05-24 21:24:33 +09:00
smoogipooo
d6b104d794 Minor visual change for DrawableHoldNoteTick. 2017-05-24 21:24:18 +09:00
smoogipooo
78067e085c Fix note input ordering. 2017-05-24 20:53:47 +09:00
smoogipooo
dcf879687d Implement basic hold note + tick input. 2017-05-24 20:45:01 +09:00
Dean Herbert
0842e00f13 Merge branch 'master' into controlpoint-rework 2017-05-24 00:20:15 +09:00
Dean Herbert
836c33cfb0 Merge branch 'master' into mania-note-input 2017-05-23 16:50:01 +09:00
smoogipooo
a4823bca91 CI fixes. 2017-05-23 16:47:47 +09:00
smoogipooo
7e5bb61a44 Fix line endings. 2017-05-23 16:13:51 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
002a0e99a2 Use SortedList + BinarySearch to find control points at time values. 2017-05-23 15:20:32 +09:00
smoogipooo
ea4a285329 Fix compile errors. 2017-05-23 14:08:15 +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
Dean Herbert
51728e48be Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 21:12:00 +09:00
smoogipooo
4200e05fe7 Don't handle repeat keys. 2017-05-22 16:42:14 +09:00
smoogipooo
7314a9019c Fix nullref. 2017-05-22 16:39:30 +09:00
smoogipooo
f9eb448f16 Implement DrawableNote hits. 2017-05-22 16:35:15 +09:00
Dan Balasescu
6f00f7f0d0 Update HitWindows.cs 2017-05-22 16:34:38 +09:00
smoogipooo
62c7e97a5f Add helper method to easily compare time offset to hit windows. 2017-05-22 16:28:44 +09:00
smoogipooo
0f3cf18345 Forgot license header. 2017-05-22 16:15:52 +09:00
smoogipooo
9a578e036e Add xmldoc. 2017-05-22 16:09:32 +09:00
smoogipooo
60e036b5f4 Fix missing reference. 2017-05-22 15:29:02 +09:00
smoogipooo
dcf3148d23 Fix osu!mania failing due to 0 hp. 2017-05-22 15:28:51 +09:00
smoogipooo
3dfe88c068 Make Key a bindable, pass down to drawable hit objects. 2017-05-22 15:28:30 +09:00
smoogipooo
c972335297 Add InputTarget to capture input from columns before hit objects. 2017-05-22 15:25:37 +09:00
smoogipooo
409464381c Expose HitWindows so they're accessible from the drawable hit objects. 2017-05-22 14:11:14 +09:00
smoogipooo
d0ddd62f84 Add ManiaHitResult to ManiaJudgement. 2017-05-22 14:10:53 +09:00
smoogipooo
f70bfd5378 CI fixes. 2017-05-22 13:43:53 +09:00
Dan Balasescu
4556ead3b6 Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 12:54:06 +09:00