1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 10:43:22 +08:00
Commit Graph

1976 Commits

Author SHA1 Message Date
Dean Herbert
ef7982fbfa
Merge pull request #31446 from EVAST9919/new-combo-editor
Fix performance degradation while trying to place object with a new combo in the editor.
2025-01-15 12:56:06 +09:00
Bartłomiej Dach
933f5db208
Merge branch 'master' into new-combo-editor 2025-01-10 14:13:14 +01:00
Bartłomiej Dach
0d9a3428ae
Merge conditionals 2025-01-10 14:13:03 +01:00
Bartłomiej Dach
48196949e0
Add combo colour override control to editor
Closes https://github.com/ppy/osu/issues/25608.

Logic mostly matching stable. All operations are done on `ComboOffset`
which still makes overridden combo colours weirdly relatively dependent
on each other rather than them be an "absolute" choice, but alas...

As per stable, two consecutive new combos can use the same colour only
if they are separated by a break:

    52f3f75ed7/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4564-L4571

This control is only available once the user has changed the combo
colours from defaults; additionally, only a single new combo object
must be selected for the colour selector to show up.
2025-01-10 13:40:56 +01:00
Dan Balasescu
38d95abc24
Merge pull request #31462 from bdach/ternary-button-is-bad
Simplify editor "ternary button" structure
2025-01-10 14:24:41 +09:00
Dean Herbert
2133ac6d01
Merge pull request #31453 from bdach/fix-juice-stream-placement-offset
Fix juice stream placement blueprint being initially visually offset
2025-01-10 01:51:24 +09:00
Bartłomiej Dach
5c8ae6f851
Simplify editor "ternary button" structure
As I look into re-implementing the ability to choose combo colour for an
object (also known as "colourhax") from the editor UI, I stumble upon
these wretched ternary items again and sigh a deep sigh of annoyance.

The structure is overly rigid. `TernaryItem` does nothing that
`DrawableTernaryItem` couldn't, except make it more annoying to add
specific sub-variants of `DrawableTernaryItem` that could do more
things.

Yes you could sprinkle more levels of virtuals to
`CreateDrawableButton()` or something, but after all, as Saint Exupéry
says, "perfection is finally attained not when there is no longer
anything to add, but when there is no longer anything to take away."
So I'm leaning for taking one step towards perfection.
2025-01-09 13:41:22 +01:00
Bartłomiej Dach
18f1d62182
Fix juice stream placement blueprint being initially visually offset
- Closes https://github.com/ppy/osu/issues/31423.
- Regressed in https://github.com/ppy/osu/pull/30411.

Admittedly, I don't completely understand all of the pieces here,
because code quality of this placement blueprint code is ALL-CAPS
ATROCIOUS, but I believe the failure mode to be something along the
lines of:

- User activates juice stream tool, blueprint gets created in initial
  state. It reads in a mouse position far outside of the playfield, and
  sets internal positioning appropriately.
