15723 Commits

This Branch

This Branch

All Branches

• Fix post-merge issues
  smoogipoo · 2018-12-22 15:35:22 +09:00
  ac0e6f8d42
• Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip

  # Conflicts:
  #	osu.Game/Online/Leaderboards/Leaderboard.cs
  #	osu.Game/Online/Leaderboards/LeaderboardScore.cs
  #	osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
  #	osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs

  smoogipoo · 2018-12-22 15:33:26 +09:00
  bdb6e03dfb
• Move protected method down
  Dean Herbert · 2018-12-22 15:23:32 +09:00
  52c6d5bfd4
• Reduce generic-ness
  Dean Herbert · 2018-12-22 15:20:35 +09:00
  787e65c3c5
• Make RoomScore derive ScoreInfo
  smoogipoo · 2018-12-22 15:17:35 +09:00
  3570c35d7f
• Adjust styling of disabled settings
  smoogipoo · 2018-12-22 15:00:35 +09:00
  6afd2f7263
• Implement testcase for room settings
  smoogipoo · 2018-12-22 14:48:15 +09:00
  34fc740e1f
• Remove unnecessary using
  Dean Herbert · 2018-12-22 14:45:35 +09:00
  23259b295c
• Separate out Leaderboard into BeatmapLeaderboard
  smoogipoo · 2018-12-22 14:44:36 +09:00
  e657f13c15
• Mate RoomSettingsOverlay fill height
  smoogipoo · 2018-12-22 14:40:10 +09:00
  b82bb0ea28
• Allow channel manager and osugame to be null
  smoogipoo · 2018-12-22 14:38:46 +09:00
  09d7dc73dc
• Rework+fix TestCaseMultiHeader
  smoogipoo · 2018-12-22 14:30:08 +09:00
  dbd391825a
• Allow roommanager to be null
  smoogipoo · 2018-12-22 14:14:14 +09:00
  7191233be8
• Decouple header from matchscreen
  smoogipoo · 2018-12-22 14:12:27 +09:00
  21cfe5a3e6
• Decouple match info from match screen
  smoogipoo · 2018-12-22 14:08:00 +09:00
  c06cf5d379
• Merge remote-tracking branch 'Joehuu/master' into timeshift-wip

  # Conflicts:
  #	osu.Game/Screens/Play/HUD/ModDisplay.cs

  smoogipoo · 2018-12-22 14:02:45 +09:00
  d93421b796
• Cleanup bindable handling
  smoogipoo · 2018-12-22 14:01:06 +09:00
  f1a9a352fc
• Split requests/responses into separate files
  smoogipoo · 2018-12-22 12:50:37 +09:00
  1cb69c3478
• Move RoomManager to multiplayer screen
  smoogipoo · 2018-12-22 12:45:36 +09:00
  dd0c04ea36
• Merge pull request #3894 from Poyo-SSB/fix-hardrock-sliders

  Fix extra hard-rock flipping for sliders

  Dean Herbert · 2018-12-22 09:45:36 +09:00
  c1d316d06e
• Fix extra hard-rock flipping for sliders
  Poyo · 2018-12-21 16:08:08 -08:00
  08d7c2df70
• Seed the results screen
  smoogipoo · 2018-12-21 18:37:33 +09:00
  7e9cc4e876
• Add room leaderboard to results
  smoogipoo · 2018-12-21 18:22:13 +09:00
  4149734f89
• Split results screen to allow for extensibility
  smoogipoo · 2018-12-21 16:34:03 +09:00
  8a2cc64bfa
• Merge pull request #3889 from peppy/add-alt-select-support

  Add ability to select chat tabs with alt-1-9

  Dean Herbert · 2018-12-21 15:02:52 +09:00
  a54951b72d
• Fix incorrect channel
  smoogipoo · 2018-12-21 14:37:05 +09:00
  fe6c369e07
• Merge branch 'master' into add-alt-select-support
  Dean Herbert · 2018-12-21 14:32:24 +09:00
  6bca344e56
• Merge remote-tracking branch 'origin/master' into timeshift-wip
  smoogipoo · 2018-12-21 14:14:17 +09:00
  1df4826a1d
• Merge pull request #3892 from smoogipoo/standalone-chat-fixes

  Various standalone chat display fixes

  Dean Herbert · 2018-12-21 14:12:37 +09:00
  1e39a4e09a
• Fix initial messages not being received
  smoogipoo · 2018-12-21 14:02:36 +09:00
  6a9b0a0ba3
• Fix not posting to the correct channel
  smoogipoo · 2018-12-21 14:02:29 +09:00
  6b6629e9fd
• Remove participants, add match chat
  smoogipoo · 2018-12-21 14:01:11 +09:00
  fa2bc16140
• Update framework
  Dean Herbert · 2018-12-21 13:33:06 +09:00
  59452800ed
• Fix possible nullref
  smoogipoo · 2018-12-21 13:26:50 +09:00
  14879acd83
• Cleanup
  smoogipoo · 2018-12-21 13:06:11 +09:00
  e27b7b0c0d
• Merge remote-tracking branch 'origin/master' into timeshift-wip

  # Conflicts:
  #	osu.Game.Tests/Visual/TestCasePollingComponent.cs
  #	osu.Game/Online/API/APIRequest.cs
  #	osu.Game/osu.Game.csproj

  smoogipoo · 2018-12-21 12:51:31 +09:00
  5d59a1ffca
• Merge pull request #3887 from peppy/standalone-chat

  Add a stand-alone chat display component

  Dan Balasescu · 2018-12-21 12:47:01 +09:00
  e8a03a94d1
• Merge branch 'master' into standalone-chat
  Dan Balasescu · 2018-12-21 12:31:33 +09:00
  3d4edd9121
• Merge pull request #3890 from peppy/netcoreapp22-target

  Fix targeting netcoreapp2.1 in many places

  Dan Balasescu · 2018-12-21 12:20:22 +09:00
  a18b28388d
• Fix targeting netcoreapp2.1 in many places
  Dean Herbert · 2018-12-21 10:24:32 +09:00
  e26958f901
• Add ability to select chat tabs with alt-1-9
  Dean Herbert · 2018-12-20 21:50:47 +09:00
  aaac45ab8c
• Add joining/parting room requests
  smoogipoo · 2018-12-20 20:58:34 +09:00
  822225577b
• Merge pull request #3180 from WebFreak001/mod-fl2

  Add "Blinds" mod

  Dean Herbert · 2018-12-20 20:25:26 +09:00
  f195d6cb23
• Fix create room button showing in song select
  smoogipoo · 2018-12-20 20:09:17 +09:00
  9031896484
• Add click to avatar
  smoogipoo · 2018-12-20 20:08:22 +09:00
  104a3c8ffc
• Linkify everything
  smoogipoo · 2018-12-20 20:03:45 +09:00
  6a76e335c7
• Add method to add arbitrary drawables as links
  smoogipoo · 2018-12-20 20:01:58 +09:00
  f8d25a1b6c
• Merge branch 'master' into mod-fl2
  Dean Herbert · 2018-12-20 19:56:25 +09:00
  ce414ed7d0
• Merge pull request #3888 from plankp/patch-1

  Update README about SDK version

  Dean Herbert · 2018-12-20 19:50:52 +09:00
  abad9b8721
• Update README.md
  Paul Teng · 2018-12-20 05:49:05 -05:00
  36f57a7abb