17218 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
  smoogipoo · 2019-03-08 16:32:46 +09:00
  a7ad29ca9d
• Merge pull request #4431 from peppy/gameplay-clock-container

  Simplify gameplay clock logic with a dedicated container

  Dan Balasescu · 2019-03-08 16:05:48 +09:00
  a40a0f10bd
• Remove blank line
  smoogipoo · 2019-03-08 15:56:36 +09:00
  d055b248ac
• Merge remote-tracking branch 'origin/master' into gameplay-clock-container

  # Conflicts:
  #	osu.Game/Screens/Play/Player.cs

  smoogipoo · 2019-03-08 15:54:15 +09:00
  7c5ca67691
• Merge pull request #4436 from peppy/fix-non-async-load

  Fix some non-async load scenarios

  Dan Balasescu · 2019-03-08 15:49:02 +09:00
  253a37c8a7
• Merge branch 'master' into fix-non-async-load
  Dan Balasescu · 2019-03-08 15:14:37 +09:00
  c967875ff6
• Merge remote-tracking branch 'origin/master' into fix-non-async-load
  smoogipoo · 2019-03-08 15:14:14 +09:00
  e00702f4e4
• Move sizing to ctor
  smoogipoo · 2019-03-08 15:14:07 +09:00
  09b5cf4891
• Merge pull request #4418 from peppy/cursor-in-playfield

  Fix gameplay cursor discrepancies

  Dan Balasescu · 2019-03-08 15:12:26 +09:00
  7bf60934a5
• Merge remote-tracking branch 'upstream/master' into gameplay-clock-container
  Dean Herbert · 2019-03-08 15:07:55 +09:00
  ed8c9bc88a
• Apply review
  Dean Herbert · 2019-03-08 15:05:45 +09:00
  42efea1e06
• Move cursor construction to BDL
  Dean Herbert · 2019-03-08 15:01:45 +09:00
  a73e3d9700
• Split out consumption and creation into two separate code paths
  Dean Herbert · 2019-03-08 14:59:45 +09:00
  2c98ba1c0c
• Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
  Dean Herbert · 2019-03-08 14:50:46 +09:00
  3ccc76e18f
• Merge pull request #4420 from nekodex/fix-roomstate-on-cancel

  Fix RoomInspector image inadvertently changing when cancelling MP room creation

  Dan Balasescu · 2019-03-08 14:30:17 +09:00
  398c330934
• Merge branch 'master' into fix-roomstate-on-cancel
  Dan Balasescu · 2019-03-08 14:10:24 +09:00
  969d5bcbd0
• Merge pull request #4410 from peppy/fix-cursor-in-scale-container

  Fix menu cursor not displaying outside of gameplay scaling area

  Dan Balasescu · 2019-03-08 14:06:58 +09:00
  93ae058681
• Fix incomplete comment
  Dean Herbert · 2019-03-08 12:44:33 +09:00
  400514630d
• 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 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
• 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