1809 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into difficulty-calculator
  Dean Herbert · 2017-02-20 21:20:56 +09:00
  aedce4d516
• Merge pull request #378 from peppy/general-fixes

  Fix GlobalHotkeys not working (regression due to masking rules).

  Thomas Müller · 2017-02-20 08:00:17 +01:00
  86a3d7b2c0
• Merge branch 'master' into difficulty-calculator
  Thomas Müller · 2017-02-20 07:38:10 +01:00
  444c3ba817
• Merge branch 'master' into general-fixes
  Thomas Müller · 2017-02-20 07:37:31 +01:00
  1ead694c75
• Merge pull request #373 from Jorolf/MoreOptions

  Enable Parallax Option

  Dean Herbert · 2017-02-20 15:36:58 +09:00
  5916efd1c2
• Fix GlobalHotkeys not working (regression due to masking rules).
  Dean Herbert · 2017-02-20 15:31:15 +09:00
  a621a65eb5
• Update framework.
  Dean Herbert · 2017-02-20 15:30:58 +09:00
  7d08ccaae4
• Add support for varying circle size
  Thomas Müller · 2017-02-19 18:21:45 +01:00
  7a0cea332f
• Fix incorrect naming scheme
  Thomas Müller · 2017-02-19 18:21:15 +01:00
  502ad4aa53
• 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
• replaced bool with Bindable<bool>

  Also accounted for the ParallaxAmount when moving to default position

  Jorolf · 2017-02-19 17:11:36 +01:00
  1e0a694ff8
• Update ParallaxContainer.cs
  Jorolf · 2017-02-19 16:54:00 +01:00
  7f751d3653
• Removed public ParallaxEnabled property
  Jorolf · 2017-02-19 13:47:26 +01:00
  e83ac8b04c
• Moved movement to the default position to property
  Jorolf · 2017-02-18 22:26:48 +01:00
  f166bb0f96
• compacted code, made public bool to disable it
  Jorolf · 2017-02-18 22:00:07 +01:00
  77bfe57d8c
• Parallax Option works now
  Jorolf · 2017-02-18 21:34:21 +01:00
  a48e4a31a7
• Merge remote-tracking branch 'refs/remotes/ppy/master' into MoreOptions
  Jorolf · 2017-02-18 21:13:28 +01:00
  353581bf16
• 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
• Merge pull request #370 from peppy/general-fixes

  General fixes.

  Thomas Müller · 2017-02-18 16:14:57 +01:00
  a53695347f
• 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
• 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
• 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
• 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
• 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
• 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
• 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
• Update Key Counter font.
  Dean Herbert · 2017-02-16 22:43:49 +09:00
  9a2beb5979