24822 Commits

This Branch

This Branch

All Branches

• Merge pull request #371 from peppy/general-fixes

  Update framework.

  Thomas Müller · 2017-02-18 16:33:09 +01:00
  v2017.219.0 5721e7f2d2
• Update framework.
  Dean Herbert · 2017-02-19 00:27:00 +09:00
  837992d112
• More sorting rookie mistakes
  Alex Amadori · 2017-02-18 16:23:13 +01:00
  21cf96ec10
• Wave animation fine tuning
  DrabWeb · 2017-02-18 11:21:41 -04:00
  a024353574
• Merge pull request #370 from peppy/general-fixes

  General fixes.

  Thomas Müller · 2017-02-18 16:14:57 +01:00
  a53695347f
• Fix silly sorting mistakes
  Alex Amadori · 2017-02-18 15:56:29 +01:00
  f48c83b787
• Merge remote-tracking branch 'upstream/master'
  Alex Amadori · 2017-02-18 15:18:26 +01:00
  d92382c1aa
• Implemented sorting in TestCasePlaySong
  Alex Amadori · 2017-02-18 15:11:40 +01:00
  6bbbbd8f96
• Remove second sample playback when clicking osu! logo.
  Dean Herbert · 2017-02-18 22:33:24 +09:00
  c1194102b1
• Fix options sidebar not displaying correclty.
  Dean Herbert · 2017-02-18 22:29:20 +09:00
  ebc38917dc
• 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
• Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix
  Andrey Zavadskiy · 2017-02-18 13:47:45 +03:00
  f028188398
• Added the specific exception
  Andrey Zavadskiy · 2017-02-18 13:46:47 +03:00
  e803564b5a
• Merge pull request #369 from peppy/general-fixes

  General fixes.

  Thomas Müller · 2017-02-18 09:50:48 +01:00
  b92726c8ee
• Bump framework.
  Dean Herbert · 2017-02-18 17:44:49 +09:00
  1524b89753
• Make accuracy fixed width and improve feel.
  Dean Herbert · 2017-02-18 17:35:54 +09:00
  78c9348b5a
• Add padding zeroes to score display (and fix not being applied initially).
  Dean Herbert · 2017-02-18 17:35:37 +09:00
  1a31589abd
• Audio class renames in line with framework changes.
  Dean Herbert · 2017-02-18 17:35:04 +09:00
  32ce8cf723
• General sorting improvements
  Alex Amadori · 2017-02-18 07:59:01 +01:00
  1cd93f79b3
• Merge pull request #365 from peppy/general-fixes

  Better screen hierarchy

  Thomas Müller · 2017-02-18 07:58:03 +01:00
  v2017.218.0 7a29603800
• Fix backgrounds in TestCasePlayer dimming to gray instead of black.
  Dean Herbert · 2017-02-18 15:54:26 +09:00
  cf8b6c0697
• Move constant for default ControlPoint out of Slider.
  Dean Herbert · 2017-02-18 15:54:16 +09:00
  94dd268fd2
• Make disclaimer actually be a thing.
  Dean Herbert · 2017-02-18 14:16:46 +09:00
  bf33cc6f53
• Update framework.
  Dean Herbert · 2017-02-18 13:23:53 +09:00
  76cab600d9
• Fixed BeatmapPanels disappearing
  Alex Amadori · 2017-02-17 23:32:14 +01:00
  6b3ecc28b8
• Fix compilation error introduced in merge conflict resolution.
  Thomas Müller · 2017-02-17 21:27:17 +01:00
  ef775458dd
• Merge branch 'refs/heads/update-framework' into general-fixes
  Thomas Müller · 2017-02-17 21:26:39 +01:00
  04de28d8b2
• Merge branch 'master' of github.com:ppy/osu into general-fixes

  # Conflicts:
  #	osu.Game/Beatmaps/Beatmap.cs

  Thomas Müller · 2017-02-17 21:22:34 +01:00
  1198705a6f
• Don't rely on default relative size of ScrollContainer.
  Thomas Müller · 2017-02-17 20:08:28 +01:00
  4b0d6cd26b
• Added exception
  Andrey Zavadskiy · 2017-02-17 21:07:59 +03:00
  2f4855b00f
• Merge pull request #366 from OussamaDanba/slider_timingpoint_fix

  Fix beatmap import crash when the first timingPoint starts later than…

  Thomas Müller · 2017-02-17 18:22:55 +01:00
  6a58d7ab2a
• Add comment explaining why the branch is necessary
  Shadoxfix · 2017-02-17 18:17:18 +01:00
  7a45ea58b2
• Implemented basic sorting logic
  Alex Amadori · 2017-02-17 17:41:53 +01:00
  7dcbefd50f
• Fix beatmap import crash when the first timingPoint starts later than a slider
  Shadoxfix · 2017-02-17 17:36:00 +01:00
  72306e8757
• Merge branch 'master' of https://github.com/ppy/osu
  Jorolf · 2017-02-17 12:54:11 +01:00
  88c48bec46
• Add better screen hierarchy and placeholder for dev build disclaimer.
  Dean Herbert · 2017-02-17 20:07:16 +09:00
  fe3a6248ec
• GameMode -> Screen.
  Dean Herbert · 2017-02-17 19:23:58 +09:00
  e6ef9f67aa
• Remove outdated comment.
  Dean Herbert · 2017-02-17 17:33:41 +09:00
  366e95dd4f
• Improve exit procedure.
  Dean Herbert · 2017-02-17 17:25:28 +09:00
  9e8b4d43dd
• Fix nullref due to missing controlPoints.
  Dean Herbert · 2017-02-17 15:27:48 +09:00
  0b922365bb
• Added high/low multiplier indication
  DrabWeb · 2017-02-16 19:09:18 -04:00
  4ccfa380f5
• Added toggling mods with keys
  DrabWeb · 2017-02-16 19:00:18 -04:00
  e0dab3490f
• 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
• Merge pull request #364 from peppy/general-fixes

  Design improvements

  Dean Herbert · 2017-02-16 22:49:57 +09:00
  v2017.216.1 ecb840e26f
• Adjust Explode alpha slightly.
  Dean Herbert · 2017-02-16 22:48:47 +09:00
  aaed714160
• Move other score components to centre alignment (and switch font).
  Dean Herbert · 2017-02-16 22:44:41 +09:00
  53e40804ab
• Update Health display design.
  Dean Herbert · 2017-02-16 22:44:21 +09:00
  ca6946c7a2