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.

Sign up for GitHub

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

Jump to bottom

Add "argon" variant of song progress display #22144

Merged
merged 37 commits into from
Jan 18, 2023
Merged

Add "argon" variant of song progress display #22144

merged 37 commits into from
Jan 18, 2023

Commits on Jan 9, 2023

  1. refactor(hud/gameplay/SongProgress): Add interface to designate `Song… 

    …ProgressBar`s
    @ItsShamed
    ItsShamed committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    0f1fe1d View commit details
    Browse the repository at this point in the history

  2. feat(hud/gameplay): Add Argon variant of SongProgressBar

    @ItsShamed
    ItsShamed committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    f626519 View commit details
    Browse the repository at this point in the history

  3. refactor(hud/gameplay/SongProgressInfo): minor changes to text positi… 

    …oning, font and colour
    @ItsShamed
    ItsShamed committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    28d2d76 View commit details
    Browse the repository at this point in the history

  4. feat(hud/gameplay): implement Argon song progress density graph (Segm… 

    …entedGraph)
    @ItsShamed
    ItsShamed committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    5952cd0 View commit details
    Browse the repository at this point in the history

  5. feat(hud/gameplay): implement Argon variant of SongProgress

    @ItsShamed
    ItsShamed committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    91cde5f View commit details
    Browse the repository at this point in the history

  6. test: adapt and create tests to cover new components

    @ItsShamed
    ItsShamed committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    48deef4 View commit details
    Browse the repository at this point in the history

  7. test: make test not actually test anything

    @ItsShamed
    ItsShamed committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    eac8e9f View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. Merge branch 'master' into skin/argon-song-progress-cleaner

    @peppy
    peppy committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    d2309fe View commit details
    Browse the repository at this point in the history

  2. Update osu.Game/Screens/Play/HUD/ArgonSongProgress.cs

    @ItsShamed
    ItsShamed committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    4439698 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Merge branch 'master' into skin/argon-song-progress-cleaner

    @peppy
    peppy committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    65bd2e7 View commit details
    Browse the repository at this point in the history

  2. Fix TierColours assignment

    @peppy
    peppy committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    b62b571 View commit details
    Browse the repository at this point in the history

  3. test: remove test for ArgonSongProgressGraph

    @ItsShamed
    ItsShamed committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    66441d4 View commit details
    Browse the repository at this point in the history

  4. refactor(ArgonSongProgress): reorder layering and make density graph … 

    …visible for past time
    @ItsShamed
    ItsShamed committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    d91aa34 View commit details
    Browse the repository at this point in the history

  5. quality: remove unused Darken bindable boolean

    @ItsShamed
    ItsShamed committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    f1989ba View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Simplify HUD test to not require casting to specific ProgressBar type

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    45c5bd8 View commit details
    Browse the repository at this point in the history

  2. Tidy up ISongProgressBar interface

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    afc12e0 View commit details
    Browse the repository at this point in the history

  3. Combine common code into SongProgress base class

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    5429979 View commit details
    Browse the repository at this point in the history

  4. Switch test to specifically target the argon verison of the progress bar

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    f9dd3f6 View commit details
    Browse the repository at this point in the history

  5. Remove no longer necessary interface type

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    e8770b8 View commit details
    Browse the repository at this point in the history

  6. Add comment mentioning why reference clock fallback logic is required

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    742a026 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into skin/argon-song-progress-cleaner

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    5a272b4 View commit details
    Browse the repository at this point in the history

  8. Move "show difficulty graph" settings back to respective implementati… 

    …ons to avoid legacy version showing it
    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    7266d8e View commit details
    Browse the repository at this point in the history

  9. Adjust SkinnableTestScene to give more breathing room to `RelativeS… 

    …ize` components
    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    1e5dd91 View commit details
    Browse the repository at this point in the history

  10. Update TestSceneSongProgress to properly work with new implementation

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    04c0a5d View commit details
    Browse the repository at this point in the history

  11. Prefix subclasses of DefaultSongProgress with Default

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    bfb7573 View commit details
    Browse the repository at this point in the history

  12. Fix missing comment

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    8bfd853 View commit details
    Browse the repository at this point in the history

  13. Use actual beatmap's hitobjects in test to better display density

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    8030194 View commit details
    Browse the repository at this point in the history

  14. Limit catch-up speed in test to emulate gameplay

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    5ead85f View commit details
    Browse the repository at this point in the history

  15. Tidy up clock logic in all SongProgress classes

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    42e9b2b View commit details
    Browse the repository at this point in the history

  16. Merge branch 'frame-stable-cache' into skin/argon-song-progress-cleaner

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    17c35cf View commit details
    Browse the repository at this point in the history

  17. Simplify depth change logic

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    f3677ab View commit details
    Browse the repository at this point in the history

  18. Tidy up height logic and allow hovering above bar for easier interaction

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    01558a9 View commit details
    Browse the repository at this point in the history

  19. Adjust the seek effect to feel better

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    67b40dd View commit details
    Browse the repository at this point in the history

  20. Merge branch 'frame-stable-cache' into skin/argon-song-progress-cleaner

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    4cfb059 View commit details
    Browse the repository at this point in the history

  21. Fix broken test step

    @peppy
    peppy committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    d4f2cd2 View commit details
    Browse the repository at this point in the history

  22. Make SongProgressInfo.ShowProgress init-only (and remove duplicate … 

    …init)
    @bdach
    bdach committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    b8b7442 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' into skin/argon-song-progress-cleaner

    @bdach
    bdach committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    b62ff8d View commit details
    Browse the repository at this point in the history