6033 Commits

This Branch

This Branch

All Branches

• 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
• 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
• 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
• Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
  Thomas Müller · 2017-07-18 12:35:48 +03:00
  6d8bdadf2d
• Sender is always non-null
  Thomas Müller · 2017-07-18 12:35:36 +03:00
  a225b542d5
• Migrate padding into the scroll content to not cut off effects
  Thomas Müller · 2017-07-18 12:26:27 +03:00
  fce5a191f1
• Improve design as requested
  Thomas Müller · 2017-07-18 12:26:05 +03:00
  e58ea97604
• Merge pull request #1024 from Tom94/fix-broken-tooltip

  Fix OsuTooltipContainer.PopIn not overriding PopOut transforms

  Dean Herbert · 2017-07-18 18:11:26 +09:00
  b33c8226c1
• Update framework
  Thomas Müller · 2017-07-18 11:57:41 +03:00
  b2dd43075f
• Fix OsuTooltipContainer.PopIn not overriding PopOut transforms
  Thomas Müller · 2017-07-18 11:53:56 +03:00
  7acff29bd3
• Update framework
  Thomas Müller · 2017-07-18 10:54:57 +03:00
  52acd23a5a
• Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
  Thomas Müller · 2017-07-18 10:54:15 +03:00
  c8eeea64c3
• Highlight custom-named users
  Thomas Müller · 2017-07-18 10:53:41 +03:00
  e72c009dd7
• Merge pull request #966 from jai-sharma/remove-dragbar

  Remove DragBar and replace with classes that inherit SliderBar

  Dean Herbert · 2017-07-18 15:43:40 +09:00
  0034b718a9
• Don't use dodgy OnLoaded "event"
  Dean Herbert · 2017-07-18 15:37:58 +09:00
  4b4b03756a
• Fix dodgy event clearing

  Also use local ariables where possible.

  Dean Herbert · 2017-07-18 15:24:52 +09:00
  82217be988
• Merge remote-tracking branch 'upstream/master' into remove-dragbar

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

  Dean Herbert · 2017-07-18 13:44:23 +09:00
  c5d23daa6b
• Merge pull request #949 from MrTheMake/songselect-preview-fix

  Fix not applying song select preview seek

  Dean Herbert · 2017-07-18 13:09:59 +09:00
  ef869cb501
• Merge branch 'master' into songselect-preview-fix
  Dean Herbert · 2017-07-18 13:05:03 +09:00
  b5035ec245
• Merge pull request #936 from huoyaoyuan/profile

  Basic User Profile Page

  Dean Herbert · 2017-07-17 14:10:52 +09:00
  v2017.717.0 406cf9d0d4
• Rename populate method
  Dean Herbert · 2017-07-17 13:56:50 +09:00
  93290ef966
• User property instead of weirdly named method
  Dean Herbert · 2017-07-17 13:39:29 +09:00
  a63124c935