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 |
|
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 |
|
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 |
|
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 |
|
smoogipoo
|
b7435c0c5f
|
Fix border layer not working
|
2018-10-17 18:29:30 +09:00 |
|
smoogipoo
|
6eb7a030d0
|
Fix placement container not being refreshed upon placement
|
2018-10-17 18:11:44 +09:00 |
|
smoogipoo
|
d36ac59ca2
|
Reduce complexity of creating edit ruleset containers
|
2018-10-17 18:06:00 +09:00 |
|
smoogipoo
|
969477dadd
|
Remove placement events, make everything pass top-down
|
2018-10-17 17:43:16 +09:00 |
|
smoogipoo
|
62635c5ab8
|
Add container to handle placement mask
|
2018-10-17 16:17:49 +09:00 |
|
smoogipoo
|
4ea4ec0d25
|
Move placement handling events to a higher level
|
2018-10-17 15:46:30 +09:00 |
|
smoogipoo
|
08e3fe1def
|
Add PlacementStarted event, rename placement methods
|
2018-10-17 14:37:45 +09:00 |
|
smoogipoo
|
1bebceada7
|
Unroll loop for the last control point
|
2018-10-17 11:55:34 +09:00 |
|
smoogipoo
|
336b6fa38e
|
Perform a custom binary search to remove thread-unsafeness
|
2018-10-17 11:23:18 +09:00 |
|
smoogipoo
|
d431dd59a8
|
Cleanups
|
2018-10-17 10:53:21 +09:00 |
|
smoogipoo
|
70f1d17b7e
|
Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2018-10-16 17:28:16 +09:00 |
|
smoogipoo
|
47be95ce0b
|
Fix slider nodes using the wrong samples
|
2018-10-16 17:10:24 +09:00 |
|
HoLLy
|
eb9199e07a
|
Run database migration unconditionally, remove downwards migration
|
2018-10-16 08:29:47 +02:00 |
|
smoogipoo
|
41391a6627
|
Fix beatmap conversion tests failing
|
2018-10-16 12:01:58 +09:00 |
|
smoogipoo
|
3ad93d5a07
|
Remove redundant type specifications
|
2018-10-16 11:40:51 +09:00 |
|
smoogipoo
|
060cc24dba
|
Cleanup slidercurve calculation
|
2018-10-16 11:11:04 +09:00 |
|
smoogipoo
|
72aaaa4a74
|
PointSearch -> SearchPoint
|
2018-10-16 10:29:53 +09:00 |
|
smoogipoo
|
5095fbcdf7
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-16 10:27:18 +09:00 |
|
HoLLy
|
710b0a4664
|
Remove unnecessary PathSanitise call
|
2018-10-12 15:30:24 +02:00 |
|
Dean Herbert
|
eaa5ef5168
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-10-12 22:14:23 +09:00 |
|
HoLLy
|
bb07630743
|
Merge branch 'master' into database-standardize-paths
|
2018-10-12 14:08:25 +02:00 |
|
Dean Herbert
|
a314a561d0
|
Merge branch 'master' into playfield-scaling-rework
|
2018-10-12 19:32:43 +09:00 |
|
Dean Herbert
|
468f7fd1ea
|
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
|
2018-10-12 19:25:08 +09:00 |
|
Dean Herbert
|
ad42f2244d
|
Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer
|
2018-10-12 19:15:11 +09:00 |
|
Dean Herbert
|
15dae9b2e4
|
Update nuget dependencies (version mismatches)
|
2018-10-12 18:51:51 +09:00 |
|
Dean Herbert
|
1de770e093
|
Merge branch 'master' into fix-sv
|
2018-10-12 18:13:50 +09:00 |
|
Dean Herbert
|
f7c887cf79
|
Merge branch 'master' into debounce-seeks
|
2018-10-12 17:50:39 +09:00 |
|
Dean Herbert
|
8e66f9a85d
|
Merge branch 'master' into tighten-diffcalc-tolerances
|
2018-10-12 17:35:33 +09:00 |
|
Dean Herbert
|
182aa63cc8
|
Update nuget dependencies
|
2018-10-12 17:08:59 +09:00 |
|
Dean Herbert
|
c52a292935
|
Update framework
|
2018-10-12 16:10:32 +09:00 |
|
Dean Herbert
|
d6043a6cd3
|
Merge remote-tracking branch 'upstream/master' into smooth-path
|
2018-10-12 16:03:36 +09:00 |
|
smoogipoo
|
e130204a3b
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-12 12:26:15 +09:00 |
|
Dean Herbert
|
5d26c1b771
|
Merge pull request #3574 from smoogipoo/hitobject-perf-improvements
Various performance improvements around hitobjects
|
2018-10-11 22:16:48 +09:00 |
|
smoogipoo
|
d282d16e1c
|
Use SortedList again
|
2018-10-11 20:49:12 +09:00 |
|
smoogipoo
|
fb1760f580
|
Simplify linq from beatmap conversion
|
2018-10-11 20:29:37 +09:00 |
|
smoogipoo
|
ec9f23ab73
|
Make IBeatmap.HitObjects an IReadOnlyList
|
2018-10-11 19:53:07 +09:00 |
|
smoogipoo
|
7b2a30f5b4
|
Reduce some high-profile enumerator allocations
|
2018-10-11 19:52:03 +09:00 |
|
smoogipoo
|
10fb1d20d1
|
Remove allocation of control point with every binarysearch
|
2018-10-11 19:08:00 +09:00 |
|
smoogipoo
|
5b544a0c97
|
Remove allocation of string.IndexOf()
|
2018-10-11 18:37:48 +09:00 |
|
smoogipoo
|
bd99a87298
|
Use ordinal comparison in LegacyBeatmapDecoder
|
2018-10-11 17:48:47 +09:00 |
|
smoogipoo
|
83fd251c7b
|
Pass sub-controlpoints as span slices
|
2018-10-11 17:44:25 +09:00 |
|
smoogipoo
|
0c4403ef16
|
Don't apply version offset during diff calc
|
2018-10-11 13:53:49 +09:00 |
|
Dean Herbert
|
aac95523ec
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-10 20:26:27 +09:00 |
|
Dean Herbert
|
7137c01352
|
Merge pull request #3549 from plankp/result-no-gamemode-switch
Stop ruleset selector from propagating positional input
|
2018-10-10 20:15:30 +09:00 |
|
Dean Herbert
|
2babdc079c
|
Merge pull request #3568 from smoogipoo/fix-beatmap-details
Fix beatmap details not displaying
|
2018-10-10 20:14:58 +09:00 |
|
Dean Herbert
|
3fad1c42bb
|
Merge branch 'master' into result-no-gamemode-switch
|
2018-10-10 20:03:58 +09:00 |
|
Paul Teng
|
2181f34f74
|
Merge branch 'master' into result-no-gamemode-switch
|
2018-10-10 06:43:01 -04:00 |
|
Dean Herbert
|
1b6f37f3eb
|
Merge branch 'master' into wiggle-repeat-points
|
2018-10-10 19:42:10 +09:00 |
|
Dean Herbert
|
ed0dcb2e73
|
Add comment explaining why
|
2018-10-10 19:41:40 +09:00 |
|
Dean Herbert
|
d28b9860ff
|
Don't use "beatmapset" terminology
|
2018-10-10 19:26:35 +09:00 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
smoogipoo
|
b56d09c83b
|
Set hitobject placement time manually
|
2018-10-10 15:32:59 +09:00 |
|
smoogipoo
|
f53bb81723
|
Remove unnecessary lambda allocation
|
2018-10-10 14:58:54 +09:00 |
|
smoogipoo
|
417ebaeb85
|
Reduce hitobject size by removing lazy
|
2018-10-10 13:03:18 +09:00 |
|
smoogipoo
|
1125075b37
|
Use list with post-sort for nested hitobjects
|
2018-10-10 13:02:27 +09:00 |
|
Paul Teng
|
a91dda1a89
|
Merge branch 'master' into result-no-gamemode-switch
|
2018-10-09 13:04:53 -04:00 |
|
HoLLy
|
4bd1416a89
|
Merge branch 'master' into database-standardize-paths
|
2018-10-09 18:28:44 +02:00 |
|
HoLLy
|
b35f88b8ba
|
Standardize AudioFile and BackgroundImage paths
|
2018-10-09 17:49:18 +02:00 |
|
Paul Teng
|
ae79c3832e
|
Add base. for safety
|
2018-10-09 11:05:15 -04:00 |
|
Dean Herbert
|
3be50c2941
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-10-09 18:02:36 +09:00 |
|
Dean Herbert
|
06ea174f34
|
Merge branch 'master' into fix-sv
|
2018-10-09 18:00:34 +09:00 |
|
smoogipoo
|
6d24bde72b
|
Fix beatmap details not displaying
|
2018-10-09 17:39:27 +09:00 |
|
smoogipoo
|
ccb6723711
|
Debounce music controller seeks
|
2018-10-09 16:50:29 +09:00 |
|
Dan Balasescu
|
a2838d32bf
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-09 16:23:43 +09:00 |
|
Dean Herbert
|
a171ed3500
|
Fix joined channels not appearing as joined in the channel list
|
2018-10-09 16:12:20 +09:00 |
|
smoogipoo
|
9facf707be
|
Add diffcalc beatmap decoder
|
2018-10-09 11:49:24 +09:00 |
|