6229 Commits

This Branch

This Branch

All Branches

• Don't set lifetime until LoadComplete (fixes possible clock nullref if added without a clock).
  smoogipooo · 2017-03-23 11:05:58 +09:00
  5daa574551
• Merge branch 'master' into taiko_hitobject_drawable
  Dan Balasescu · 2017-03-23 11:03:42 +09:00
  39134d79a8
• Merge branch 'master' into taiko_bash_base
  Dean Herbert · 2017-03-23 10:57:15 +09:00
  53c6665e07
• Merge pull request #501 from smoogipooo/taiko_drumroll_base

  Taiko drumroll base

  Dean Herbert · 2017-03-23 10:56:40 +09:00
  ae207253e6
• Add TODO.
  Dean Herbert · 2017-03-23 10:56:30 +09:00
  bf94587ca7
• Merge branch 'master' into taiko_drawable_drawing
  Dan Balasescu · 2017-03-23 10:44:00 +09:00
  e3bc837b61
• Merge branch 'master' into taiko_barlines
  Dan Balasescu · 2017-03-23 10:40:27 +09:00
  41aaf5fee6
• Merge pull request #520 from smoogipooo/use_equilateral_triangles

  Update framework + use EquilateralTriangle in Triangles.

  Dean Herbert · 2017-03-23 10:27:21 +09:00
  1d9da8facd
• Merge branch 'master' into taiko_bash_base
  Dean Herbert · 2017-03-23 10:26:57 +09:00
  7357a7b7cd
• Merge branch 'master' into taiko_drumroll_base
  Dean Herbert · 2017-03-23 10:26:55 +09:00
  877ae52cff
• Merge branch 'master' into taiko_bash_drawable
  Dean Herbert · 2017-03-23 10:25:46 +09:00
  3544d9844d
• Merge pull request #527 from SirCmpwn/working-beatmap

  Refactor WorkingBeatmap

  Dean Herbert · 2017-03-23 10:13:13 +09:00
  f103fa3352
• Tidy up DatabaseWorkingBeatmap.
  Dean Herbert · 2017-03-23 10:07:26 +09:00
  859ee5d316
• Merge branch 'master' into working-beatmap
  Dean Herbert · 2017-03-23 09:37:21 +09:00
  9601e143d4
• Merge pull request #525 from huoyaoyuan/controls

  DropDown update

  Dean Herbert · 2017-03-23 09:26:26 +09:00
  e7f32fcbce
• Cleanups + CircularContainer fixes.
  smoogipooo · 2017-03-23 09:18:50 +09:00
  5e0d9c3820
• Merge branch 'taiko_playfield_2' into taiko_barlines
  smoogipooo · 2017-03-23 09:13:24 +09:00
  75a51fbcc7
• Cleanups + fix CircularContainer usages.
  smoogipooo · 2017-03-23 09:12:51 +09:00
  9c325ddd33
• Merge remote-tracking branch 'origin/master' into taiko_barlines

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

  smoogipooo · 2017-03-23 09:01:00 +09:00
  2cb6757f14
• Remove nested types completely.
  Dean Herbert · 2017-03-23 08:57:14 +09:00
  b0340f77d8
• Merge branch 'master' into use_equilateral_triangles
  Dean Herbert · 2017-03-23 08:51:43 +09:00
  ff57d3800f
• Merge branch 'master' into taiko_hitobject_drawable
  Dan Balasescu · 2017-03-23 08:50:57 +09:00
  02dc6fb213
• U -> T1.
  Dean Herbert · 2017-03-23 08:49:29 +09:00
  3dee39346f
• Merge remote-tracking branch 'origin/master' into taiko_playfield_2
  smoogipooo · 2017-03-23 08:49:20 +09:00
  790997db90
• Merge pull request #532 from peppy/general-fixes

  Fix menu cursor size not sticking on startup.

  Dan Balasescu · 2017-03-23 08:48:22 +09:00
  972c56c73b
• Consolidate nested classes.
  Dean Herbert · 2017-03-23 08:44:52 +09:00
  ba32d50456
• Use EquilateralTriangle in Triangles.
  smoogipooo · 2017-03-23 08:34:39 +09:00
  9247017c9a
• Fix menu cursor size not sticking on startup.

  Also tidied up bindables.

  Dean Herbert · 2017-03-23 08:07:59 +09:00
  537f0b9340
• Update framework.
  Huo Yaoyuan · 2017-03-22 22:56:45 +08:00
  5043032b48
• Merge pull request #530 from EVAST9919/checkboxes_fix

  Fix checkbox dependency in LoginOptions

  Dean Herbert · 2017-03-22 23:54:37 +09:00
  7b06f31ddf
• Rename all DropDown -> Dropdown.
  Huo Yaoyuan · 2017-03-22 22:32:32 +08:00
  0dbc232ebf
• Merge branch 'master' into controls
  Huo Yaoyuan · 2017-03-22 22:28:19 +08:00
  6a4ca08578
• Fix checkbox dependency in LoginOptions
  Andrey Zavadskiy · 2017-03-22 17:21:24 +03:00
  2d75c60463
• Merge pull request #529 from EVAST9919/spinner_fix

  Spinner fix

  Dean Herbert · 2017-03-22 22:18:42 +09:00
  09b59b5003
• Spinner fix
  Andrey Zavadskiy · 2017-03-22 16:13:39 +03:00
  086191a12a
• Merge pull request #526 from peppy/general-fixes

  Fix usages of CircularContainer in line with framework changes.

  Dan Balasescu · 2017-03-22 21:48:16 +09:00
  e5602c0938
• Line endings
  DrabWeb · 2017-03-22 09:38:40 -03:00
  e4af30bd15
• Update framework.
  Dean Herbert · 2017-03-22 21:36:03 +09:00
  1c83442b0b
• More formatting
  DrabWeb · 2017-03-22 09:35:08 -03:00
  8703e5a962
• Formatting
  DrabWeb · 2017-03-22 09:33:01 -03:00
  5ebbc2c0ba
• SongProgress in HudOverlay
  DrabWeb · 2017-03-22 09:27:04 -03:00
  818bdd8e88
• Formatting
  DrabWeb · 2017-03-22 08:59:44 -03:00
  333008e26d
• License headers
  DrabWeb · 2017-03-22 08:54:21 -03:00
  340ddb59cd
• Merge https://github.com/ppy/osu into song-progress-graph
  DrabWeb · 2017-03-22 08:50:17 -03:00
  29c54d4d8b
• Move DatabaseWorkingBeatmap out of partial class
  Drew DeVault · 2017-03-22 06:50:48 -04:00
  2e1f596b2a
• Fix usages of CircularContainer in line with framework changes.
  Dean Herbert · 2017-03-22 19:35:03 +09:00
  fbe08436d2
• Address linting issues
  Drew DeVault · 2017-03-22 06:25:49 -04:00
  2b1d31e69c
• Simplify derived classes of WorkingBeatmap
  Drew DeVault · 2017-03-22 06:15:32 -04:00
  267238dc27
• Refactor WorkingBeatmap

  Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
  from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
  or so.

  Drew DeVault · 2017-03-22 05:57:08 -04:00
  cc2b4c5c5b
• Update framework.
  Dean Herbert · 2017-03-22 15:44:23 +09:00
  7fba0c4bce