19824 Commits

This Branch

This Branch

All Branches

• 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
• Revert some unnecessary changes
  Dean Herbert · 2019-03-06 17:41:54 +09:00
  62716851a1
• Change method of cursor creation
  Dean Herbert · 2019-03-06 17:41:54 +09:00
  7aa30ca3f6
• Adjust cursor scale for its new surroundings
  Dean Herbert · 2019-03-06 17:41:54 +09:00
  18826b3a59
• Move cursor inside playfield
  Dean Herbert · 2019-03-06 17:41:54 +09:00
  acf518c208
• Fix menu cursor not displaying outside of gameplay scaling area
  Dean Herbert · 2019-03-06 17:14:08 +09:00
  5411c63093
• Fix post-merge errors
  smoogipoo · 2019-03-06 16:09:21 +09:00
  3c999d64d4
• Merge remote-tracking branch 'origin/master' into profile-header-update

  # Conflicts:
  #	osu-resources
  #	osu.Game/Overlays/Profile/Components/GradeBadge.cs
  #	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
  #	osu.Game/Overlays/Profile/Header/RankGraph.cs
  #	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
  #	osu.Game/Overlays/Profile/ProfileHeader.cs

  smoogipoo · 2019-03-06 15:53:30 +09:00
  ee1f9d4981
• Formatting and simplification
  Dean Herbert · 2019-03-06 14:19:00 +09:00
  2300e59e91
• Merge branch 'master' into mod-wind
  Dean Herbert · 2019-03-06 14:04:04 +09:00
  d70b373af9
• Merge pull request #4400 from nyquillerium/LobbyList

  Use correct background display type for multiplayer lobby listing

  Dean Herbert · 2019-03-06 13:34:15 +09:00
  00cdb3a44a
• Use actual reference to default beatmap for fallback

  Co-Authored-By: nyquillerium <nyquill@ppy.sh>

  Dean Herbert · 2019-03-06 13:01:37 +09:00
  9441f88033
• Merge branch 'master' into LobbyList
  Dean Herbert · 2019-03-06 12:34:36 +09:00
  b94d080b1c
• Merge branch 'master' into fix-cursor-in-scale-container
  Dean Herbert · 2019-03-05 22:22:56 +09:00
  6b042eae94
• Merge pull request #4408 from peppy/simplify-gameplay-clock

  Simplify gameplay clocks

  Dan Balasescu · 2019-03-05 20:43:44 +09:00
  2019.305.0 60af8e2820
• Merge branch 'master' into simplify-gameplay-clock
  Dean Herbert · 2019-03-05 20:22:46 +09:00
  8a6fa0915e