61410 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into hud-improvements

  # Conflicts:
  #	osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs

  Dean Herbert · 2017-04-14 19:29:59 +09:00
  ac3b435f00
• Merge branch 'master' into song-progress-graph
  Dean Herbert · 2017-04-14 19:24:13 +09:00
  9d753a7798
• Improve test case.
  Dean Herbert · 2017-04-14 19:23:33 +09:00
  627114abec
• Fix unsynchronised tweening.
  Dean Herbert · 2017-04-14 19:20:07 +09:00
  98544a8077
• Encapsulate progress update logic better.
  Dean Herbert · 2017-04-14 18:23:34 +09:00
  ea0631ede8
• Hook up beatmap object density to progress display.
  Dean Herbert · 2017-04-14 17:58:37 +09:00
  acd7a5b254
• Fix SongProgress handling escape.
  Dean Herbert · 2017-04-14 15:27:24 +09:00
  6421f040dd
• Fix incorrect default state. Handle input better.
  Dean Herbert · 2017-04-14 14:40:52 +09:00
  8c41707ac7
• Merge remote-tracking branch 'upstream/master' into song-progress-graph

  # Conflicts:
  #	osu.Game/Overlays/DragBar.cs

  Dean Herbert · 2017-04-14 11:25:00 +09:00
  09195a03a2
• Merge pull request #631 from peppy/pause-clean-up

  Pause clean up

  Dean Herbert · 2017-04-14 11:22:15 +09:00
  d2fd3f1e0c
• add IHasOverhangingTooltip
  Jorolf · 2017-04-14 00:18:17 +02:00
  7f08c3c417
• Merge branch 'master' of git://github.com/ppy/osu into tooltips

  # Conflicts:
  #	osu.Game/Graphics/Cursor/MenuCursor.cs

  Jorolf · 2017-04-13 23:12:07 +02:00
  f6f75fac74
• changed way the tool tip is found and displayed
  Jorolf · 2017-04-13 23:00:49 +02:00
  c2b2e5ec19
• Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up

  # Conflicts:
  #	osu.Game/Screens/Play/FailOverlay.cs
  #	osu.Game/Screens/Play/PauseOverlay.cs

  Dean Herbert · 2017-04-14 01:07:34 +09:00
  9bf861d0a4
• Merge pull request #629 from peppy/general-fixes

  General fixes

  Dan Balasescu · 2017-04-14 01:05:26 +09:00
  9b44ff3b8e
• Update framework.
  Dean Herbert · 2017-04-14 00:57:57 +09:00
  e62922ba64
• Add exception for failing.
  Dean Herbert · 2017-04-13 19:13:09 +09:00
  262a2c9f0e
• Use interpolatedSourceClock's IsRunning value for consistency.
  Dean Herbert · 2017-04-13 18:31:23 +09:00
  5f8baf874d
• Give CursorTrail its own clock for the time being.
  Dean Herbert · 2017-04-13 14:14:12 +09:00
  13f057f900
• Fix MosueUp and HighResolution events not being handled by MenuOverlays.
  Dean Herbert · 2017-04-13 13:03:07 +09:00
  1f4e0b0251
• Improve "escape" pressing logic in pause/fail menus.
  Dean Herbert · 2017-04-13 12:40:00 +09:00
  359fea7e25
• Fix thread race conditions on pausing close to a fail.
  Dean Herbert · 2017-04-13 11:41:08 +09:00
  94bf1d65b6
• Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.
  smoogipooo · 2017-04-13 10:04:12 +09:00
  3054697f98
• Merge branch 'master' into master
  ocboogie · 2017-04-12 15:04:27 -07:00
  7b240d84da
• Merge pull request #574 from Jorolf/details

  Beatmap Details

  Dean Herbert · 2017-04-12 21:19:14 +09:00
  v2017.412.0 37d458e562
• Metric -> Metrics.
  Dean Herbert · 2017-04-12 21:09:39 +09:00
  2c3fa30386
• Better comments.
  Dean Herbert · 2017-04-12 21:08:28 +09:00
  00cd2c8372
• Removed unneeded using
  ocboogie · 2017-04-12 04:54:24 -07:00
  32b87d12b5
• Use formatter to add zeroes.
  smoogipooo · 2017-04-12 20:28:04 +09:00
  2987a57588
• Merge branch 'master' into details
  Dean Herbert · 2017-04-12 20:25:51 +09:00
  157ad17606
• Merge pull request #622 from peppy/sliderbar-improvements

  Add special SliderBar sound behaviour when at extents.

  Dean Herbert · 2017-04-12 20:24:53 +09:00
  cfacfe8294
• Remove unused using.
  Dan Balasescu · 2017-04-12 20:14:12 +09:00
  5bf71aae9c
• Merge branch 'master' into sliderbar-improvements
  Dean Herbert · 2017-04-12 20:04:36 +09:00
  1d1b291efc
• Merge pull request #625 from peppy/dependency-updates

  Update nuget packages.

  Dan Balasescu · 2017-04-12 20:04:00 +09:00
  c20f8f5e8e
• Some more clean up
  ocboogie · 2017-04-12 04:01:52 -07:00
  6c6ef946bd
• Merge branch 'master' into dependency-updates
  Dan Balasescu · 2017-04-12 19:56:18 +09:00
  ce269eaebb
• switch -> if.
  Dean Herbert · 2017-04-12 19:41:11 +09:00
  ec6267c5b2
• Update nuget packages.

  Includes fix in OpenTK for focus issues.

  Dean Herbert · 2017-04-12 19:35:16 +09:00
  c0338a82e7
• Fixed repeat keys working for retrying
  ocboogie · 2017-04-12 02:50:03 -07:00
  d250dde537
• Fixed repeat keys working for resuming
  ocboogie · 2017-04-12 02:43:42 -07:00
  348dd71406
• remove ??
  Jorolf · 2017-04-12 11:25:32 +02:00
  98ce9e0724
• fails, retries and size not enforced
  Jorolf · 2017-04-12 11:05:10 +02:00
  e285d33f8c
• requested changes
  Jorolf · 2017-04-12 10:52:24 +02:00
  d2affe6867
• Fixed pause and fail screen overlap
  ocboogie · 2017-04-12 00:20:41 -07:00
  8cad09370d
• Merge pull request #623 from smoogipooo/general-fixes

  General fixes

  Dean Herbert · 2017-04-12 15:19:21 +09:00
  5676541173
• Trim whitespace
  Dan Balasescu · 2017-04-12 15:06:46 +09:00
  6ab274abc0
• Better comment.
  smoogipooo · 2017-04-12 15:04:11 +09:00
  f8076ec792
• Revert another masking container.
  smoogipooo · 2017-04-12 15:01:54 +09:00
  50a598dd05
• Revert "Better masking."

  This reverts commit 5d5040ee73.

  smoogipooo · 2017-04-12 15:00:26 +09:00
  32c3e34eb7
• Revert "Implement proper masking support for taiko hit objects."

  This reverts commit 4e2ae72126.

  smoogipooo · 2017-04-12 15:00:18 +09:00
  7a24e5f509