4131 Commits

• Merge branch 'master' into fix-hold-for-menu-icon
  Dan Balasescu · 2019-04-22 18:57:43 +09:00
  8fc0bf24c7
• Fix hold for menu button's icon being incorrect
  Dean Herbert · 2019-04-22 18:47:28 +09:00
  48e82d4b1c
• Fix incorrect seek target
  Dean Herbert · 2019-04-22 18:45:58 +09:00
  6856571f17
• Remove delay on entering player
  Dean Herbert · 2019-04-22 18:29:58 +09:00
  55c5ef898d
• Fix pause tests
  Dean Herbert · 2019-04-22 18:29:51 +09:00
  908eee9942
• Remove delay on entering player
  Dean Herbert · 2019-04-22 17:06:40 +09:00
  b3c496d72c
• Fix pause tests
  Dean Herbert · 2019-04-22 17:06:22 +09:00
  034643b835
• Fix rank display on break info display
  Dean Herbert · 2019-04-21 12:04:15 +08:00
  6f2bc943eb
• Merge remote-tracking branch 'upstream/master' into user-status-wiring
  Lucas A · 2019-04-20 09:42:32 +02:00
  fe8c705f1b
• Add draw size invalidation to ZoomableScrollContainer
  David Zhao · 2019-04-19 16:21:15 +09:00
  6502e26d09
• Merge branch 'master' into player-mod-reinstantiation
  Dean Herbert · 2019-04-17 16:42:57 +08:00
  2d7b3094ba
• Use .With() wherever possible
  smoogipoo · 2019-04-17 17:24:09 +09:00
  12b6bc48bd
• Merge remote-tracking branch 'origin/master' into facade-container

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

  smoogipoo · 2019-04-17 17:17:33 +09:00
  09568be270
• Fix tracking position during 150ms state change delay
  smoogipoo · 2019-04-17 17:05:35 +09:00
  897bfa60db
• Fix post-merge errors
  smoogipoo · 2019-04-17 16:11:59 +09:00
  5a3d6a0258
• Merge branch 'master' into player-mod-reinstantiation
  Dean Herbert · 2019-04-16 22:35:21 +08:00
  bb539af1a0
• Merge branch 'master' into user-status-wiring
  Lucas A · 2019-04-15 11:43:53 +02:00
  5887008fb3
• fix appveyor warnings
  LeNitrous · 2019-04-14 07:55:15 +08:00
  2d227d25cc
• use ModDisplay
  LeNitrous · 2019-04-14 07:22:31 +08:00
  91c327a90f
• Check for breaks using GameplayClock time.
  DrabWeb · 2019-04-13 11:39:22 -03:00
  c766631ad6
• Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in
  Lucas A · 2019-04-13 13:18:44 +02:00
  361c0ec9f2
• Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
  Lucas A · 2019-04-12 22:54:35 +02:00
  da5d6cb1d4
• OsuScreens can now set a per screen user status

  which defaults to UserStatusOnline

  Lucas A · 2019-04-12 22:36:01 +02:00
  69dda0ffd4
• add random button
  LeNitrous · 2019-04-11 05:47:32 +08:00
  01cc78108c
• please appveyor
  LeNitrous · 2019-04-10 22:10:09 +08:00
  b4d0755818
• let mods button have selected mod icons
  LeNitrous · 2019-04-10 21:53:13 +08:00
  22f9339b01
• Make mods IReadOnlyList<Mod> gamewide

  Prevents potential multiple evaluations of enumerable.

  smoogipoo · 2019-04-10 17:20:36 +09:00
  0222424aef
• Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods

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

  smoogipoo · 2019-04-10 12:06:51 +09:00
  85d3ff4846
• Rename SelectedMods -> Mods
  smoogipoo · 2019-04-10 12:03:57 +09:00
  4310f07a5c
• Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
  jorolf · 2019-04-09 20:42:39 +02:00
  c1db635933
• Merge branch 'master' into fix-offset-seek-handling
  Dan Balasescu · 2019-04-09 15:40:48 +09:00
  3073508a23
• Reinstantiate mods for every player
  smoogipoo · 2019-04-09 13:33:16 +09:00
  4c571acd67
• Reset mods when exiting match
  smoogipoo · 2019-04-09 12:59:32 +09:00
  56496d28ba
• Fix various crashes due to bindable being disabled
  smoogipoo · 2019-04-09 12:59:32 +09:00
  cbb3fdaca8
• Reimplement select mod track adjustments
  smoogipoo · 2019-04-09 12:59:32 +09:00
  ad124bfeec
• Remove mods from workingbeatmap
  smoogipoo · 2019-04-09 12:59:32 +09:00
  c584967eb1
• Use var
  smoogipoo · 2019-04-09 12:58:10 +09:00
  ca9f172a96
• Fix OsuScreenDependencies using the incorrect parent
  smoogipoo · 2019-04-09 12:56:23 +09:00
  93b6cc00df
• Merge remote-tracking branch 'Joehuu/master' into drawnode-composability

  # Conflicts:
  #	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs

  smoogipoo · 2019-04-08 23:01:12 +09:00
  772bef91fa
• Remove need for tracking bool and backing logo
  David Zhao · 2019-04-08 16:14:41 +09:00
  8a01995668
• Apply reviews
  David Zhao · 2019-04-08 15:24:09 +09:00
  a690302d00
• Fix ResumeContainers appearing when resuming during breaks.
  DrabWeb · 2019-04-07 16:32:55 -03:00
  e76897d6a7
• Merge branch 'master' into invert-login-notification-depth
  Lucas A · 2019-04-07 14:03:01 +02:00
  e948b11756
• BeatmapLeaderboard: use OrderByDescending instead of negation

  (suggested by peppy)

  Ferdinand Bachmann · 2019-04-07 13:26:35 +02:00
  d431ca4efc
• Allow loginOverlay to be null if there's no cached instance in DI (for testing cases)
  Lucas A · 2019-04-06 18:52:30 +02:00
  3f2e6a9376
• Make appveyor happy with whitespaces
  Lucas A · 2019-04-06 18:23:56 +02:00
  394f14965b
• Open login overlay when notification asking for signing in to play multi is clicked
  Lucas A · 2019-04-06 18:05:13 +02:00
  59410dbe3b
• BeatmapLeaderboard: fix local scores not being sorted
  theFerdi265 · 2019-04-06 00:53:02 +02:00
  cb3532e7d4
• Merge branch 'master' into facade-container
  Dean Herbert · 2019-04-05 21:14:21 +09:00
  46ecaf3d6c
• Merge branch 'master' into button_fix
  Dean Herbert · 2019-04-05 20:47:08 +09:00
  f93504c65a