109 Commits

• Fix error-level inspections.
  Dean Herbert · 2017-03-07 13:52:47 +09:00
  ecdbcb20cf
• Merge remote-tracking branch 'upstream/master' into less-mods-enum

  # Conflicts:
  #	osu.Game.Modes.Mania/ManiaMod.cs
  #	osu.Game.Modes.Osu/OsuMod.cs
  #	osu.Game/Modes/Mod.cs

  Dean Herbert · 2017-03-07 13:42:50 +09:00
  3e4cd0dc7c
• Fix most warnings.
  Dean Herbert · 2017-03-07 13:05:57 +09:00
  0cad5d7d41
• Add missing IncompatibleMods.
  Dean Herbert · 2017-03-07 09:16:47 +09:00
  39ff68a812
• 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
• 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
• Replace missing perfect icon with cross.
  Dean Herbert · 2017-03-02 20:29:48 +09:00
  ab91333b21
• 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
• Fix some license headers.
  Dean Herbert · 2017-03-02 18:45:20 +09:00
  4163569e57
• Remove AvailableMods
  DrabWeb · 2017-03-02 02:04:26 -04:00
  482be9f451
• Merge https://github.com/ppy/osu into mod-overlay
  DrabWeb · 2017-03-02 01:44:18 -04:00
  367d6d694c
• 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
• Triggering fix
  Andrey Zavadskiy · 2017-03-01 13:36:53 +03:00
  a6504e8f22
• KeyCounter visibility
  Andrey Zavadskiy · 2017-03-01 13:22:01 +03:00
  cc92459ee1
• Merge https://github.com/ppy/osu into mod-overlay
  DrabWeb · 2017-02-28 02:22:59 -04:00
  570c95cb98
• Update framework.
  Dean Herbert · 2017-02-27 15:55:57 +09:00
  7c602a2af3
• Update framework
  Thomas Müller · 2017-02-26 11:22:58 +09:00
  1585ae842a
• Remove unnecessary using statements
  Thomas Müller · 2017-02-23 21:38:10 +01:00
  a5dfa7ab06
• Documented Mod class
  DrabWeb · 2017-02-23 07:59:27 -04:00
  64b0f85b89
• Made requested changes
  DrabWeb · 2017-02-23 07:57:58 -04:00
  a67bfacb19
• Merge https://github.com/ppy/osu into mod-overlay
  DrabWeb · 2017-02-22 12:35:55 -04:00
  99f1f88c75
• 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
• Add difficulty calculation

  Adds base classes for difficulty calculations, hooks them up with
  carousel container, and adds a port of the osu difficulty calculator.

  Thomas Müller · 2017-02-19 17:41:51 +01:00
  417f146386
• Fixed typo, made mod select take focus when visible
  DrabWeb · 2017-02-18 07:50:22 -04:00
  d1af050355
• Made Mod abstract, added KeyMod as a base for mania key count modes
  DrabWeb · 2017-02-18 07:44:46 -04:00
  d82b67ee9b
• 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
• Audio class renames in line with framework changes.
  Dean Herbert · 2017-02-18 17:35:04 +09:00
  32ce8cf723
• ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly
  DrabWeb · 2017-02-16 18:32:27 -04:00
  9fc3726925
• Added mod selection overlay
  DrabWeb · 2017-02-16 16:05:03 -04:00
  0a58fc62db
• Update Health display design.
  Dean Herbert · 2017-02-16 22:44:21 +09:00
  ca6946c7a2
• Add the concept of nested DrawableHitObjects.

  - Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
  - Removed SliderTicksLayer abstraction for now.

  Dean Herbert · 2017-02-16 17:02:36 +09:00
  8bf3902cbd
• Add tick sample.
  Dean Herbert · 2017-02-16 13:39:01 +09:00
  2640c2ac43
• Add combo numbers.
  Dean Herbert · 2017-02-15 23:23:55 +09:00
  7fbc5990d1
• Don't use osu! mode parser for other game modes for now (convert still works).
  Dean Herbert · 2017-02-15 12:36:47 +09:00
  580584a015
• Add the ability to make DrawableHitObjects non-interactive (for use in other contexts).
  Dean Herbert · 2017-02-15 01:23:20 +09:00
  8e9a5e9faa
• Handle proxied approach layer better and add slider's approach circle (previously missing).
  Dean Herbert · 2017-02-15 01:23:19 +09:00
  fc192906ea
• Add follow points.
  Damnae · 2017-02-10 06:19:59 +01:00
  77ee161be8
• Add hit object stacking.
  Damnae · 2017-02-09 07:28:40 +01:00
  38b25a7df3
• Naming standardisation and enforcing.
  Dean Herbert · 2017-02-07 16:20:36 +09:00
  6b011a50d2
• Update and standardise license headers.
  Dean Herbert · 2017-02-07 14:27:41 +09:00
  50bd80cb0c
• Merge remote-tracking branch 'upstream/master' into options-refactor

  # Conflicts:
  #	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
  #	osu.Game/Graphics/UserInterface/BackButton.cs
  #	osu.Game/Screens/Play/KeyCounter.cs

  Dean Herbert · 2017-02-03 13:16:07 +09:00
  16a01abc4d
• Merge branch 'master' into skip-button

  # Conflicts:
  #	osu.Game/Graphics/UserInterface/BackButton.cs
  #	osu.Game/Screens/Play/Player.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-02-01 14:05:58 +09:00
  7ce5fc08ee
• Global shadows and more sane font size setting.
  Dean Herbert · 2017-01-31 18:53:52 +09:00
  6b66ecc131
• Hook up icons better.
  Dean Herbert · 2017-01-30 13:35:40 +09:00
  2ed5cf7c91
• Add the ability for individual game modes to report statistics for display at song select.
  Dean Herbert · 2017-01-30 13:12:30 +09:00
  e93f60396f