Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add grid placement tool #26313

Merged
merged 52 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3495510
kinda working grid from points
OliBomby Dec 30, 2023
fea0ceb
improve the grid from points
OliBomby Dec 30, 2023
c2ea184
fix period
OliBomby Dec 30, 2023
c952e2f
deselect stuff stuff when grid from points
OliBomby Dec 31, 2023
7a0535a
add right click for abort
OliBomby Dec 31, 2023
85bfd61
improve UI
OliBomby Dec 31, 2023
4e3fe51
merge conflict fix
OliBomby Jan 1, 2024
98505d0
improve grid from points tool code
OliBomby Dec 31, 2023
b54c9a3
move GridFromPointsClicked handler creation code
OliBomby Dec 31, 2023
f8979cf
fix distance
OliBomby Jan 1, 2024
2918ecf
Remove Masking from PositionSnapGrid
OliBomby Feb 1, 2024
93dbd75
Fix masking in circular snap grid
OliBomby Feb 1, 2024
e3aeaf6
Merge remote-tracking branch 'upstream/master' into grids-4
OliBomby Sep 19, 2024
d2f97f5
take into account rotation period for each grid type
OliBomby Sep 19, 2024
1a81e12
Refactor PlacementBlueprint to not be hitobject specific
OliBomby Sep 23, 2024
0a5a463
Convert 'grid from points' button to placement tool
OliBomby Sep 23, 2024
fe10621
Clarify criteria of grid spacing subdivision
OliBomby Sep 23, 2024
0f0f490
Don't snap to global grid while placing grid
OliBomby Sep 23, 2024
b274ed9
fix warnings
OliBomby Sep 23, 2024
b179e08
Merge remote-tracking branch 'upstream/master' into grids-4
OliBomby Sep 26, 2024
4e2bc0d
place grid with drag instead
OliBomby Sep 28, 2024
b1e381a
Update tooltip for drag
OliBomby Sep 28, 2024
1c6e426
return grid placement tool to right toolbox
OliBomby Sep 28, 2024
3e4cd0a
Add tooltip to rounded button
OliBomby Sep 28, 2024
4568af8
Combine drag and clicky interactions
OliBomby Sep 28, 2024
1912b1f
Revert "Add tooltip to rounded button"
OliBomby Sep 28, 2024
4de73dd
Reapply "Add tooltip to rounded button"
OliBomby Oct 1, 2024
9fa2849
Fixed tooltip inheritors of RoundedButton
OliBomby Oct 1, 2024
c84bb4b
Update tooltip
OliBomby Oct 1, 2024
f8397cc
Merge remote-tracking branch 'upstream/master' into grids-4
OliBomby Oct 1, 2024
4959045
Remove 'Centre on selected object' button
OliBomby Oct 1, 2024
4bbefa3
fix using directive
OliBomby Oct 1, 2024
80dffa9
Use new keyword instead of overriding TooltipText to remove setter
OliBomby Oct 3, 2024
2c39ecb
Add xmldoc to SnapType
OliBomby Oct 3, 2024
ad734b1
Revert "Use new keyword instead of overriding TooltipText to remove s…
OliBomby Oct 5, 2024
cc29e8c
introduce tooltip to rounded button with subclass instead
OliBomby Oct 5, 2024
ae8abc7
fix readybutton and favouritebutton
OliBomby Oct 5, 2024
1ab02b9
Merge branch 'master' into grids-4
peppy Oct 7, 2024
75f15cc
Maybe fix compilation? Fuck knows if this is correct.
peppy Oct 7, 2024
0a7d239
fix tooltip in SettingsButton
OliBomby Oct 7, 2024
d7526be
Merge remote-tracking branch 'upstream/master' into grids-4
OliBomby Oct 7, 2024
7b99821
move grid placement tool to left toolbox
OliBomby Oct 7, 2024
a755ae7
fix warning
OliBomby Oct 7, 2024
533ed60
Fix crash on placing circular grid
OliBomby Oct 7, 2024
db10202
Use new place grid icon
OliBomby Oct 7, 2024
076c8de
Revert "Use new place grid icon"
OliBomby Oct 7, 2024
66459c5
Rename to 'Grid'
OliBomby Oct 7, 2024
dc26773
Use FA icon instead
OliBomby Oct 7, 2024
682023e
Merge branch 'master' into grids-4
peppy Oct 8, 2024
b1be31c
Switch back to last tool after using grid tool, rather than always se…
peppy Oct 8, 2024
e794862
update comment
OliBomby Oct 8, 2024
de2f9de
Let right-click reset grid to default values
OliBomby Oct 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix readybutton and favouritebutton
  • Loading branch information
OliBomby committed Oct 5, 2024
commit ae8abc7f3576309bd68076c23d7358b02a94637d
5 changes: 3 additions & 2 deletions osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Graphics.UserInterface;
Expand All @@ -20,7 +21,7 @@

namespace osu.Game.Overlays.BeatmapSet.Buttons
{
public partial class FavouriteButton : HeaderButton
public partial class FavouriteButton : HeaderButton, IHasTooltip
{
public readonly Bindable<APIBeatmapSet> BeatmapSet = new Bindable<APIBeatmapSet>();

Expand All @@ -31,7 +32,7 @@ public partial class FavouriteButton : HeaderButton

private readonly IBindable<APIUser> localUser = new Bindable<APIUser>();

public override LocalisableString TooltipText
public LocalisableString TooltipText
{
get
{
Expand Down
5 changes: 3 additions & 2 deletions osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Localisation;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Online;
using osu.Game.Online.Rooms;

namespace osu.Game.Screens.OnlinePlay.Components
{
public abstract partial class ReadyButton : RoundedButton
public abstract partial class ReadyButton : RoundedButton, IHasTooltip
{
public new readonly BindableBool Enabled = new BindableBool();

Expand All @@ -28,7 +29,7 @@ private void load(OnlinePlayBeatmapAvailabilityTracker beatmapTracker)
private void updateState() =>
base.Enabled.Value = availability.Value.State == DownloadState.LocallyAvailable && Enabled.Value;

public override LocalisableString TooltipText
public LocalisableString TooltipText
{
get
{
Expand Down
Loading