628 Commits

• CI fixes.
  smoogipooo · 2017-06-21 11:35:19 +09:00
  b191d96aab
• Update framework.
  smoogipooo · 2017-06-21 11:28:27 +09:00
  fc0e44b214
• Shapes namespace

  Depends on https://github.com/ppy/osu-framework/pull/837

  paparony03 · 2017-06-20 15:54:23 +10:00
  62dee59672
• Merge branch 'master' into timingchange-rework
  Dean Herbert · 2017-06-16 17:04:43 +09:00
  f2cac17188
• Merge branch 'master' into numpad-enter
  Dean Herbert · 2017-06-16 15:32:52 +09:00
  ae79ba48be
• Handle the numpad's Enter in cases where only the normal Enter was handled
  MrTheMake · 2017-06-15 23:06:28 +02:00
  06089a74e3
• Merge branch 'master' into timingchange-rework
  Dan Balasescu · 2017-06-15 16:23:51 +09:00
  6fd37ebc32
• Merge remote-tracking branch 'origin/master' into fix-hacky-tabs
  smoogipooo · 2017-06-13 19:46:01 +09:00
  99a93d98dc
• Merge branch 'improved-loading-animation' into nuget-update
  Dean Herbert · 2017-06-13 15:50:21 +09:00
  19236dcd1e
• Adjust appearance slightly
  Dean Herbert · 2017-06-13 15:27:47 +09:00
  700d6f9d38
• Move MenuItemType to correct namespace
  Dean Herbert · 2017-06-13 15:20:21 +09:00
  679786c76f
• Forgot to add dropdown-like animation
  EVAST9919 · 2017-06-12 13:39:45 +03:00
  9f8c66b8c6
• CI fixes
  EVAST9919 · 2017-06-12 13:37:13 +03:00
  41eb084191
• Context Menu
  EVAST9919 · 2017-06-12 12:56:07 +03:00
  1711258038
• Fix hacky tabs
  Dean Herbert · 2017-06-12 18:39:22 +09:00
  3efe8629d6
• Improve the loading animation and use it in multiple places

  - Supersedes https://github.com/ppy/osu/pull/926.
  - [ ] Depends on https://github.com/ppy/osu-framework/pull/817.

  Dean Herbert · 2017-06-12 17:04:42 +09:00
  e94425f311
• Merge remote-tracking branch 'origin/master' into timingchange-rework

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-06-12 13:09:02 +09:00
  419682b740
• Remove unused file.
  smoogipooo · 2017-06-12 12:57:34 +09:00
  157e0e569a
• Update in line with framework.
  smoogipooo · 2017-06-12 12:48:47 +09:00
  ffbb46f668
• Merge branch 'master' into dynamic-vertex-attributes

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-06-10 17:26:16 +09:00
  0521d4b761
• Merge remote-tracking branch 'origin/master' into timingchange-rework

  # Conflicts:
  #	osu-framework
  #	osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs

  smoogipooo · 2017-06-09 03:37:55 +09:00
  cd435f7ec6
• Merge remote-tracking branch 'origin/master' into dynamic-vertex-attributes
  smoogipooo · 2017-06-08 17:57:39 +09:00
  513ec4f05f
• Update with framework changes.
  smoogipooo · 2017-06-08 17:57:06 +09:00
  25ff4de39a
• More Clean up
  John Neijzen · 2017-06-08 15:27:35 +08:00
  2f7d9655fd
• Keyword Spacing and Brackets Fixing
  John Neijzen · 2017-06-08 14:35:10 +08:00
  431d225a60
• Merge remote-tracking branch 'upstream/master' into timingchange-rework
  Dean Herbert · 2017-06-07 18:39:27 +09:00
  a07f6801da
• Merge remote-tracking branch 'upstream/master' into social-browser
  Dean Herbert · 2017-06-07 17:38:06 +09:00
  1de296747f
• Only instantly move tooltip is we are not visible
  Dean Herbert · 2017-06-05 20:52:46 +09:00
  c85a0223b0
• Merge branch 'master' into smoothly-moving-tooltips
  Dean Herbert · 2017-06-05 20:42:08 +09:00
  04f0b5204a
• Fix incorrect initial movement of tooltips
  Thomas Müller · 2017-06-05 13:07:38 +02:00
  b4b3ba0787
• Make osu tooltips move smoothly
  Thomas Müller · 2017-06-05 12:59:29 +02:00
  e92c1210d1
• Merge branch 'master' into social-browser
  Dean Herbert · 2017-06-05 19:16:28 +09:00
  bf971f6613
• Merge remote-tracking branch 'upstream/master' into ingame_options
  Dean Herbert · 2017-06-05 14:53:37 +09:00
  0cb1df35e9
• Merge remote-tracking branch 'origin/master' into timingchange-rework

  # Conflicts:
  #	osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs

  smoogipooo · 2017-06-05 10:19:53 +09:00
  a3299809fe
• Remove unnecessary usings
  Thomas Müller · 2017-06-03 17:29:20 +02:00
  2c5979ea8a
• Fix compile error
  Thomas Müller · 2017-06-03 17:17:56 +02:00
  9c6ce230bc
• Fix incorrect proportions of menu cursor
  Thomas Müller · 2017-06-03 16:34:00 +02:00
  50158a1cd2
• update osu to use the framework's TooltipContainer
  Jorolf · 2017-06-03 14:50:35 +02:00
  a43890ffb4
• Update to match framework.
  smoogipooo · 2017-06-01 14:24:31 +09:00
  e348f86ce1
• Merge branch 'master' into social-browser
  Seth · 2017-05-31 05:18:52 -03:00
  394745bca5
• Merge branch 'master' into user-dropdown-arrow
  Dean Herbert · 2017-05-31 15:39:52 +09:00
  bab3f1b89a
• Merge branch 'master' of https://github.com/ppy/osu into ingame_options
  EVAST9919 · 2017-05-31 08:23:06 +03:00
  8cde50a88a
• Text -> Label
  DrabWeb · 2017-05-31 02:03:13 -03:00
  cd57343191
• Fix user dropdown menu item chevron alignment
  DrabWeb · 2017-05-31 01:57:32 -03:00
  4fd7405fb8
• Update in line with framework
  Dean Herbert · 2017-05-30 22:23:51 +09:00
  8544b45443
• Merge branch 'master' into social-browser
  Dean Herbert · 2017-05-30 20:51:50 +09:00
  6a6f0913cd
• Applied suggested changes
  EVAST9919 · 2017-05-30 12:23:53 +03:00
  e737ded382
• Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
  EVAST9919 · 2017-05-30 12:04:41 +03:00
  963d6e9e8f
• Fix usings.
  smoogipooo · 2017-05-30 17:36:42 +09:00
  7416952eb3
• Allow Nub/OsuCheckbox/OsuSliderBar colours to be overridden.
  smoogipooo · 2017-05-30 16:40:35 +09:00
  c8066cfde9