19539 Commits

This Branch

This Branch

All Branches

• Add initial implementation of osu! HitCircle.
  Dean Herbert · 2016-10-19 16:19:01 +09:00
  94968a8b7c
• Merge pull request #77 from NeoAdonis/counters-a

  Rolling counters

  Dean Herbert · 2016-10-19 15:06:00 +09:00
  ee463dc65c
• Merge pull request #96 from peppy/general-fixes

  General fixes

  Dean Herbert · 2016-10-19 12:36:24 +09:00
  68799f93bb
• Fix missing Metadata initialisation.
  Dean Herbert · 2016-10-19 12:28:48 +09:00
  c81c4cbbcd
• Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes
  Dean Herbert · 2016-10-19 12:22:16 +09:00
  6705902710
• Merge branch 'refs/heads/db-refactor' into general-fixes
  Dean Herbert · 2016-10-19 12:22:04 +09:00
  0e9a155be5
• Framework updates.
  Dean Herbert · 2016-10-19 12:21:13 +09:00
  6dc600d287
• Drop BeatmapSet, only BeatmapSetInfo is necessary
  Drew DeVault · 2016-10-18 15:48:24 -04:00
  7bdf1fe1bf
• s/AddBeatmap/ImportBeatmap/g
  Drew DeVault · 2016-10-18 15:42:07 -04:00
  768dd38fa0
• Rework duplicate detection in AddBeatmap
  Drew DeVault · 2016-10-18 15:41:46 -04:00
  105bba6178
• Add lifecycle management to BeatmapDatabase
  Drew DeVault · 2016-10-18 15:38:59 -04:00
  ad14462369
• $(SolutionDir)
  Drew DeVault · 2016-10-18 13:58:24 -04:00
  8ca4a2067e
• Refactor the database code
  Drew DeVault · 2016-10-18 13:38:27 -04:00
  449f04c07b
• Merge pull request #93 from peppy/general-fixes

  General fixes

  Thomas Müller · 2016-10-18 18:55:37 +02:00
  406ffdafbc
• Use DrawSize instead of Size whereever Size was previously read due to framework changes.

  Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)

  Thomas Müller · 2016-10-18 18:53:31 +02:00
  68476eafb9
• Protect RollingCounter props
  Adonais Romero González · 2016-10-17 21:40:50 -05:00
  eeacd85073
• Framework update.
  Dean Herbert · 2016-10-18 11:20:16 +09:00
  cce2094392
• Merge remote-tracking branch 'upstream/master' into counters-a
  Adonais Romero González · 2016-10-17 20:36:04 -05:00
  5abc3ba898
• Update framework.
  Dean Herbert · 2016-10-17 16:59:11 +09:00
  29b67334c6
• Merge pull request #89 from Tom94/round_masking

  Update framework.

  Dean Herbert · 2016-10-17 12:11:23 +09:00
  3a77fc16c3
• Update framework.
  Dean Herbert · 2016-10-17 12:09:05 +09:00
  18f4d4ed1c
• Merged branch master into round_masking
  Dean Herbert · 2016-10-17 12:08:31 +09:00
  bfbc26738c
• Merge pull request #90 from Lunar-Dust/patch-1

  Reorder ToolbarButton instantiation for consistency

  Dean Herbert · 2016-10-17 10:09:34 +09:00
  9576a7c0e7
• Reorder ToolbarButton instantiation for consistency

  Might as start good standards now rather than later

  Lunar Dust · 2016-10-16 18:42:40 -05:00
  8e47d72f93
• Misc. fixes and improvements
  Adonais Romero González · 2016-10-16 18:30:25 -05:00
  72c4dc344e
• Modified ManiaComboCounter behavior

  This to match more with the current behavior in osu!mania.

  Adonais Romero González · 2016-10-16 17:45:37 -05:00
  a671765a4f
• Better safe than sorry
  Adonais Romero González · 2016-10-16 17:10:08 -05:00
  2c06764b79
• Modify osu! logo to use new CircularContainer.
  Thomas Müller · 2016-10-16 19:26:56 +02:00
  53076f6446
• Merge pull request #87 from Tom94/unified_shader

  Unified shader

  Dean Herbert · 2016-10-16 22:34:50 +09:00
  96095f34e2
• Update framework.
  Thomas Müller · 2016-10-16 15:34:30 +02:00
  d3fd16f209
• Merge branch 'master' of github.com:ppy/osu into unified_shader

  # Conflicts:
  #	osu-framework
  #	osu.Game/Overlays/Options.cs

  Thomas Müller · 2016-10-16 15:17:24 +02:00
  fec127eb8c
• Merge pull request #88 from peppy/general-fixes

  General fixes & framework updates.

  Thomas Müller · 2016-10-16 15:09:12 +02:00
  b514293004
• Update framework.
  Dean Herbert · 2016-10-16 22:00:55 +09:00
  d07aaba75b
• Change the way VolumeControl handles global input.
  Dean Herbert · 2016-10-16 21:57:15 +09:00
  02dc8dc167
• Remove implementation of WedgedBox and use Shear transformation instead.
  Thomas Müller · 2016-10-16 14:10:24 +02:00
  b3e531b98c
• Update framework.
  Thomas Müller · 2016-10-16 14:10:06 +02:00
  7751a85e14
• Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes
  Dean Herbert · 2016-10-16 18:24:10 +09:00
  620c4e6ab7
• Merge pull request #86 from huoyaoyuan/overlay

  Update overlay in framework.

  Dean Herbert · 2016-10-16 18:22:10 +09:00
  7d59f63ef7
• Use OverlayContainer in framework.
  Huo Yaoyuan · 2016-10-16 17:14:17 +08:00
  f4c381f745
• Update framework.
  Huo Yaoyuan · 2016-10-16 17:12:37 +08:00
  5e9d555309
• Improve the initialisation logic of OsuGameBase.
  Dean Herbert · 2016-10-16 17:33:53 +09:00
  4edefb935c
• Moved ComboResultCounter to right namespace
  Adonais Romero González · 2016-10-15 22:24:03 -05:00
  15c6a563be
• Tidying code and restricting methods
  Adonais Romero González · 2016-10-15 19:07:07 -05:00
  862dc1d7c7
• Changed ComboCounter format...

  ...to improve value management.

  Adonais Romero González · 2016-10-15 18:06:31 -05:00
  84dcb63ad2
• Delay order on StarCounter changed
  Adonais Romero González · 2016-10-15 18:04:00 -05:00
  10b47859c3
• More refactoring
  Adonais Romero González · 2016-10-15 15:16:02 -05:00
  0ceb72ba42
• Tidying
  Adonais Romero González · 2016-10-15 15:03:51 -05:00
  a15f4cda44
• Minor variable change
  Adonais Romero González · 2016-10-15 14:01:11 -05:00
  c268500f89
• Why calling StopAnimation() on StarCounter's ctor()?
  Adonais Romero González · 2016-10-15 13:53:39 -05:00
  2625d06553
• Merge branch 'master' into counters-a
  Adonais Romero González · 2016-10-15 13:45:55 -05:00
  9241287c79