33989 Commits

This Branch

This Branch

All Branches

• Merge pull request #10790 from peppy/fix-spectator-replay-thread-safety

  Fix frames potentially getting added to spectator replay in wrong format

  Dan Balasescu · 2020-11-11 15:02:28 +09:00
  acee24e4fd
• Fix frames potentially getting added to spectator replay in wrong format

  The way spectator currently works, the `Spectator` screen is responsible
  for adding new frames to the replay, even when it has a child
  (`SpectatorPlayer`) present.
  
  There was a possibility that a new play had already started, and on
  returning to the Spectator screen (to initialise the new play) there
  would be a brief period where the Player instance is still reading from
  the replay, the `userBeganPlaying` call had not yet finished
  initialising the new target replay, and `userSentFrames` is run
  (asynchronously), writing frames to the previous replay using the
  incorrect ruleset instance).
  
  To make this work, it doesn't `Schedule` frame addition to the replay
  (making things a bit unsafe). Changing this itself isn't such a simple
  one to do, so I instead opted to fix this via locking.
  
  Closes https://github.com/ppy/osu/issues/10777.

  Dean Herbert · 2020-11-11 13:39:43 +09:00
  11cf04eed1
• Merge pull request #7762 from EVAST9919/history-graph
  Dean Herbert · 2020-11-11 11:35:34 +09:00
  6593aac3f2
• Merge pull request #10784 from peppy/fix-best-performance-weighting

  Fix user profile best performance weighting being out of order

  Dan Balasescu · 2020-11-11 11:21:43 +09:00
  451f0a29c6
• Merge pull request #10776 from smoogipoo/fix-possible-nullref

  Fix possible nullref with non-attached hitobjects

  Dean Herbert · 2020-11-11 11:14:57 +09:00
  a82291f31f
• Merge branch 'master' into history-graph
  Dean Herbert · 2020-11-11 11:01:48 +09:00
  89c4e3d3b2
• Merge pull request #10717 from smoogipoo/dho-apply
  Dean Herbert · 2020-11-11 10:54:24 +09:00
  8706b51b77
• Fix user profile best performance weighting being out of order
  Dean Herbert · 2020-11-11 10:19:59 +09:00
  53c968e137
• Merge pull request #10782 from bdach/bandaid-editor-timing-point-crash

  Temporarily fix crash on deleting control point groups

  Dean Herbert · 2020-11-11 09:22:40 +09:00
  390f7644d4
• Merge master with conflicts resolved
  Andrei Zavatski · 2020-11-11 01:37:01 +03:00
  6c428d8b11
• Temporarily fix crash on deleting control point groups
  Bartłomiej Dach · 2020-11-10 21:32:47 +01:00
  546249b071
• Fix possible nullref with non-attached hitobjects
  smoogipoo · 2020-11-11 00:29:34 +09:00
  81844878b0
• Fix test failures
  smoogipoo · 2020-11-10 22:02:33 +09:00
  4ea823e4dc
• Merge pull request #10770 from cadon0/fix-storyboard-sprite-paths

  Fix crashes if animation sprite path does not match a file

  Bartłomiej Dach · 2020-11-10 13:32:19 +01:00
  8788ef74aa
• Merge branch 'master' into fix-storyboard-sprite-paths
  Bartłomiej Dach · 2020-11-10 12:57:10 +01:00
  20f9759a2e
• Merge pull request #10760 from peppy/fix-profile-graph-crash

  Fix crash and edge cases of user profile graph implementation

  Bartłomiej Dach · 2020-11-10 12:56:48 +01:00
  9b3f7e8d5c
• Update framework
  Dean Herbert · 2020-11-10 20:29:29 +09:00
  e1dcac4d8b
• Remove redundant class name qualifier
  Bartłomiej Dach · 2020-11-10 12:20:49 +01:00
  61093030ee
• Rename variables
  Bartłomiej Dach · 2020-11-10 12:20:26 +01:00
  ce837eaba0
• Merge branch 'master' into fix-profile-graph-crash
  Bartłomiej Dach · 2020-11-10 12:17:12 +01:00
  dd873dbd85
• Rewrite - Add empty drawable whenever sprite not found
  cadon0 · 2020-11-10 23:52:37 +13:00
  539806e9d6
• Fix paths for storyboard animation sprites
  cadon0 · 2020-11-10 23:52:37 +13:00
  6446074976
• Remove result storage from hitobject
  smoogipoo · 2020-11-10 18:56:16 +09:00
  88112801eb
• Merge pull request #10767 from peppy/fix-editor-crash-on-two-mouse-button-click

  Fix BlueprintContainer triggering assert when left and right mouse button are pressed together

  Dan Balasescu · 2020-11-10 18:41:58 +09:00
  ef1036cef1
