9d92b795fa
Revert making ComboOffsets legacy and define BeatmapSkinComboIndex instead
2021-07-20 14:15:43 +03:00
554652b033
Merge branch 'refactor-combo-colour-retrieval' into legacy-beatmap-combo-offset
2021-07-20 10:11:52 +03:00
1af230c48c
Merge branch 'master' into refactor-combo-colour-retrieval
2021-07-20 10:08:25 +03:00
8586458704
Implement vertex deletion in juice stream selection blueprint
2021-07-19 22:53:32 +09:00
08f8d4e65e
Implement vertex addition in juice stream selection blueprint
2021-07-19 22:53:32 +09:00
8cc1630655
Add initial juice stream editing
2021-07-19 22:53:32 +09:00
6d49165664
Merge pull request #13928 from ekrctb/juice-stream-path
...
Add `JuiceStreamPath` as alternative representation of `JuiceStream` path for catch editor
2021-07-19 22:18:05 +09:00
81d0a9bd9c
Fix item ordering
2021-07-19 21:05:36 +09:00
41169fbdaf
Add [NotNull]
2021-07-19 20:20:10 +09:00
7201cfe0b4
Move child drawable creation of CatchPlayfield from constructor to load.
2021-07-19 20:18:17 +09:00
879467961f
Fix catcher trails displayed in wrong place
2021-07-19 20:13:31 +09:00
b88ee3c1a1
Pass DroppedObjectContainer via constructor instead of DI
...
It is now just one level deep, so it is not beneficial to use DI here.
This effectively reverts ae09c23e
2021-07-19 20:11:49 +09:00
50f9e5f362
Replace usage of CatcherArea.MovableCatcher with Catcher
2021-07-19 19:52:40 +09:00
97059a9f50
Create Catcher in CatchPlayfield
2021-07-19 19:44:40 +09:00
23ef666f34
Merge pull request #13887 from ekrctb/legacy-converted-y
...
Preserve Y position of hit objects in osu!catch
2021-07-19 18:48:23 +09:00
443058f879
Move playfield constant to top of file and make internal
2021-07-19 18:41:29 +09:00
be495a7488
Add JuiceStreamPath to allow editing JuiceStream in catch editor
...
A `JuiceStream` holds a legacy `SliderPath` as the representation of the path.
However, the `SliderPath` representation is difficult to work with because `SliderPath` works in 2D position, while osu!catch works in `(time, x)` coordinates.
This `JuiceStreamPath` represents the path in a more convenient way, a polyline connecting list of `(distance, x)` vertices.
2021-07-19 13:59:10 +09:00
c347584851
Use added utility function
2021-07-19 13:33:46 +09:00
70c9d7105f
Add a function to compute hit object position in catch editor
2021-07-19 13:33:22 +09:00
fb5d25405e
Replace calls to obsoleted GetOrDefault() extension
2021-07-18 21:52:16 +02:00
7f432665e5
Preserve Y position of hit objects in osu!catch
2021-07-14 14:38:38 +09:00
0c52b26d23
Merge pull request #13824 from peppy/da-mod-refactor
...
Refactor `ModDifficultyAdjust` to more elegantly track user override status
2021-07-12 12:03:45 +09:00
79d546afa2
Add missing osu!catch difficulty adjust attributes
2021-07-11 10:14:42 +09:00
6f89f8e572
Merge branch 'master' into da-mod-refactor
2021-07-10 11:41:54 +02:00
c5011865fc
Invert strangely negated condition
2021-07-10 11:23:38 +02:00
494089e402
Fix up English in comment
2021-07-10 11:22:54 +02:00
995ef953c6
Modify comment
2021-07-09 15:13:54 +09:00
90326f8864
Standardise variables
2021-07-09 13:24:26 +09:00
7e14679606
Expand the selection movement limiting code with detailed comments
2021-07-09 12:58:08 +09:00
c937c45360
Don't move selected objects outside the playfield in catch editor
2021-07-08 18:49:32 +09:00
88b00123f6
Use existing reflection methods to avoid manual binding of ExtendedLimits
2021-07-08 17:49:00 +09:00
bd7c334588
Avoid the need for per-settings control classes
2021-07-08 17:49:00 +09:00
a6e94dd491
Add back extended limits support
2021-07-08 17:49:00 +09:00
0e4f4a6fde
Initial storage changes
2021-07-08 14:28:13 +09:00
f1aa99e103
Fix catch selection blueprint not displayed after copy-pasted
2021-07-07 21:03:26 +09:00
7d76fcf2b6
Fix hit object placement not receiving input when outside playfield
...
The input area is vertical infinite, but horizontally restricted to the playfield due to `CatchPlayfield`'s `ReceivePositionalInputAt` override.
2021-07-07 16:18:21 +09:00
115376c538
Add playfield border to catch editor
2021-07-07 16:14:45 +09:00
fd46d30f29
Merge pull request #13795 from ekrctb/juice-stream-selection-1
...
Add path visualization to juice stream selection blueprint
2021-07-07 15:24:39 +09:00
7b21d1ecf9
Fix juice stream outline disappears away when start position is outside the screen.
2021-07-06 19:50:32 +09:00
2ba3003934
Add nested fruit outlines to juice stream selection blueprint
2021-07-06 17:15:51 +09:00
7833a1b09a
Allow FruitOutline to be used for nested hit objects
2021-07-06 17:15:27 +09:00
0fa7716ced
Show path of juice stream in selection blueprint
2021-07-06 16:46:12 +09:00
7ef7c5148f
Add ScrollingPath for visualization of the real path of a JuiceStream
2021-07-06 16:41:53 +09:00
175d666906
Use getters of OriginalX and XOffset
2021-07-06 15:32:32 +09:00
ae1b1cbec9
Allow serialization of catch hit objects
2021-07-06 15:32:32 +09:00
01961fe4f9
Merge pull request #13747 from ekrctb/catcher-flip
...
Don't flip catcher plate contents when catcher changes direction
2021-07-06 00:02:23 +09:00
d247b8042e
Fix default skin catcher not flipping catcher plate
...
When legacy beatmap skin is present but catcher is not provided, it was using the legacy setting (always false).
2021-07-05 20:05:08 +09:00
83c80291d4
Don't flip catcher plate contents in legacy skin
2021-07-02 23:23:21 +09:00
fbba32647e
Decouple direction of catcher from its scale
2021-07-02 23:22:39 +09:00
170513568b
Move caught object stack vertical offset logic
2021-07-02 20:43:47 +09:00
