61410 Commits

This Branch

This Branch

All Branches

• Merge pull request #937 from MrTheMake/intro-track-start-fix

  Don't start a beatmap's track until the intro is done playing

  Dean Herbert · 2017-07-20 09:05:15 +09:00
  a3329fef37
• Don't start a beatmap's track until the intro is done playing
  MrTheMake · 2017-07-20 01:57:46 +02:00
  fd518e2294
• Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes
  Jorolf · 2017-07-20 01:08:42 +02:00
  bac8693c81
• remove using
  Jorolf · 2017-07-20 01:08:26 +02:00
  e0fb2563b5
• Merge branch 'master' into user-profile-fixes
  jorolf · 2017-07-20 01:06:36 +02:00
  c2a2f77210
• add link to user page
  Jorolf · 2017-07-20 01:03:00 +02:00
  b016103894
• Merge branch 'master' of github.com:ppy/osu into better-transforms

  # Conflicts:
  #	osu-framework

  Thomas Müller · 2017-07-19 19:15:51 +02:00
  c4619f614a
• Fix Player crashing due to null BeatmapInfo (now unused).
  smoogipooo · 2017-07-20 01:27:27 +09:30
  d75e439f94
• Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
  MrTheMake · 2017-07-19 16:50:29 +02:00
  6ff2b73c30
• Merge pull request #1027 from peppy/non-null-beatmap

  Make Beatmap non-nullable

  Dan Balasescu · 2017-07-19 22:05:24 +09:30
  a7d4a3d473
• Fix remaining test case issues
  Dean Herbert · 2017-07-19 19:10:04 +09:00
  38431f8555
• Fix broken test case
  Dean Herbert · 2017-07-19 18:48:27 +09:00
  8ce71ef235
• Merge branch 'master' into non-null-beatmap
  Dean Herbert · 2017-07-19 18:32:42 +09:00
  da92fccdb0
• Set zero-difficulty values local to the dummy beatmap
  Dean Herbert · 2017-07-19 18:32:11 +09:00
  d7dddec328
• Update framework
  Dean Herbert · 2017-07-19 18:24:03 +09:00
  8764d88f0f
• Forward action in saner way
  Dean Herbert · 2017-07-19 18:22:46 +09:00
  2c5019ff7c
• Merge branch 'master' into user-profile-fixes
  Dean Herbert · 2017-07-19 18:15:38 +09:00
  b6b7ae47db
• Reference system
  Dean Herbert · 2017-07-19 18:09:59 +09:00
  0b53f1a7e3
• Simplify comparator
  Dean Herbert · 2017-07-19 18:09:59 +09:00
  a01209cfe0
• Make DefaultBeatmap private get.
  Dean Herbert · 2017-07-19 18:09:59 +09:00
  35157ca6b8
• Make link text not suck
  Dean Herbert · 2017-07-19 17:54:04 +09:00
  2eccb3822a
• Merge pull request #1026 from peppy/beatmap-delete-fixes

  Fix crashes related to deleting/importing beatmaps

  Dan Balasescu · 2017-07-19 17:46:49 +09:30
  285790bae0
• Merge branch 'master' into beatmap-delete-fixes
  Dan Balasescu · 2017-07-19 17:34:12 +09:30
  42af26a5a5
• Merge pull request #1028 from peppy/fix-flashy-sides

  Fix main menu flashy sides moving too much

  Dan Balasescu · 2017-07-19 17:26:26 +09:30
  11eecdd281
• Gratify CI
  Dean Herbert · 2017-07-19 16:34:18 +09:00
  c34856922c
• Ensure side flashes are not visible during moving transitions
  Dean Herbert · 2017-07-19 16:13:01 +09:00
  2a2f4e2a8b
• Side flashes should not be affected by parallax
  Dean Herbert · 2017-07-19 16:07:11 +09:00
  2b1e19814c
• Remove incorrect looping reset behaviour

  Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.

  Dean Herbert · 2017-07-19 15:55:16 +09:00
  c8593a38c8
• Remove many now unnecessary null-checks
  Dean Herbert · 2017-07-19 15:45:23 +09:00
  64ebc01a3b
• Fix some test regressions
  Dean Herbert · 2017-07-19 15:16:59 +09:00
  21d07428fe
• Give song select a better default background whecn the beatmap's can't be loaded
  Dean Herbert · 2017-07-19 15:16:55 +09:00
  8e8767cd37
• Make Beatmap (bindable) non-nullable.
  Dean Herbert · 2017-07-19 15:16:53 +09:00
  d0dea33faa
• Simplify state changes
  Dean Herbert · 2017-07-19 15:16:51 +09:00
  0846414c5b
• Dummy beatmap has dummy ruleset
  Dean Herbert · 2017-07-19 15:16:48 +09:00
  632d2e8ba5
• Move dummy to BeatmapDatabase
  Dean Herbert · 2017-07-19 15:16:43 +09:00
  f168ee660c
• Give the dummy beatmap a background
  Dean Herbert · 2017-07-19 15:16:42 +09:00
  3289d93f22
• Fix incorrect equality check when TimingPointAt returns a default T
  Dean Herbert · 2017-07-19 15:16:40 +09:00
  007b343854
• Move DummyWorkingBeatmap to a more global level (OsuScreen)
  Dean Herbert · 2017-07-19 15:16:39 +09:00
  21984ba764
• Use a better default for difficulty values
  Dean Herbert · 2017-07-19 15:16:37 +09:00
  6016310b09
• Stop playing previous beatmap even if new beatmap has no track
  Dean Herbert · 2017-07-19 15:16:36 +09:00
  df60fc0f0a
• Don't show theme song in playlist
  Dean Herbert · 2017-07-19 15:16:35 +09:00
  59416584c1
• Add a dummy beatmap provider for use in BeatmapInfoWedge
  Dean Herbert · 2017-07-19 15:16:33 +09:00
  e47faf4e85
• Add null check on stream
  Dean Herbert · 2017-07-19 14:56:27 +09:00
  6f59e5feec
• Avoid crashes on attempting to import the same path twice in quick succession
  Dean Herbert · 2017-07-19 14:56:24 +09:00
  f00140f0a4
• Fix nullref error on re-importing a DeletePending beatmap

  Callback was expecting the beatmap to be populated where it wasn't being.

  Dean Herbert · 2017-07-19 14:56:20 +09:00
  5761eb30a0
• Merge pull request #1023 from Tom94/custom-chat-colours

  Use a background for custom-coloured users

  Dean Herbert · 2017-07-19 09:09:56 +09:00
  11ddded6fc
• Ensure toolbar disappears when osu logo transition is cancelled
  Thomas Müller · 2017-07-18 17:09:53 +03:00
  3ba119c115
• Fix osu logo shockwave playing when transition is aborted

  This is a very nice use-case scenario for TransformSequence.OnComplete

  Thomas Müller · 2017-07-18 15:28:56 +03:00
  b40c897dbd
• Update framework
  Thomas Müller · 2017-07-18 15:20:00 +03:00
  ed793328f1
• Merge branch 'master' of https://github.com/ppy/osu into better-transforms

  # Conflicts:
  #	osu-framework
  #	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
  #	osu.Game/Overlays/DragBar.cs

  Thomas Müller · 2017-07-18 15:16:02 +03:00
  4d8261fe0b