38 Commits

• Initial attempt at making mods apply better.
  smoogipooo · 2017-03-12 22:13:43 +09:00
  c0e29652a6
• Merge branch 'master' into modselect
  Dean Herbert · 2017-03-09 17:31:25 +09:00
  115ebd4773
• Reduce error count.
  Dean Herbert · 2017-03-09 14:24:16 +09:00
  da751804b6
• Merge branch 'master' into replay

  # Conflicts:
  #	osu.Game/Modes/Mod.cs

  Dean Herbert · 2017-03-07 14:32:14 +09:00
  bff1179624
• Update deselect logic.

  Change to DeselectTypes to avoid enumerating children for multi times.

  Huo Yaoyuan · 2017-03-07 01:15:21 +08:00
  27edc9971e
• Fix and update mode changing handling.
  Huo Yaoyuan · 2017-03-07 01:01:42 +08:00
  eda7e1b26f
• Add abstract ModType for ModSection.
  Huo Yaoyuan · 2017-03-07 00:32:22 +08:00
  836484ba51
• Use Bindable<IEnumerable<Mod>> to fit other changes.
  Huo Yaoyuan · 2017-03-07 00:17:06 +08:00
  318ab68af1
• Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
  Huo Yaoyuan · 2017-03-06 17:35:15 +08:00
  f6f20cafd3
• Don't use Mods enum for handling incompatible mods.
  Dean Herbert · 2017-03-06 18:29:17 +09:00
  45f500920c
• 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
• 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 usage of FillDirection
  Thomas Müller · 2017-03-04 11:00:17 +01:00
  a2317e5a1e
• Small cleanups
  DrabWeb · 2017-03-03 18:02:31 -04:00
  5a83687a27
• Fix incorrect triangle density on first display.
  Dean Herbert · 2017-03-03 18:09:16 +09:00
  71534b3e13
• 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
• 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
• Updated to work with latest framework
  DrabWeb · 2017-02-28 02:25:38 -04:00
  c3a81127f2
• Cleaned ModSelectOverlay
  DrabWeb · 2017-02-23 07:36:31 -04:00
  e1c4abd8c5
• Derive from FocusedOverlayContainer and remove custom focus logic.
  Dean Herbert · 2017-02-23 12:51:32 +09:00
  c683cdbb1d
• Fix initial state and shorten disappear animation.
  Dean Herbert · 2017-02-23 12:47:20 +09:00
  8d1498a8db
• Make transitions better.
  Dean Herbert · 2017-02-23 12:42:31 +09:00
  b33627a750
• Fix line endings.
  Dean Herbert · 2017-02-23 11:16:23 +09:00
  9f367bcc0e
• Thanks refactoring
  DrabWeb · 2017-02-22 13:17:06 -04:00
  cf5258ceb0
• Comply to formatting style
  DrabWeb · 2017-02-22 13:12:39 -04:00
  bf1d13e734
• readonly -> const
  DrabWeb · 2017-02-22 13:03:19 -04:00
  8cd7ebcb43
• Fixed build failing
  DrabWeb · 2017-02-22 12:28:34 -04:00
  bac0431102
• Cleanup
  DrabWeb · 2017-02-22 12:12:41 -04:00
  4821f323b8
• Made mod disabling better
  DrabWeb · 2017-02-22 11:34:22 -04:00
  337a1004d3
• Added DeselectAll
  DrabWeb · 2017-02-18 11:40:05 -04:00
  3f5d155583
• Wave animation fine tuning
  DrabWeb · 2017-02-18 11:21:41 -04:00
  a024353574
• Fixed typo, made mod select take focus when visible
  DrabWeb · 2017-02-18 07:50:22 -04:00
  d1af050355
• ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select
  DrabWeb · 2017-02-18 07:28:22 -04:00
  006fb5502d