3098 Commits

This Branch

This Branch

All Branches

• Fix resharper warning.
  smoogipooo · 2017-03-29 09:02:49 +09:00
  6d5b0a13e4
• Move swells on top of the playfield when they reach the hit target.
  smoogipooo · 2017-03-29 09:01:40 +09:00
  7fc68864be
• Better life time ends.
  smoogipooo · 2017-03-29 08:41:50 +09:00
  6bee57c94f
• Fix post-merge errors.
  smoogipooo · 2017-03-29 08:32:34 +09:00
  45653d7b43
• Merge remote-tracking branch 'origin/master' into taiko_swell_drawing

  Conflicts:
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

  smoogipooo · 2017-03-29 08:30:30 +09:00
  eabcae82c6
• Merge pull request #566 from peppy/move-easingtypes

  Move EasingTypes up one namespace level.

  Dan Balasescu · 2017-03-29 08:24:38 +09:00
  5e734a9271
• Update framework.
  smoogipooo · 2017-03-29 08:17:54 +09:00
  6856e17364
• Merge branch 'master' into move-easingtypes
  Dan Balasescu · 2017-03-29 08:14:13 +09:00
  bca18ce209
• Merge pull request #558 from peppy/avatars-and-login

  Avatar refactoring & better focus handling in login form.

  Dan Balasescu · 2017-03-29 08:12:05 +09:00
  2bb8e3bae8
• Merge branch 'master' into avatars-and-login
  Dan Balasescu · 2017-03-29 07:52:43 +09:00
  e53a5a3521
• Update references.
  Dean Herbert · 2017-03-28 21:26:20 +09:00
  f7dc7e9bb9
• Update framework.
  Dean Herbert · 2017-03-28 20:39:08 +09:00
  24a105704a
• Merge pull request #560 from smoogipooo/general_taiko_fixes

  General taiko fixes

  Dean Herbert · 2017-03-28 16:12:19 +09:00
  4bdf9e09ca
• Adjust comment.
  smoogipooo · 2017-03-28 16:00:39 +09:00
  ae4cabccef
• Merge branch 'master' into general_taiko_fixes
  Dean Herbert · 2017-03-28 15:40:55 +09:00
  ffbf6888c4
• Merge pull request #559 from smoogipooo/rename_accented

  Rename Accented to Strong.

  Dean Herbert · 2017-03-28 15:40:35 +09:00
  28bde5eecd
• Use DelayedLoadContainer in more places.
  Dean Herbert · 2017-03-28 15:28:58 +09:00
  4042b94e01
• Add drawable Swell.
  smoogipooo · 2017-03-28 15:05:45 +09:00
  3f6b17c0bf
• Move async logic to framework.
  Dean Herbert · 2017-03-28 14:24:34 +09:00
  f690e1d0c4
• Merge branch 'master' into rename_accented
  Dean Herbert · 2017-03-28 14:22:33 +09:00
  076dd73e84
• Merge pull request #513 from smoogipooo/taiko_drumroll_drawable

  Drawable DrumRoll Implementation (Input only)

  Dean Herbert · 2017-03-28 14:21:44 +09:00
  8ad4c5f312
• Properly set playfield scale.
  smoogipooo · 2017-03-28 10:32:27 +09:00
  2211c08441
• Move consts to CirclePiece.
  smoogipooo · 2017-03-28 10:32:01 +09:00
  542cff0976
• Merge branch 'rename_accented' into taiko_hit_drawing
  smoogipooo · 2017-03-28 10:04:52 +09:00
  2ff4aa5346
• Rename Accented to Strong.
  smoogipooo · 2017-03-28 10:02:41 +09:00
  4c7e523d18
• Add property to make the div2 internal.
  smoogipooo · 2017-03-28 09:50:43 +09:00
  4bb60607e1
• Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawable
  smoogipooo · 2017-03-28 09:44:50 +09:00
  4c7a724beb
• Merge pull request #557 from peppy/update-grade-textures

  Update grade textures.

  Dan Balasescu · 2017-03-28 09:26:09 +09:00
  a52991c101
• Add missing licence header.
  Dean Herbert · 2017-03-28 00:13:38 +09:00
  36af868f44
• Add better focus handling in the login form.
  Dean Herbert · 2017-03-28 00:08:27 +09:00
  768b3c4b4b
• Make Avatar accept a user.

  Add UpdateableAvatar to handle the toolbar use-case.

  Dean Herbert · 2017-03-28 00:08:26 +09:00
  13272e6995
• Combine user models.
  Dean Herbert · 2017-03-28 00:08:24 +09:00
  039f4a65dc
• Fix username being cleared when it shouldn't be.
  Dean Herbert · 2017-03-28 00:08:22 +09:00
  55df07a872
• Update grade textures.
  Dean Herbert · 2017-03-27 22:24:47 +09:00
  0ad070c2d8
• Merge pull request #556 from peppy/fix-drag-regression

  Fix regression in mouse dragging behaviour.

  Dan Balasescu · 2017-03-27 21:38:24 +09:00
  74d003bbf6
• Fix regression in mouse dragging behaviour.
  Dean Herbert · 2017-03-27 17:55:57 +09:00
  cc5154dd12
• Adjust input drum transition slightly.
  Dean Herbert · 2017-03-27 15:49:32 +09:00
  b8c8ca2f0e
• Fix merge fail.
  Dean Herbert · 2017-03-27 12:33:15 +09:00
  d0b1fda24f
• Merge branch 'master' into taiko_drumroll_drawable
  Dean Herbert · 2017-03-27 12:30:31 +09:00
  4e50b28884
• Merge pull request #516 from smoogipooo/taiko_bash_drawable

  Drawable Bash Implementation (Input only)

  Dean Herbert · 2017-03-27 12:20:05 +09:00
  d6d19d726b
• Merge branch 'master' into taiko_drumroll_drawable
  Dean Herbert · 2017-03-27 11:51:10 +09:00
  dfd40c6b29
• Merge branch 'master' into taiko_bash_drawable
  Dean Herbert · 2017-03-27 11:51:08 +09:00
  e81040cfa1
• Merge pull request #554 from smoogipooo/better_taiko_keys

  Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.

  Dean Herbert · 2017-03-27 11:22:41 +09:00
  806d8bfd1c
• Use lambda expression.
  smoogipooo · 2017-03-26 00:01:00 +09:00
  bcaf2f9758
• Remove validKeys (now in DrawableTaikoHitObject).
  smoogipooo · 2017-03-25 23:54:50 +09:00
  7c9900376f
• Merge branch 'better_taiko_keys' into taiko_drumroll_drawable

  Conflicts:
  	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

  smoogipooo · 2017-03-25 23:52:41 +09:00
  e5c674a051
• Remove validKeys (now in DrawableTaikoHitObject).
  smoogipooo · 2017-03-25 23:48:13 +09:00
  d9ecb430ed
• Fix post-merge errors.
  smoogipooo · 2017-03-25 23:48:00 +09:00
  9b0a15cd6c
• Merge branch 'better_taiko_keys' into taiko_bash_drawable

  Conflicts:
  	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs

  smoogipooo · 2017-03-25 23:44:40 +09:00
  6e5db7b75d
• Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.
  smoogipooo · 2017-03-25 23:43:41 +09:00
  989a6ab02b