6882 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into menu-bar
  Dan Balasescu · 2017-08-30 12:31:12 +09:00
  cabf671811
• Merge pull request #1196 from smoogipooo/menu-mvvm

  Update UI controls in line with framework changes

  Dan Balasescu · 2017-08-29 19:29:14 +09:00
  2742fe46cf
• Merge branch 'master' into menu-mvvm
  Dean Herbert · 2017-08-29 18:37:21 +09:00
  dba3c9a0e2
• Merge pull request #1189 from jorolf/caps-warning

  Add caps lock warning to OsuPasswordTextBox

  Dan Balasescu · 2017-08-29 18:37:07 +09:00
  5e6c11e289
• Merge branch 'master' into menu-mvvm
  Dan Balasescu · 2017-08-29 18:36:41 +09:00
  0431a9afdd
• Don't use child
  Dean Herbert · 2017-08-29 18:31:51 +09:00
  24a2dc3d1e
• Merge branch 'master' into caps-warning
  Dan Balasescu · 2017-08-29 18:19:50 +09:00
  adfc304a22
• Use using.
  smoogipooo · 2017-08-29 18:18:36 +09:00
  2535313f4f
• Don't use Bindable for AccentColour

  Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.

  Dean Herbert · 2017-08-29 18:17:01 +09:00
  39b5b04700
• Merge pull request #1203 from huoyaoyuan/infowedge-fix

  Fix InfoWedge when no beatmap available

  Dan Balasescu · 2017-08-29 18:12:51 +09:00
  5559e613ac
• Revert DummyWorkingBeatmap changes.
  smoogipooo · 2017-08-29 18:05:27 +09:00
  5b8349f90e
• Add comment for DeletePending.
  Huo Yaoyuan · 2017-08-29 16:18:50 +08:00
  fb3ba4fe0c
• Merge branch 'master' into menu-mvvm
  Dean Herbert · 2017-08-29 15:57:19 +09:00
  e53f2cb359
• Remove unused using statement
  Dean Herbert · 2017-08-29 15:23:32 +09:00
  85f876a934
• Update framework
  Dean Herbert · 2017-08-29 15:20:56 +09:00
  b91757793f
• Update framework
  Dean Herbert · 2017-08-29 14:43:23 +09:00
  6304a685c3
• Always load background and info wedge when no beatmap available.
  Huo Yaoyuan · 2017-08-28 17:53:57 +08:00
  4aa5ce8b41
• Set DummyWorkingBeatmap's DeletePending to true.
  Huo Yaoyuan · 2017-08-28 17:53:03 +08:00
  1617189475
• Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.
  smoogipooo · 2017-08-28 17:55:50 +09:00
  b17d9ac06e
• Merge branch 'menu-mvvm' into menu-bar
  smoogipooo · 2017-08-28 15:44:28 +09:00
  9142e75610
• Remove unnecessary exception, replace with default value.
  smoogipooo · 2017-08-28 15:44:05 +09:00
  83fe8514a4
• Remove unnecessary exception, replace with default styling.
  smoogipooo · 2017-08-28 15:42:21 +09:00
  7c9c7f93ae
• Merge branch 'menu-mvvm' into menu-bar
  smoogipooo · 2017-08-28 15:34:01 +09:00
  423c1cb006
• Rename DrawableOsuContextMenuItem -> DrawableOsuMenuItem, and move to OsuMenu.
  smoogipooo · 2017-08-28 15:33:24 +09:00
  7bf6d4aa65
• Reimplement TestCaseEditorMenuBar.
  smoogipooo · 2017-08-28 15:32:12 +09:00
  5dae408ecb
• Merge branch 'menu-mvvm' into menu-bar
  smoogipooo · 2017-08-28 14:52:44 +09:00
  a5fbeb8959
• Update in-line with framework changes.
  smoogipooo · 2017-08-28 14:42:52 +09:00
  fc6c682d88
• Merge branch 'menu-mvvm' into menu-bar
  smoogipooo · 2017-08-28 12:52:49 +09:00
  41b162d9e3
• Update in line with framework changes.
  smoogipooo · 2017-08-28 12:49:33 +09:00
  66db3389f6
• Remove poop.
  smoogipooo · 2017-08-28 11:03:51 +09:00
  b5c1c05af5
• Update usages of Menu to reflect ValueChanged events.
  smoogipooo · 2017-08-28 11:01:53 +09:00
  4385edeb45
• Merge remote-tracking branch 'smoogipooo/menu-mvvm' into menu-bar

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-08-28 08:27:53 +09:00
  fc4437b91a
• only show warning when focused
  Jorolf · 2017-08-25 16:39:49 +02:00
  9374bf925e
• Merge branch 'master' of git://github.com/ppy/osu into caps-warning
  Jorolf · 2017-08-25 16:33:29 +02:00
  26323caf6f
• Changes in line with framework changes
  Dean Herbert · 2017-08-25 19:18:07 +09:00
  ee85515d95
• Merge pull request #1194 from peppy/update-edge-effect-fades

  Update usage of FadeEdgeEffect

  Dan Balasescu · 2017-08-25 16:29:49 +09:00
  v2017.825.0 5f746c1c6a
• Fix crappy resizing.
  smoogipooo · 2017-08-25 16:27:01 +09:00
  3ffc467704
• Update FilterControl using new AccentColour definition
  smoogipooo · 2017-08-25 15:58:42 +09:00
  9f02000174
• Update OsuTabControl in line with framework
  smoogipooo · 2017-08-25 15:58:30 +09:00
  ce644138b9
• Update OsuDropdown in line with framework
  smoogipooo · 2017-08-25 15:58:21 +09:00
  a3a5a89636
• Update CollectionsDropdown in line with framework
  smoogipooo · 2017-08-25 15:58:09 +09:00
  e83a554ffc
• Update SlimEnumDropdown in line with framework
  smoogipooo · 2017-08-25 15:57:55 +09:00
  923ffae42c
• Update LoginSettings in line with framework.
  smoogipooo · 2017-08-25 15:57:43 +09:00
  b42c9d21fe
• Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework.
  smoogipooo · 2017-08-25 15:10:29 +09:00
  4fb9570618
• Update OsuContextMenu in line with framework.
  smoogipooo · 2017-08-25 15:10:12 +09:00
  7467d24d35
• Update OsuMenu in line with framework.
  smoogipooo · 2017-08-25 15:09:07 +09:00
  06c392d6f2
• Merge branch 'master' into update-edge-effect-fades
  Dean Herbert · 2017-08-25 15:01:01 +09:00
  782ab81a88
• Merge pull request #1190 from peppy/concurrent-overlay-limits

  Ensure other full-screen overlays are closed when direct is open (and vice-versa)

  Dan Balasescu · 2017-08-25 15:00:40 +09:00
  11fd91bc68
• Update usage of FadeEdgeEffect

  Improves the visual appearance of DirectPanels' shadows too.

  Dean Herbert · 2017-08-25 14:58:19 +09:00
  70154d1036
• Merge branch 'master' into concurrent-overlay-limits
  Dean Herbert · 2017-08-25 14:50:45 +09:00
  c0cf26ed21