9126 Commits

• Simplify ModSection.
  Huo Yaoyuan · 2017-03-07 00:12:06 +08:00
  59d1fdb032
• Add option toggle for debug cached setting.
  Dean Herbert · 2017-03-06 22:07:46 +09:00
  dcc7386609
• Refactor icon management of ModButton.
  Huo Yaoyuan · 2017-03-06 19:03:26 +08:00
  564b3f0706
• Handle left and right mouse button only.
  Huo Yaoyuan · 2017-03-06 18:02:51 +08:00
  a91d897282
• Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
  Huo Yaoyuan · 2017-03-06 17:35:15 +08:00
  f6f20cafd3
• Add sane defaults for abstract Mod class and remove remaining use of enum.
  Dean Herbert · 2017-03-06 18:29:19 +09:00
  12a3b1414f
• Don't use Mods enum for handling incompatible mods.
  Dean Herbert · 2017-03-06 18:29:17 +09:00
  45f500920c
• selectedMod -> selectedIndex
  Huo Yaoyuan · 2017-03-06 17:21:25 +08:00
  ad75ead665
• Remove one-entry backing fields.
  Huo Yaoyuan · 2017-03-06 17:14:41 +08:00
  c2cf5242e1
• Fix WaveOverlayContainer staying visible when hidden.
  Dean Herbert · 2017-03-06 17:32:13 +09:00
  463c887879
• Add options footer.
  Dean Herbert · 2017-03-06 17:30:46 +09:00
  b5aff9df5f
• Don't expicitly set origin of TextAwesome.
  Dean Herbert · 2017-03-06 17:06:48 +09:00
  e356758a7d
• Simplify SelectedMods.
  Huo Yaoyuan · 2017-03-06 15:39:27 +08:00
  a34e6453bf
• Make Mods IEnumerable.
  Dean Herbert · 2017-03-06 15:20:55 +09:00
  2de25c23b4
• Merge branch 'master' into replay

  # Conflicts:
  #	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

  Dean Herbert · 2017-03-05 17:45:03 +09:00
  4e4408cd20
• Merge https://github.com/ppy/osu into leaderboards
  DrabWeb · 2017-03-04 22:33:05 -04:00
  9cde20ffc7
• Remove unnecessary usings
  Thomas Müller · 2017-03-04 19:43:59 +01:00
  73fef85b12
• Use Color4Extensions from Framework and remove redundant Name
  Thomas Müller · 2017-03-04 19:42:37 +01:00
  a14bdf8624
• Merge remote-tracking branch 'upstream/master' into update-flow
  Dean Herbert · 2017-03-04 23:28:39 +09:00
  e12d89529c
• Update framework (and fix non-conforming anchors in FillFlowContainers).
  Dean Herbert · 2017-03-04 23:24:13 +09:00
  00fdffe9c8
• Fix WaveOverlayContainer always being visible.
  Dean Herbert · 2017-03-04 19:02:13 +09:00
  a8deb4ff50
• Update usage of FillDirection
  Thomas Müller · 2017-03-04 11:00:17 +01:00
  a2317e5a1e
• Basic implementation of score UI
  DrabWeb · 2017-03-04 03:37:34 -04:00
  a112b354f0
• Merge branch 'master' into mod-select-performance
  Thomas Müller · 2017-03-04 07:35:40 +01:00
  c44bf5291c
• Focus trigger in WaveOverlayContainer
  DrabWeb · 2017-03-03 18:05:43 -04:00
  9141d244bf
• Small cleanups
  DrabWeb · 2017-03-03 18:02:31 -04:00
  5a83687a27
• Massively improves fill-rate of mod select screen

  This is done by masking away the parts of WaveOverlayContainer that
  are behind the content.

  Thomas Müller · 2017-03-03 20:42:03 +01:00
  aff9e3617d
• Merge pull request #385 from DrabWeb/mod-overlay

  Mod select

  Dean Herbert · 2017-03-03 21:09:08 +09:00
  6f3b59268a
• Merge branch 'master' into tournament_drawings
  Dean Herbert · 2017-03-03 20:48:07 +09:00
  dc6a728cce
• Use OsuSpriteText.
  Dean Herbert · 2017-03-03 20:29:39 +09:00
  2ac248c7d0
• Fix incorrect triangle density on first display.
  Dean Herbert · 2017-03-03 18:09:16 +09:00
  71534b3e13
• Merge branch 'master' into mod-overlay
  Seth · 2017-03-03 04:12:42 -04:00
  fde509ab1d
• Merge branch 'master' into mod-overlay
  Seth · 2017-03-03 01:11:15 -04:00
  1891bdf51e
• Password textbox now performs login on enter
  John Leuenhagen · 2017-03-02 22:41:14 -05:00
  417c7e341a
• Move PauseOverlay to correct namespace.
  Dean Herbert · 2017-03-03 10:17:39 +09:00
  3a8246f56d
• Comply to naming conventions
  DrabWeb · 2017-03-02 09:15:53 -04:00
  536925c77a
• Fix Toolbar's mode changer not working correctly.
  Dean Herbert · 2017-03-02 22:01:24 +09:00
  ef8a35f5cc
• Use bindable for PlayMode.
  Dean Herbert · 2017-03-02 21:16:58 +09:00
  e399d6c6d1
• Merge branch 'master' into mod-overlay

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
  #	osu.Game/Screens/Select/PlaySongSelect.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-03-02 20:27:04 +09:00
  471b9daa93
• Merge branch 'master' into DrabWeb/song-progress-graph

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
  #	osu.Game/Overlays/Pause/PauseProgressBar.cs
  #	osu.Game/Overlays/Pause/PauseProgressGraph.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-03-02 20:20:27 +09:00
  435e845067
• Fix incorrect event order.
  Dean Herbert · 2017-03-02 17:41:33 +09:00
  963117f07d
• More code tidying.
  Dean Herbert · 2017-03-02 17:14:05 +09:00
  68857b573d
• Tidy up code.

  The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.

  Dean Herbert · 2017-03-02 17:08:00 +09:00
  c4871bbbf3
• Post-merge fixes.
  Dean Herbert · 2017-03-02 16:54:55 +09:00
  d1cd077e0d
• Merge branch 'master' into popup-dialog
  Dean Herbert · 2017-03-02 16:42:20 +09:00
  ff5f0af2d3
• Moved key press select mods to ModSection
  DrabWeb · 2017-03-02 01:24:32 -04:00
  37ed1b3d09
• CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection
  DrabWeb · 2017-03-02 01:07:28 -04:00
  1eee587c18
• ModSections in Ruleset, fixed toolbar play mode changed not firing
  DrabWeb · 2017-03-01 22:05:52 -04:00
  6c680825ed
• Working on better way to handle mods
  DrabWeb · 2017-03-01 20:57:33 -04:00
  bb12463ae4
• Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once
  DrabWeb · 2017-03-01 18:41:00 -04:00
  befdf68abe