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

Drawable Bash Implementation (Input only) #516

Merged
merged 24 commits into from
Mar 27, 2017
Merged

Drawable Bash Implementation (Input only) #516

merged 24 commits into from
Mar 27, 2017

Commits on Mar 17, 2017

  1. Merge branch 'taiko_judgement_scoring' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
    @smoogipoo
    smoogipoo committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    e37def9 View commit details
    Browse the repository at this point in the history

  2. Add basic DrawableBash (no graphics yet, just input).

    @smoogipoo
    smoogipoo committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    891bd01 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable

    @smoogipoo
    smoogipoo committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    e2673a9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'taiko_bash_base' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
    @smoogipoo
    smoogipoo committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    91775b3 View commit details
    Browse the repository at this point in the history

  5. Fix post-merge errors.

    @smoogipoo
    smoogipoo committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    a2d07ac View commit details
    Browse the repository at this point in the history

  6. Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable

    @smoogipoo
    smoogipoo committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    39c2703 View commit details
    Browse the repository at this point in the history

  7. Fix post-merge errors.

    @smoogipoo
    smoogipoo committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    e3afa9b View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Merge branch 'master' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
    @smoogipoo
    smoogipoo committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    3f7cd41 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'taiko_bash_base' into taiko_bash_drawable

    @smoogipoo
    smoogipoo committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    b751cd4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
    @smoogipoo
    smoogipoo committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    57c7086 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
    @smoogipoo
    smoogipoo committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    7cf935c View commit details
    Browse the repository at this point in the history

  2. Fix post-merge errors.

    @smoogipoo
    smoogipoo committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    1532ae7 View commit details
    Browse the repository at this point in the history

  3. Override UpdateScrollPosition instead of Update.

    @smoogipoo
    smoogipoo committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    a72ae31 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. Merge branch 'master' into taiko_bash_drawable

    @peppy
    peppy authored Mar 23, 2017
    Configuration menu
    Copy the full SHA
    3544d98 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2017

  1. Merge branch 'master' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
    @smoogipoo
    smoogipoo committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    ce1257b View commit details
    Browse the repository at this point in the history

  2. Fix post-merge errors.

    @smoogipoo
    smoogipoo committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    79fa9da View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2017

  1. Merge remote-tracking branch 'origin/master' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
    @smoogipoo
    smoogipoo committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    a7cea81 View commit details
    Browse the repository at this point in the history

  2. Rename bash -> swell.

    @smoogipoo
    smoogipoo committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    e794185 View commit details
    Browse the repository at this point in the history

  3. Remove CreateCircle() - hitobjects should handle the addition of this… 

    … to their hierarchy themselves.

CreateCircle() lends itself to a few issues:
- It can't be used for drum roll ticks unless it returned a Container instead, at which point the method loses its meaning, and I would rather that constructed in the ctor.
- Writing `return Accented ? new AccentedCirclePiece() : new CirclePiece()` in two places as the body of this method feels wrong - it's something I would expect to be taken care of in the base DrawableTaikoHitObject, but that leads back to #1.
- Swells don't have an AccentedCirclePiece, so #2 becomes more problematic.
    @smoogipoo
    smoogipoo committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    cbb6930 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into taiko_bash_drawable

    @peppy
    peppy authored Mar 25, 2017
    Configuration menu
    Copy the full SHA
    a774a68 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'better_taiko_keys' into taiko_bash_drawable 

    Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
    @smoogipoo
    smoogipoo committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    6e5db7b View commit details
    Browse the repository at this point in the history

  6. Fix post-merge errors.

    @smoogipoo
    smoogipoo committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    9b0a15c View commit details
    Browse the repository at this point in the history

  7. Remove validKeys (now in DrawableTaikoHitObject).

    @smoogipoo
    smoogipoo committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    d9ecb43 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2017

  1. Merge branch 'master' into taiko_bash_drawable

    @peppy
    peppy authored Mar 27, 2017
    Configuration menu
    Copy the full SHA
    e81040c View commit details
    Browse the repository at this point in the history