19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-cursor-in-scale-container
  Dan Balasescu · 2019-03-08 12:43:57 +09:00
  d1c18c52ab
• Merge pull request #4437 from peppy/fix-resharper-inspection

  Fix stuck r# inspection

  Dean Herbert · 2019-03-08 12:43:17 +09:00
  c4cc72cad9
• Merge branch 'master' into fix-roomstate-on-cancel
  Jamie Taylor · 2019-03-08 12:39:29 +09:00
  08fc42f8e9
• Merge pull request #4419 from nekodex/fix-duplicate-bg-sprites

  Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites

  Dean Herbert · 2019-03-08 12:34:56 +09:00
  3a634b7d72
• Merge branch 'master' into gameplay-clock-container
  Dean Herbert · 2019-03-08 12:32:48 +09:00
  75e94eba35
• Fix test regression
  Dean Herbert · 2019-03-08 12:30:52 +09:00
  345c7f4fa8
• Merge branch 'master' into fix-resharper-inspection
  Dean Herbert · 2019-03-08 12:29:56 +09:00
  5ade51f030
• Merge branch 'master' into fix-duplicate-bg-sprites
  Dean Herbert · 2019-03-08 12:25:23 +09:00
  30a0bb4a25
• Merge pull request #4434 from peppy/fix-autoplay-tests

  Fix replay tests not working

  Dean Herbert · 2019-03-08 12:21:33 +09:00
  196ebab10f
• Fix stuck r# inspection
  Dean Herbert · 2019-03-08 12:16:12 +09:00
  d01b026ebd
• Move more toolbar to async load
  Dean Herbert · 2019-03-08 12:15:27 +09:00
  075ea70124
• Fire initial APIStateChanged on local thread
  Dean Herbert · 2019-03-08 12:15:27 +09:00
  11e5c6a2a0
• Merge branch 'master' into fix-autoplay-tests
  Dan Balasescu · 2019-03-08 12:14:40 +09:00
  101009c92e
• Merge pull request #4435 from peppy/update-framework-and-prs

  Update framework

  Dan Balasescu · 2019-03-08 10:59:28 +09:00
  272ebeb23d
• Disable failing tests temporarily
  Dean Herbert · 2019-03-08 10:42:25 +09:00
  cfac47413c
• Rename remaining usage of PathWidth naming convention
  Dean Herbert · 2019-03-07 20:21:59 +09:00
  340997f505
• Update framework
  Dean Herbert · 2019-03-07 20:14:43 +09:00
  27edc41c11
• Merge branch 'drawnode-changes'
  Dean Herbert · 2019-03-07 20:10:42 +09:00
  5ab9f45a8f
• Merge branch 'line-graph-fix'
  Dean Herbert · 2019-03-07 20:10:11 +09:00
  7fa84335ce
• Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design

  # Conflicts:
  #	osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
  #	osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
  #	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
  #	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs

  smoogipoo · 2019-03-07 18:48:23 +09:00
  30c6a7c3c5
• Fix autoplay tests not working
  Dean Herbert · 2019-03-07 18:34:56 +09:00
  1f44dde96b
• Adjust with shader changes
  smoogipoo · 2019-03-07 18:30:18 +09:00
  04d756524d
• Merge remote-tracking branch 'nekodex/master' into drawnode-changes
  smoogipoo · 2019-03-07 18:15:12 +09:00
  e430b8a640
• Rename PathWidth to PathRadius
  David Zhao · 2019-03-07 17:39:19 +09:00
  b3e046c4d1
• Apply twice the line radius in order to properly account for diameter
  David Zhao · 2019-03-07 17:25:51 +09:00
  b2f4850275
• Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
  Jamie Taylor · 2019-03-07 17:01:24 +09:00
  c34e110a2c
• Move online id null check to only bypass metrics lookup
  Jamie Taylor · 2019-03-07 16:59:43 +09:00
  054db48089
• Move room resetting logic from MatchSubScreen to LoungeSubScreen
  Jamie Taylor · 2019-03-07 16:49:48 +09:00
  50c1b3a576
• Merge pull request #4430 from peppy/jit-abbreviation

  Add JIT as abbreviation

  Dean Herbert · 2019-03-07 16:17:37 +09:00
  c9ca5098d9
• Don't perform lookup of beatmap stats unless an online id is present
  Jamie Taylor · 2019-03-07 16:17:12 +09:00
  e5e454ddcd
• Merge branch 'master' into fix-duplicate-bg-sprites
  Dan Balasescu · 2019-03-07 16:11:33 +09:00
  ae4ca2cb66
• Merge pull request #4427 from nekodex/fix-mp-chat-in-own-room

  Fix inability to send messages to a newly created room

  Dan Balasescu · 2019-03-07 16:11:10 +09:00
  235865ef8f
• Simplify inward bindings
  Dean Herbert · 2019-03-07 16:04:11 +09:00
  64b6eaa844
• Add JIT as abbreviation
  Dean Herbert · 2019-03-07 16:03:24 +09:00
  57204b4361
• Move all clock related gameplay logic inside GameplayClockContainer
  Dean Herbert · 2019-03-07 16:02:24 +09:00
  58ef397f4f
• Merge branch 'master' into fix-mp-chat-in-own-room
  Dan Balasescu · 2019-03-07 15:59:53 +09:00
  7783c33398
• Merge pull request #4424 from nekodex/fix-mp-songselect-regression

  Fix crash on cancelling multiplayer song select when no existing song is selected

  Dean Herbert · 2019-03-07 15:40:20 +09:00
  0b4f10950f
• Fix chat channel ids not being updated on room creation
  Jamie Taylor · 2019-03-07 15:35:57 +09:00
  ee076bbbe3
• Only attempt to restore CurrentItem state if present
  Jamie Taylor · 2019-03-07 14:09:28 +09:00
  e13516c2ba
• Account for path width correctly in LineGraph
  David Zhao · 2019-03-07 13:45:55 +09:00
  d97c070ef1
• Fix some nullref crashes when escaping out of new room creation
  Jamie Taylor · 2019-03-06 20:03:37 +09:00
  6e5ea78ca2
• Reset currentRoom state when cancelling room creation
  Jamie Taylor · 2019-03-06 20:03:37 +09:00
  5de6e29294
• Use AddUntilStep instead of AddWaitStep
  Jamie Taylor · 2019-03-06 19:57:09 +09:00
  8a69fc5534
• Fix DI not working
  smoogipoo · 2019-03-06 19:27:42 +09:00
  22423f60d4
• Formatting fixes
  smoogipoo · 2019-03-06 19:26:48 +09:00
  e3d463a141
• Add additional testing to check for extra children in the future
  Jamie Taylor · 2019-03-06 19:13:25 +09:00
  b5e89e2f3b
• Pass through timeBeforeLoad instead of hardcoding
  Jamie Taylor · 2019-03-06 19:12:37 +09:00
  ab0ac7a82a
• Prevent null beatmap from creating an extra drawable
  Jamie Taylor · 2019-03-06 19:12:28 +09:00
  06b65e00c4
• Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites
  Jamie Taylor · 2019-03-06 19:12:22 +09:00
  eb80549782
• Add back cursor proxying
  Dean Herbert · 2019-03-06 17:44:58 +09:00
  ffe53411f6