Dean Herbert
|
8b190edde0
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:32:14 +09:00 |
|
Dean Herbert
|
8d59b7299f
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-14 13:22:01 +09:00 |
|
Dean Herbert
|
c4769f6802
|
Refactors
|
2018-11-14 13:19:51 +09:00 |
|
Dean Herbert
|
396a5b3cd0
|
Merge branch 'master' into Private_Messages
|
2018-11-14 12:49:54 +09:00 |
|
Dean Herbert
|
b9278b3488
|
Fix brackets
|
2018-11-14 12:05:07 +09:00 |
|
Dean Herbert
|
161d476091
|
Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song
|
2018-11-14 11:53:43 +09:00 |
|
Dean Herbert
|
c77412992e
|
Merge conditionals
|
2018-11-14 11:53:34 +09:00 |
|
Dean Herbert
|
3caf0cb0d9
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-13 19:42:04 +09:00 |
|
Dean Herbert
|
e7d984415b
|
Merge branch 'master' into immutable-sliderpath
|
2018-11-13 18:06:14 +09:00 |
|
Dean Herbert
|
72ae22b0c4
|
Add support for creating new PM conversations
|
2018-11-13 17:24:11 +09:00 |
|
Dean Herbert
|
f241fcdba1
|
Add back support for new API and private messages
|
2018-11-13 15:20:59 +09:00 |
|
smoogipoo
|
6d43baf4bf
|
Make show/hide only invoked once each
|
2018-11-13 13:12:11 +09:00 |
|
smoogipoo
|
fbc20d2d4d
|
Hide placement when cursor is not in the playfield
|
2018-11-13 12:52:04 +09:00 |
|
Dean Herbert
|
8b9f7f6691
|
Merge branch 'master' into Private_Messages
|
2018-11-12 20:43:10 +09:00 |
|
Dean Herbert
|
4b1282235a
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-12 20:41:10 +09:00 |
|
smoogipoo
|
b9b20607af
|
Add IScrollAlgorithm.TimeAt()
|
2018-11-12 17:43:22 +09:00 |
|
smoogipoo
|
2e0e1befe9
|
Add selection mask testcases
# Conflicts:
# osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
|
2018-11-12 17:40:09 +09:00 |
|
smoogipoo
|
8be6e351f5
|
Merge branch 'fix-mania-selections' into add-mania-selection-testcase
|
2018-11-12 17:39:58 +09:00 |
|
smoogipoo
|
d8e7ad8241
|
Fix post-rebase issues
|
2018-11-12 17:36:19 +09:00 |
|
smoogipoo
|
10543cf1b6
|
Move rest of ScrollingPlayfield into ScrollingRulesetContainer
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
e7969ecec7
|
Move ScrollAlgorithm inside IScrollingInfo
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
54668a0dec
|
Simplify construction of ScrollingInfo
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
ad45bc7666
|
Move scroll direction to scrollinginfo
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
48486895ba
|
Remove unused code
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
9fde7f7f44
|
Move scrolling info to osu.Game
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
7f0f143a1b
|
Move IScrollAlgorithm to ScrollingRulesetContainer + use DI
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
aee7a80e71
|
ScrollAlgorithm -> ScrollVisualisationMethod
|
2018-11-12 17:26:37 +09:00 |
|
smoogipoo
|
f3ba429701
|
Make sure control points is internally initialised
|
2018-11-12 17:14:06 +09:00 |
|
Dean Herbert
|
1101e161d9
|
Update framework and resources
|
2018-11-12 17:02:46 +09:00 |
|
smoogipoo
|
f4fd6189f8
|
Implement IEquatable
|
2018-11-12 16:53:30 +09:00 |
|
smoogipoo
|
0220ed21b0
|
Ignore distance for json serialisation
|
2018-11-12 16:38:49 +09:00 |
|
smoogipoo
|
0e92b385f0
|
Define default json deserialisation constructor
|
2018-11-12 16:38:33 +09:00 |
|
smoogipoo
|
8ad9b6a02a
|
Safety for default(SliderPath)
|
2018-11-12 16:38:14 +09:00 |
|
smoogipoo
|
d594ce3530
|
Revert "Make SliderPath.ControlPoints read-only"
This reverts commit 3b88d94793.
# Conflicts:
# osu.Game/Rulesets/Objects/SliderPath.cs
|
2018-11-12 16:20:38 +09:00 |
|
smoogipoo
|
77d16aa968
|
Add xmldocs
|
2018-11-12 14:16:21 +09:00 |
|
smoogipoo
|
4eef1134a6
|
Re-order file
|
2018-11-12 14:08:36 +09:00 |
|
smoogipoo
|
3aba462e52
|
Make Path.Distance a property again
|
2018-11-12 14:07:48 +09:00 |
|
smoogipoo
|
3b88d94793
|
Make SliderPath.ControlPoints read-only
|
2018-11-12 14:03:54 +09:00 |
|
smoogipoo
|
54ab256c8e
|
Instantiate a new path rather than setting properties on it
# Conflicts:
# osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
# osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
# osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/SliderPath.cs
|
2018-11-12 13:50:19 +09:00 |
|
jorolf
|
023924396d
|
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
|
2018-11-11 18:38:12 +01:00 |
|
Dean Herbert
|
4783df1d4b
|
Fix compose mode not working
|
2018-11-09 11:36:06 +09:00 |
|
Dean Herbert
|
27549586e6
|
Merge branch 'master' into manual-position-adjustments
|
2018-11-09 10:53:41 +09:00 |
|
smoogipoo
|
33056b8098
|
Adjust namespaces
|
2018-11-08 14:04:21 +09:00 |
|
smoogipoo
|
f66a9f4f1e
|
Rename IScrollChangeVisualiser -> IScrollAlgorithm
|
2018-11-08 14:04:21 +09:00 |
|
smoogipoo
|
2f87f267a3
|
Fix height being set instead of width
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
195f82fa96
|
Give visualiser methods range+length params again
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
f41bfd14ca
|
Add some xmldocs
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
76ea314c27
|
Reorder params
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
589c3a47e2
|
Remove state computation + updates from ISpeedChangeVisualiser
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
0bdeebbce2
|
Expose basic values from ISpeedChangeVisualiser
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
c6350c6efd
|
Remove IHasEditablePosition
|
2018-11-08 13:03:11 +09:00 |
|
Dean Herbert
|
f2e22e0fd1
|
Merge branch 'master' into fix-hitobject-masking
|
2018-11-08 00:26:38 +09:00 |
|
smoogipoo
|
5d51719572
|
Make selection blueprints handle position adjustments
|
2018-11-07 16:21:32 +09:00 |
|
smoogipoo
|
cf4dad0fe8
|
Fix hitobjects not updating IsMaskedAway after being judged
|
2018-11-07 15:42:40 +09:00 |
|
smoogipoo
|
4277cb0d59
|
Adjust some missed renames
|
2018-11-07 15:04:48 +09:00 |
|
smoogipoo
|
e9e50f41fb
|
Use Name/NameScreen format
|
2018-11-07 13:04:17 +09:00 |
|
Dean Herbert
|
7f73fc2d39
|
Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
|
2018-11-07 01:49:21 +09:00 |
|
smoogipoo
|
52f4923c8e
|
Remove intermediate Screens namespace
|
2018-11-06 18:28:22 +09:00 |
|
smoogipoo
|
ac25718c5a
|
Renamespace compose-mode components
|
2018-11-06 18:14:46 +09:00 |
|
smoogipoo
|
27d82052f4
|
BorderLayer -> EditorPlayfieldBorder
|
2018-11-06 18:10:46 +09:00 |
|
smoogipoo
|
85f96ad62f
|
Fix a few missed renames
|
2018-11-06 18:07:53 +09:00 |
|
smoogipoo
|
b3fa7c111b
|
Rename testcases
|
2018-11-06 18:06:20 +09:00 |
|
smoogipoo
|
bd775af274
|
PlacementMask -> PlacementBlueprint
|
2018-11-06 18:04:03 +09:00 |
|
smoogipoo
|
11be820efe
|
CreateMaskFor -> CreateBlueprintFor
|
2018-11-06 18:03:21 +09:00 |
|
smoogipoo
|
90c813618a
|
Merge PlacementContainer into BlueprintContainer
|
2018-11-06 18:02:55 +09:00 |
|
smoogipoo
|
f2a5f28ea2
|
SelectionMask -> SelectionBlueprint
|
2018-11-06 17:56:04 +09:00 |
|
smoogipoo
|
ad2836a61e
|
MaskSelection -> SelectionBox
|
2018-11-06 17:52:47 +09:00 |
|
smoogipoo
|
65bb91dcf7
|
Merge MaskContainer into BlueprintContainer
|
2018-11-06 17:51:26 +09:00 |
|
smoogipoo
|
26c9390c16
|
HitObjectMaskLayer -> BlueprintContainer
|
2018-11-06 17:36:10 +09:00 |
|
smoogipoo
|
faab744cbd
|
DragLayer -> DragBox
|
2018-11-06 17:24:57 +09:00 |
|
Dean Herbert
|
4554fc2c7b
|
Update framework and other dependencies
|
2018-11-05 18:22:16 +09:00 |
|
smoogipoo
|
ace1dce281
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
|
2018-11-05 18:10:22 +09:00 |
|
smoogipoo
|
92d570342c
|
Fix sample additions not falling back to non-addition bank
|
2018-11-05 17:35:24 +09:00 |
|
smoogipoo
|
a4caaf56ef
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
|
2018-11-05 16:38:28 +09:00 |
|
Dean Herbert
|
998a540cf8
|
Merge branch 'master' into force-sort-objects
|
2018-11-05 16:23:11 +09:00 |
|
smoogipoo
|
171700cb91
|
Debounce editor summary timeline seeks
|
2018-11-05 15:59:40 +09:00 |
|
smoogipoo
|
1fffa48aa0
|
Sort nested hitobjects post-creation
|
2018-11-05 12:15:45 +09:00 |
|
FreezyLemon
|
56ff2686ac
|
Update osu-resources and osu-framework to use binary fonts
|
2018-11-03 18:09:11 +01:00 |
|
gotopie
|
4c9dcdf156
|
hide seekbar when no song is playing
|
2018-11-02 19:04:30 -04:00 |
|
Dean Herbert
|
63cbc8e0e8
|
Merge branch 'master' into slider-placement
|
2018-11-02 19:45:34 +09:00 |
|
Dean Herbert
|
e6ee3dc73e
|
Use framework helper functions for path approximation
|
2018-11-02 19:26:29 +09:00 |
|
Dan Balasescu
|
7b9afe9cf7
|
Merge branch 'master' into fix-path-control-point-drag
|
2018-11-02 13:04:04 +09:00 |
|
Dan Balasescu
|
173d2904b8
|
Merge branch 'master' into fix-disk-space-errors
|
2018-11-02 12:15:13 +09:00 |
|
Roman Kapustin
|
b4809f4417
|
External link warning code cleanup
|
2018-11-01 23:52:07 +03:00 |
|
Dean Herbert
|
0a0023920f
|
Fix not being able to drag control points mid-snake
|
2018-11-02 04:09:33 +09:00 |
|
smoogipoo
|
1aae123ff5
|
Make approximators share an interface
|
2018-11-01 19:16:44 +09:00 |
|
Dean Herbert
|
c1304eca1b
|
Merge remote-tracking branch 'upstream/master' into slider-placement
|
2018-11-01 17:59:37 +09:00 |
|
Dean Herbert
|
bb2f8deb18
|
ControlPoint -> PathControlPoint
Also Curve -> Path.
|
2018-11-01 03:56:51 +09:00 |
|
Dean Herbert
|
9cb4374b51
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-11-01 02:37:31 +09:00 |
|
Dean Herbert
|
85a7325911
|
Fix placement masks handling scroll events
|
2018-10-31 17:23:27 +09:00 |
|
Dean Herbert
|
9aa88293e2
|
Use HResult
|
2018-10-31 17:07:05 +09:00 |
|
Dean Herbert
|
29a1d092fa
|
Don't log disk space related IO errors
|
2018-10-31 16:43:35 +09:00 |
|
Dean Herbert
|
d38bf38606
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-10-31 15:23:30 +09:00 |
|
Dean Herbert
|
d7f3e51050
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 15:00:38 +09:00 |
|
Kyle Chang
|
214ed43b81
|
Check if SongSelect is current screen before playing selected song
|
2018-10-30 23:47:54 -04:00 |
|
Dean Herbert
|
5eaf80ab76
|
Add missing newline
|
2018-10-31 12:07:06 +09:00 |
|
Dean Herbert
|
3207a585c6
|
Add missing xmldoc
|
2018-10-31 12:01:10 +09:00 |
|
Dean Herbert
|
b28c0cd128
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 06:46:48 +09:00 |
|
Dean Herbert
|
7e88b8b457
|
Merge branch 'master' into selection-mask-testcase
|
2018-10-31 06:14:33 +09:00 |
|
Dean Herbert
|
5f5e30c378
|
Merge branch 'master' into mask-separation
|
2018-10-31 05:59:07 +09:00 |
|
Dean Herbert
|
6f1ef3243d
|
Proportionally adjust width in line with change
|
2018-10-31 02:56:25 +09:00 |
|
Dean Herbert
|
4502fa39e9
|
Merge remote-tracking branch 'upstream/master' into reduce-handle-height
|
2018-10-31 02:55:38 +09:00 |
|
Paul Teng
|
4bc9161cd1
|
Leave bigger gap if replaying
|
2018-10-30 08:32:12 -04:00 |
|
smoogipoo
|
5712a52817
|
Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-30 16:46:13 +09:00 |
|
Dean Herbert
|
0b534885b8
|
Update framework
|
2018-10-30 00:10:34 -07:00 |
|
Dean Herbert
|
113f80570b
|
Merge remote-tracking branch 'upstream/master' into separate-slider-body
|
2018-10-30 00:07:29 -07:00 |
|
Kyle Chang
|
6d00aff9fd
|
Add type parameter to IApplicableToBeatmap
|
2018-10-30 00:13:33 -04:00 |
|
smoogipoo
|
08b16be3b8
|
Merge branch 'slider-controlpoint-masks' into slider-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
|
2018-10-29 15:55:38 +09:00 |
|
smoogipoo
|
acd703c27b
|
Make sliders respond to control point changes
|
2018-10-29 15:36:43 +09:00 |
|
smoogipoo
|
a9f1484e8b
|
Fix some post-rebase issues
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
e964a555d0
|
Fix DummyWorkingBeatmap having unrealistic defaults
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
8b36d9b482
|
Remove SliderCurve.Offset (unused)
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
b3e105ba93
|
Make curve approximators implement common interface
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
619a0dfd59
|
Merge branch 'separate-slider-body' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-29 15:24:15 +09:00 |
|
smoogipoo
|
dd5a3ad59c
|
Fix SliderMask not working
|
2018-10-29 15:17:45 +09:00 |
|
Kyle Chang
|
8f5e495585
|
Merge branch 'master' of https://github.com/ppy/osu into mania-dual-fix
|
2018-10-29 00:16:29 -04:00 |
|
Kyle Chang
|
c7e950af7f
|
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
|
2018-10-29 00:04:51 -04:00 |
|
Kyle Chang
|
886dd0f0d4
|
Remove unneeded using directive
|
2018-10-28 13:21:12 -04:00 |
|
Kyle Chang
|
2b736c3cd6
|
Make beatmap edit button reload beatmap without mods
|
2018-10-28 13:04:45 -04:00 |
|
Kyle Chang
|
f8a8c7cb6b
|
Stop transferring track when editing
|
2018-10-28 12:43:19 -04:00 |
|
Kyle Chang
|
8c4e08d280
|
Merge branch 'master' of https://github.com/qwewqa/osu into mania-dual-fix
|
2018-10-28 12:02:18 -04:00 |
|
Dean Herbert
|
4f65d67e2b
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-28 08:35:25 -07:00 |
|
Kyle Chang
|
df6fc4013a
|
Add interface to adjust Beatmaps
|
2018-10-28 02:21:25 -04:00 |
|
HoLLy
|
cf3b4447eb
|
Fade only textContainer instead of entire MetadataSection
|
2018-10-26 13:35:51 +02:00 |
|
smoogipoo
|
951a309d04
|
Increase placement testcase circlesize
|
2018-10-26 15:36:09 +09:00 |
|
smoogipoo
|
f674fcf2c8
|
Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
|
2018-10-26 14:05:30 +09:00 |
|
smoogipoo
|
ce9b400c4c
|
Add selection mask test cases
|
2018-10-26 13:58:33 +09:00 |
|
smoogipoo
|
9656186b64
|
Make the hitobject masks move within their placement/selection
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
|
2018-10-26 13:45:31 +09:00 |
|
smoogipoo
|
8703db5cc1
|
Rename HitObjectMask -> SelectionMask
|
2018-10-26 13:31:23 +09:00 |
|
smoogipoo
|
2f42112d87
|
Add placement mask testcase
|
2018-10-25 19:11:57 +09:00 |
|
smoogipoo
|
2b141a2bc1
|
Make PlacementMask abstract
|
2018-10-25 19:10:59 +09:00 |
|
smoogipoo
|
4ecd4ca462
|
Add selection mask test cases
|
2018-10-25 19:10:52 +09:00 |
|
smoogipoo
|
ea6db8b793
|
Make the hitobject masks move within their placement/selection
|
2018-10-25 18:16:25 +09:00 |
|
HoLLy
|
88aca46500
|
Fade MetadataSection back in if non-null Text is set
|
2018-10-24 18:53:22 +02:00 |
|
Roman Kapustin
|
7401fabb5d
|
Extract external link opening to the ExternalLinkOpener class
|
2018-10-23 23:03:00 +03:00 |
|
Dean Herbert
|
94093ac948
|
Update beatmap search API to match latest osu-web structure
|
2018-10-23 18:05:41 +09:00 |
|
smoogipoo
|
8a2a6a3ecb
|
Preserve the beatmap's version
|
2018-10-23 14:59:21 +09:00 |
|
Roman Kapustin
|
805f8d98c4
|
Implement warn about opening external links option
|
2018-10-22 23:57:37 +03:00 |
|
Roman Kapustin
|
b4c68f4cf7
|
Show a warning prior to opening external links
|
2018-10-22 23:16:57 +03:00 |
|
Dan Balasescu
|
412f65bb70
|
Merge branch 'master' into check-before-btn-change
|
2018-10-22 17:29:26 +09:00 |
|
smoogipoo
|
05d89180c8
|
Move brace on new line
|
2018-10-22 12:17:23 +09:00 |
|
Paul Teng
|
86b29064c6
|
Change DownloadState only when Download is possible
|
2018-10-18 08:51:05 -04:00 |
|
Dean Herbert
|
ae94aab677
|
Update framework
|
2018-10-18 21:04:29 +09:00 |
|
Paul Teng
|
b351aae93f
|
Reduce height of song progress handle
|
2018-10-18 07:02:18 -04:00 |
|
smoogipoo
|
72d48aa7f5
|
Add xmldocs to IPlacementHandler
|
2018-10-18 16:46:30 +09:00 |
|
smoogipoo
|
0e841628b6
|
Implement hitobject deletion
|
2018-10-18 16:36:06 +09:00 |
|
Dean Herbert
|
a2b8904b1e
|
Merge branch 'master' into database-standardize-paths
|
2018-10-18 16:21:45 +09:00 |
|
HoLLy
|
3f185a44de
|
Fix Windows-style path separators not being migrated on Unix systems
|
2018-10-18 08:29:12 +02:00 |
|
Paul Teng
|
7720fa10eb
|
Reduce height of RankChartLineGraph
|
2018-10-17 20:19:01 -04:00 |
|
smoogipoo
|
5a5e91eaed
|
Add a way to re-invoke ApplyDefaults on placement object
|
2018-10-17 18:36:47 +09:00 |
|