- When the user moves the mouse into the bounds of the playfield, some
  positions update (the ones inside `UpdateTimeAndPosition()`, but the
  fruit markers are for *nested* objects, and
  `updateHitObjectFromPath()` is responsible for updating those...
  however, it only fires if the `editablePath.PathId` changes, which it
  won't here, because there is only one path vertex until the user
  commits the starting point of the juice stream and it's always at
  (0,0).
- Therefore the position of the starting fruit marker remains bogus
  until left click, at which point the path changes and everything
  returns to *relative* sanity.

The solution essentially relies on inlining the broken method and only
guarding the relevant part of processing behind the path version check
(which is actually updating the path). Everything else that can touch
positions of nesteds (like default application, and the drawable piece
updates) is allowed to happen unconditionally.
2025-01-09 09:37:57 +01:00
Bartłomiej Dach
9058fd9739
Delete entire juice stream when only one vertex remains after deleting another vertex
Closes https://github.com/ppy/osu/issues/31425.
2025-01-08 11:47:25 +01:00
Andrei Zavatski
8f4eafea4e Fix combo properties multiple reassignments 2025-01-07 14:00:31 +03:00
Bartłomiej Dach
0d16ed028b
Add setters to hitobject coordinate interfaces 2024-12-27 11:01:47 +01:00
Bartłomiej Dach
5a0b732ee3
Add comments backreferences to copies of duplicated code for future use 2024-12-11 16:26:11 +09:00
Bartłomiej Dach
1f43ad3928
Merge branch 'master' into catch-convert-to-stream 2024-12-11 16:24:45 +09:00
Bartłomiej Dach
2138729c02
Do not show distance to next/previous object if said object is a banana shower
The results of such a display were a little bit nonsensical.
2024-11-21 12:17:43 +01:00
Darius Wattimena
a8e14b6625 Align inspector info more to how it is shown for osu 2024-11-19 19:54:12 +01:00
Darius Wattimena
111f029ead Added a custom hitobject inspector for catch additionally show the x value of prev and next 2024-11-18 23:53:01 +01:00
Darius Wattimena
16158710f9 Made reading of ReadCurrentDistanceSnap public 2024-11-18 23:49:40 +01:00
Darius Wattimena
00e3b20ff0 Change text to stream instead of fruits as that is the term by catch mappers 2024-11-18 22:30:15 +01:00
Darius Wattimena
5ac3bb73ee Adds an option to the catch editor to convert sliders to fruits 2024-11-18 22:19:08 +01:00
Bartłomiej Dach
37c2ab9e6f
Merge branch 'master' into resizable-catcher 2024-11-01 13:08:06 +01:00
Bartłomiej Dach
488fabcd54
Use alternative method of resizing the catcher trails
This one preserves the catcher afterimage, which I'd count as a win.
2024-11-01 13:07:32 +01:00
Darius Wattimena
2b14d78f04 Hide the after image instead as the effect can't be resized easily 2024-10-24 23:40:23 +02:00
Darius Wattimena
5e642cbce7 Apply code feedback and also resize catcher trails when any is shown 2024-10-24 23:17:47 +02:00
Dean Herbert
5939c78760
Merge branch 'master' into auto-addition2 2024-10-23 15:53:07 +09:00
Darius Wattimena
b75437ee13 Fix an issue where changing the CircleSize wouldn't adjust the catcher size and represent hyperdashes incorrectly 2024-10-15 21:47:22 +02:00
Bartłomiej Dach
1bab2236fe
Ensure columns collapse into one correctly if no space 2024-10-03 15:01:23 +02:00
Bartłomiej Dach
99eb26b7d5
Redo the layout of sections based on discord feedback
See
https://discord.com/channels/188630481301012481/188630652340404224/1291358770064130140
and everything after.
2024-10-03 13:53:21 +02:00
Dean Herbert
861da968d4
Fix banana override 2024-10-01 16:48:20 +09:00
Dean Herbert
590f27e0a0
Merge branch 'master' into hotkeys-in-context-menus 2024-10-01 15:50:19 +09:00
Dean Herbert
c46d787f1e
Merge pull request #29949 from minetoblend/feature/scale-around-center
Support scaling around center when scaling with select box
2024-09-28 21:37:39 +09:00
Dan Balasescu
3111d6a74d
Merge pull request #29986 from OliBomby/refactor-placement-tool
Refactor placement blueprints to not be limited to hit objects
2024-09-25 17:59:43 +09:00
OliBomby
d26e677bb7 fix warnings 2024-09-24 20:32:08 +02:00
OliBomby
e3b4483872 Refactor PlacementBlueprint to not be hitobject specific 2024-09-24 20:31:00 +02:00
Givikap120
2995df7903 removed unnecessary includes 2024-09-22 15:04:21 +03:00
Givikap120
1b77b3912b initial commit 2024-09-22 15:01:58 +03:00
Marvin Schürz
3180468db1 Prevent the distance snap grid from being activated by alt key while dragging select box handle 2024-09-21 14:22:17 +02:00
Dean Herbert
f8fff4074d
Fix rotation not being updated correctly on start time change 2024-09-17 16:18:29 +09:00
Dean Herbert
c1c0d49bfe
Add comments and fix bananas stopping still if not caught 2024-09-17 16:15:45 +09:00
Dean Herbert
3f4422429d
*Also* fix droplets 2024-09-17 15:38:51 +09:00
Dean Herbert
2ccdad41e7
Also fix banana showers 2024-09-17 15:31:00 +09:00
Dean Herbert
785a725507
Fix osu!catch fruit rotation being applied too late 2024-09-17 15:12:02 +09:00
Dan Balasescu
c7a2e79b6e
Merge branch 'master' into pp_refactoring_merge_multipliers 2024-09-12 16:22:55 +09:00
Bartłomiej Dach
130802e480
Add hotkey hints to editor menus 2024-09-04 12:16:54 +02:00
Dean Herbert
171ac0f510
Fix incorrect osu!catch snap display when last object is a juice stream
Addresses https://github.com/ppy/osu/discussions/29678.
2024-09-02 17:26:14 +09:00
Dan Balasescu
30fb3c3999
Fix osu!catch fruits not resizing on texture change 2024-09-02 15:23:40 +09:00
Bartłomiej Dach
d3f31fad80
Merge pull request #29646 from smoogipoo/fix-catch-auto
Fix catch auto generator not considering circle size
2024-08-30 11:08:22 +02:00
Dan Balasescu
7435e8aa00
Fix catch auto generator not considering circle size 2024-08-30 00:48:53 +09:00
Dan Balasescu
4e8fb0dcab
Merge branch 'master' into scroll-speed-std 2024-08-30 00:41:05 +09:00
Dean Herbert
48cfd77ee8
Component -> Lookup 2024-08-23 14:48:50 +09:00
OliBomby
2de5ecceb8 Merge remote-tracking branch 'upstream/master' into scroll-speed-std 2024-08-22 20:17:14 +02:00