• Merge pull request #10769 from peppy/fix-mod-select-keys-handle-control

  Stop mod select overlay hotkeys handling input when control is pressed

  Dan Balasescu · 2020-11-10 18:37:14 +09:00
  d873229120
• Revert unnecessary change
  smoogipoo · 2020-11-10 18:15:11 +09:00
  f5076fe3b8
• Merge pull request #10768 from bdach/force-import-standardised

  Always store standardised score when populating ScoreInfo

  Dan Balasescu · 2020-11-10 18:12:35 +09:00
  4e3f6f19f4
• Clamp index to valid bounds
  Dean Herbert · 2020-11-10 18:08:12 +09:00
  833c0b223e
• Merge branch 'master' into fix-profile-graph-crash
  Dean Herbert · 2020-11-10 18:06:51 +09:00
  2e3dc6fc46
• Stop mod select overlay hotkeys handling input when control is pressed

  Closes https://github.com/ppy/osu/issues/10766 in about the best way we
  can for now.

  Dean Herbert · 2020-11-10 17:57:59 +09:00
  28daff1716
• Merge branch 'master' into fix-editor-crash-on-two-mouse-button-click
  Dan Balasescu · 2020-11-10 17:42:25 +09:00
  601cc477e5
• Merge pull request #10764 from peppy/fix-editor-quick-delete-via-left-mouse

  Fix editor quick delete being triggerable from left mouse button

  Dan Balasescu · 2020-11-10 17:42:12 +09:00
  86026ad98f
• Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
  Dean Herbert · 2020-11-10 17:16:28 +09:00
  de6fcd1792
• Merge pull request #10763 from peppy/fix-offscreen-textbox-direct-overlay

  Force beatmap listing overlay's textbox back on screen when a key is pressed

  Dan Balasescu · 2020-11-10 17:16:28 +09:00
  3f49077620
• Fix editor quick delete being triggerable from left mouse button

  Closes https://github.com/ppy/osu/issues/10629.

  Dean Herbert · 2020-11-10 16:54:37 +09:00
  a012105dac
• Always store standardised score when populating ScoreInfo
  Bartłomiej Dach · 2020-11-10 08:41:00 +01:00
  109abc0e29
• Only handle keys which create characters
  Dean Herbert · 2020-11-10 16:32:58 +09:00
  5221a34929
• Force beatmap listing overlay's textbox back on screen when a key is pressed

  Not the cleanest solution, but works for now. Will eventually be
  replaced after the header is updated to reflect the latest designs
  (which keeps it on screen in all cases).
  
  Closes https://github.com/ppy/osu/issues/10703.

  Dean Herbert · 2020-11-10 16:26:30 +09:00
  a2ef3aa21a
• Merge remote-tracking branch 'refs/remotes/ppy/master' into history-graph
  Andrei Zavatski · 2020-11-10 10:22:57 +03:00
  e464e719ef
• Merge pull request #10751 from smoogipoo/fix-bdc-threadsafety
  Dean Herbert · 2020-11-10 15:43:21 +09:00
  c8917d1236
• Merge pull request #10722 from nbvdkamp/fix-vscode-build-tasks-for-git-bash
  Dean Herbert · 2020-11-10 14:37:00 +09:00
  b1367acf74
• Add explicit lock object and some xmldoc for clarity
  Dean Herbert · 2020-11-10 14:31:52 +09:00
  6cc0bf17a9
• Merge branch 'master' into fix-bdc-threadsafety
  Dean Herbert · 2020-11-10 14:31:51 +09:00
  dc21aebdc7
• Merge pull request #10740 from Game4all/add-multi-statuses
  Dean Herbert · 2020-11-10 14:23:26 +09:00
  85d641c630
• Merge pull request #10758 from nbvdkamp/rank-history-json-property-fix

  Replace rankHistory in JsonProperty with rank_history for consistency

  Dean Herbert · 2020-11-10 14:05:25 +09:00
  4855e43764
• Merge pull request #10757 from Joehuu/simplify-input-buttons/keys-in-tests

  Simplify input buttons/keys in tests

  Dean Herbert · 2020-11-10 14:03:22 +09:00
  73c2638b3b
• Merge pull request #10759 from Joehuu/disable-watching-yourself
  Dean Herbert · 2020-11-10 13:10:54 +09:00
  582b5454ed
• Move hierarchy init to load and remove unnecessary field storage
  Dean Herbert · 2020-11-10 12:33:07 +09:00
  4af390a168
• Merge pull request #10742 from Morilli/fix-ki-texture-positioning
  Dean Herbert · 2020-11-10 12:27:40 +09:00
  de554f9091
• Make button field readonly
  Joehu · 2020-11-09 18:59:54 -08:00
  670d6d8719