ANDY840119-PC\andy840119
|
cfc4c39255
|
Fixed the alert from AppVeyor.
maybe.
|
2017-12-28 22:57:41 +09:00 |
|
ANDY840119-PC\andy840119
|
28da60cc38
|
https://github.com/ppy/osu/issues/716
1. split the playfield columns by ManiaModKeyCoop
2. can chaneg the key number by ManiaKeyMod
|
2017-12-28 22:40:23 +09:00 |
|
smoogipoo
|
a3fcc0b60c
|
Back to using SortedLists
|
2017-12-21 19:40:41 +09:00 |
|
smoogipoo
|
f9e34dfa3d
|
Assume that control points are already sequentially-ordered
Fixes up deserializing.
|
2017-12-06 16:24:09 +09:00 |
|
smoogipoo
|
b97cab4f29
|
Make ManiaFramedReplayInputHandler properly account for special keys
These are interleaved into the playfield, so we have to use the playfield's columns' actions.
|
2017-11-28 15:27:20 +09:00 |
|
smoogipoo
|
15f69dff81
|
Make mania hit explosions not stick around when rewinding
Fixes #1461.
|
2017-11-04 00:57:17 +09:00 |
|
Dean Herbert
|
5d5ea5fb2e
|
Fix all remaining db structure issues
|
2017-10-19 14:05:11 +09:00 |
|
TocoToucan
|
887aa7496b
|
Rework EF Core usage in model classes
|
2017-10-06 00:23:26 +03:00 |
|
TocoToucan
|
6a4198d0d6
|
Initial EF Core commit
|
2017-10-04 22:52:12 +03:00 |
|
Dean Herbert
|
6d3d485565
|
And then everything became one
|
2017-09-19 16:06:58 +09:00 |
|
smoogipooo
|
093d82ac45
|
Set depths from playfield add methods instead of DrawableHitObject
|
2017-09-13 16:17:01 +09:00 |
|
Dan Balasescu
|
ee8ec31c6e
|
Merge branch 'master' into judgement-revamp
|
2017-09-12 18:57:37 +09:00 |
|
Dean Herbert
|
86de4fa2e2
|
Apply CI fixes
|
2017-09-12 18:36:19 +09:00 |
|
Dean Herbert
|
b21c080121
|
Make mania readable again
|
2017-09-12 18:22:02 +09:00 |
|
Dean Herbert
|
f32d444d68
|
Remove generics from Playfield (fixes catch)
|
2017-09-12 18:19:28 +09:00 |
|
Dean Herbert
|
1194e46ef1
|
Merge remote-tracking branch 'upstream/master' into judgement-revamp
|
2017-09-12 17:46:21 +09:00 |
|
smoogipooo
|
a22dd80b23
|
Expire HitExplosions.
|
2017-09-12 16:20:15 +09:00 |
|
smoogipooo
|
8737a1b1a5
|
Implement osu!mania auto replay generation.
|
2017-09-12 15:52:32 +09:00 |
|
Dean Herbert
|
d66fb307dc
|
Fix wrong licence header
|
2017-09-11 19:14:37 +09:00 |
|
smoogipooo
|
df0a31bf2a
|
Add judgement text displays to osu!mania
|
2017-09-11 17:56:02 +09:00 |
|
smoogipooo
|
54aff432fe
|
Fix CI error
|
2017-09-11 15:43:23 +09:00 |
|
Dan Balasescu
|
6ecd530d7b
|
Add missing license header
|
2017-09-11 15:24:28 +09:00 |
|
smoogipooo
|
e8efdcf188
|
Make tick explosions white and lower scale.
|
2017-09-11 14:37:34 +09:00 |
|
Dean Herbert
|
5ce76d8023
|
Merge remote-tracking branch 'upstream/master' into judgement-revamp
|
2017-09-11 14:36:51 +09:00 |
|
smoogipooo
|
3026675f35
|
Add explosions.
|
2017-09-11 13:44:39 +09:00 |
|
smoogipooo
|
10f0d1f20d
|
Pass down OnJudgement to columns.
|
2017-09-11 12:57:10 +09:00 |
|
smoogipooo
|
42dc4d9b1c
|
Rework mania playfield to be more sane with masking/nesting.
|
2017-09-11 10:46:54 +09:00 |
|
smoogipooo
|
b085208d24
|
Remove unused code
|
2017-09-07 16:15:33 +09:00 |
|
smoogipooo
|
ef9b87e8c7
|
Make column lights not increase in brightness when successfully pressed
|
2017-09-07 16:15:25 +09:00 |
|
smoogipooo
|
0cc443e618
|
Remove all generic judgements.
|
2017-09-06 18:05:51 +09:00 |
|
smoogipooo
|
115e5c95af
|
Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.
|
2017-08-23 20:50:03 +09:00 |
|
smoogipooo
|
d8dfcc614a
|
Make mania work with key bindings
|
2017-08-23 13:42:16 +09:00 |
|
smoogipooo
|
0e41fc8842
|
Add mania bindings.
|
2017-08-23 12:49:50 +09:00 |
|
smoogipooo
|
909cae5861
|
CI fixes.
|
2017-08-22 14:21:28 +09:00 |
|
smoogipooo
|
9a7c9e9af0
|
Disable reversing for now - this needs to be re-implemented in a later PR.
|
2017-08-22 14:17:57 +09:00 |
|
smoogipooo
|
cd3c825bd2
|
Fix mania playfield not working.
|
2017-08-22 14:07:46 +09:00 |
|
smoogipooo
|
88151eff3f
|
Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
|
2017-08-22 14:07:39 +09:00 |
|
smoogipooo
|
4eec59f669
|
Only set the number of availableColumns once, at ManiaRulesetContainer level.
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2017-08-22 14:07:37 +09:00 |
|
Dean Herbert
|
16e96888ab
|
Update KeyCounterCollection to support action-based buttons
|
2017-08-21 12:39:22 +09:00 |
|
Dean Herbert
|
723e27353c
|
HitRenderer -> RulesetContainer
|
2017-08-09 13:28:29 +09:00 |
|
Dean Herbert
|
7c0e7ebcd0
|
Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
|
2017-08-09 13:05:52 +09: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
|
0f901c99a0
|
Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.
|
2017-08-04 20:11:18 +09:30 |
|
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
|
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
|
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
|
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 |
|
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 |
|
John Neijzen
|
2f7d9655fd
|
More Clean up
|
2017-06-08 15:27:35 +08:00 |
|
smoogipooo
|
8641379424
|
Not sure how these CI issues were missed.
|
2017-06-07 19:27:22 +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 |
|
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
|
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
|
1d3f5d8649
|
CI fixes.
|
2017-06-02 18:19:21 +09:00 |
|
smoogipooo
|
5ebe08ed2a
|
Make default mania playfield timespan 1.5s for now.
|
2017-06-02 17:45:48 +09:00 |
|
smoogipooo
|
b46a9dd0ef
|
Add gravity mod.
|
2017-06-02 17:33:58 +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 |
|
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
|
e4b59314ea
|
Use new HitObjectStartTimeComparer.
|
2017-05-26 18:52:43 +09:00 |
|
smoogipooo
|
a5b79b2192
|
Fix notes not getting accent colours.
|
2017-05-24 21:56:49 +09:00 |
|
smoogipooo
|
78067e085c
|
Fix note input ordering.
|
2017-05-24 20:53:47 +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
|
3cdfd2eef5
|
Split ControlPoint into different types.
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
|
2017-05-23 14:03:40 +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 |
|
Dean Herbert
|
93182e5da3
|
Merge branch 'master' into generic-interface
|
2017-05-22 09:52:40 +09:00 |
|
smoogipooo
|
67cf64062a
|
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
|
2017-05-19 16:02:40 +09:00 |
|
smoogipooo
|
4e8ead9cf4
|
Fix possible nullref.
|
2017-05-18 19:05:03 +09:00 |
|
Huo Yaoyuan
|
88f8619e9a
|
More missed exceptions.
|
2017-05-18 02:46:12 +08:00 |
|
smoogipooo
|
4d9aea6aec
|
Remove while statement (came from fastrandom...).
|
2017-05-17 13:14:42 +09:00 |
|
smoogipooo
|
17466a662c
|
Add hold note conversion.
|
2017-05-17 13:09:07 +09:00 |
|
smoogipooo
|
51f7904c13
|
Remove redundant parentheses.
|
2017-05-17 13:04:57 +09:00 |
|
smoogipooo
|
bc629d193d
|
InternalChildren -> Children.
|
2017-05-16 19:26:46 +09:00 |
|
smoogipooo
|
9b0aed7c48
|
Add tween to time span changing.
|
2017-05-16 19:14:27 +09:00 |
|
smoogipooo
|
3c8d75effb
|
Fix unused directive.
|
2017-05-16 18:36:38 +09:00 |
|
smoogipooo
|
6231a19b8c
|
Merge remote-tracking branch 'origin/master' into mania-timing-sections
|
2017-05-16 18:35:32 +09:00 |
|
smoogipooo
|
60666dc824
|
Rename.
|
2017-05-16 18:05:09 +09:00 |
|
smoogipooo
|
f4a03ec1cf
|
Fix usings.
|
2017-05-16 18:03:30 +09:00 |
|
smoogipooo
|
8ed97a8335
|
Let's invert the playfield by default for now.
|
2017-05-16 18:02:54 +09:00 |
|
smoogipooo
|
ac02d1ab10
|
TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation).
|
2017-05-16 17:50:09 +09:00 |
|
smoogipooo
|
7039205363
|
Invert the playfield by default to make calculations a bit simpler and clean up a lot of code.
|
2017-05-16 17:34:41 +09:00 |
|
smoogipooo
|
62139015fb
|
Clamp TimeSpan.
|
2017-05-16 17:06:54 +09:00 |
|
smoogipooo
|
8d19bafc19
|
Add ability to hold down speed-changing keys.
|
2017-05-16 17:04:05 +09:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
smoogipooo
|
a25f11e809
|
Initial removal of TimingSection.
|
2017-05-12 22:23:32 +09:00 |
|
smoogipooo
|
0597a95db0
|
Resharper is too smart.
|
2017-05-11 22:17:10 +09:00 |
|
smoogipooo
|
d57bb7e5fd
|
General cleanups.
|
2017-05-11 22:01:37 +09:00 |
|
smoogipooo
|
7b49ed1419
|
Fix up todo.
|
2017-05-11 21:57:28 +09:00 |
|
smoogipooo
|
ee219c18db
|
Make the playfield mask for now.
|
2017-05-11 20:04:28 +09:00 |
|
smoogipooo
|
6a79c8b66c
|
Make notes scroll with beat length.
|
2017-05-11 19:57:24 +09:00 |
|
smoogipooo
|
5f30a89f76
|
General refactoring + renaming of TimingSectionContainer.
|
2017-05-11 16:09:48 +09:00 |
|
smoogipooo
|
da4be2f9d6
|
Move notes above judgement area but below keys.
|
2017-05-11 14:32:31 +09:00 |
|
smoogipooo
|
623912b40a
|
Fix playfield position.
|
2017-05-11 14:32:13 +09:00 |
|
smoogipooo
|
a6b71f8ccb
|
Resharper fixes.
|
2017-05-11 14:11:52 +09:00 |
|
smoogipooo
|
8160f36a48
|
Fix notes scrolling from end of map -> start of map.
|
2017-05-11 12:56:51 +09:00 |
|
smoogipooo
|
b10df74079
|
Full rewrite of timing section code, partially working for now.
|
2017-05-11 12:33:19 +09:00 |
|
smoogipooo
|
bcc8a94e36
|
Construct mania playfield with proper column count.
|
2017-05-10 16:32:11 +09:00 |
|
smoogipooo
|
2edc39ae16
|
Add timing sections.
|
2017-05-10 15:09:29 +09:00 |
|
smoogipooo
|
e3b01e7b8c
|
Merge branch 'master' into mania-notes
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2017-05-08 12:12:40 +09:00 |
|
smoogipooo
|
72b2467e74
|
Throw exception if SpecialColumnPosition is set after IsLoaded.
|
2017-05-04 15:18:20 +09:00 |
|
smoogipooo
|
e307b6d563
|
Make SpecialColumnPosition only have an effect during load().
|
2017-05-04 15:12:32 +09:00 |
|
smoogipooo
|
a2bdd020e5
|
ColumnStyle -> ColumnPosition.
|
2017-05-04 14:54:31 +09:00 |
|
Dan Balasescu
|
5024a74192
|
Update ManiaPlayfield.cs
|
2017-05-03 20:11:24 +09:00 |
|
smoogipooo
|
8aa6bb636c
|
Reset column key when it can't be set.
|
2017-05-03 19:43:20 +09:00 |
|
smoogipooo
|
14e4714f08
|
Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.
|
2017-05-03 19:38:15 +09:00 |
|
Dan Balasescu
|
d21c3358b9
|
Less array explicivity.
|
2017-05-03 13:03:46 +09:00 |
|
smoogipooo
|
7de36b7aa2
|
CI cleanups.
|
2017-05-03 12:58:46 +09:00 |
|
smoogipooo
|
5328793693
|
ManiaBaseHit -> ManiaHitObject.
|
2017-05-03 12:44:19 +09:00 |
|
smoogipooo
|
71acf1c57d
|
Move classes out of test case.
|
2017-05-03 12:37:47 +09:00 |
|
Dean Herbert
|
fbd26a1d5e
|
Mode -> Ruleset.
|
2017-04-18 16:05:58 +09:00 |
|