16468 Commits

This Branch

This Branch

All Branches

• Adjust sprite texts in-line with framework changes
  smoogipoo · 2019-02-20 15:03:20 +09:00
  a2aa3ec5cb
• Merge pull request #4226 from smoogipoo/cmc-rooms

  Use CachedModelDependencyContainer for multiplayer

  Dean Herbert · 2019-02-10 10:30:33 +09:00
  e174fa2d3e
• Merge remote-tracking branch 'upstream/master' into cmc-rooms
  Dean Herbert · 2019-02-08 18:45:39 +09:00
  a30d3739cf
• Fix multiple blank lines
  Dean Herbert · 2019-02-08 18:45:32 +09:00
  f52cac966b
• Pass item rather than ID
  Dean Herbert · 2019-02-08 18:33:49 +09:00
  6c4d289901
• Fix nullref during room creation (#4228)
  Dan Balasescu · 2019-02-08 17:53:01 +09:00
  7ec0b4ba77
• Update framework
  Dean Herbert · 2019-02-08 17:38:18 +09:00
  e8aed6b686
• Fix potential nullref when exiting multiplayer (#4227)

  Fixes https://github.com/ppy/osu/issues/3954

  Dan Balasescu · 2019-02-08 17:28:00 +09:00
  959b1ac845
• Fix failing test cases
  smoogipoo · 2019-02-08 16:08:23 +09:00
  7aca0f4a1d
• Remove compiler warnings
  smoogipoo · 2019-02-08 16:02:00 +09:00
  ee5ff283d1
• Remove currentRoom from RoomManager
  smoogipoo · 2019-02-08 15:46:16 +09:00
  febcd7d7c0
• Merge remote-tracking branch 'origin/master' into cmc-rooms
  smoogipoo · 2019-02-08 15:44:33 +09:00
  fdd37dbc4b
• Update framework
  smoogipoo · 2019-02-08 15:44:11 +09:00
  b5cc0ec8db
• Remove redundant qualifiers
  smoogipoo · 2019-02-08 15:44:05 +09:00
  5643dc2e99
• Fix crash when start button is repeatedly pressed
  smoogipoo · 2019-02-08 15:39:11 +09:00
  6fe1f57236
• Slight cleanup in multiplayer
  smoogipoo · 2019-02-08 15:38:05 +09:00
  99a7ccc01a
• Fix playlist issues with room creation
  smoogipoo · 2019-02-08 15:23:03 +09:00
  43240ea85e
• Move current room to multiplayer
  smoogipoo · 2019-02-08 14:57:51 +09:00
  42cd55e0d7
• Directly resolve the filter bindable
  smoogipoo · 2019-02-08 13:02:17 +09:00
  7f13e3c5f7
• Combine roommanager and roompollingcomponent
  smoogipoo · 2019-02-08 13:01:10 +09:00
  990bd44ca2
• Fix room title in the breadcrumbs
  smoogipoo · 2019-02-07 20:09:49 +09:00
  17fdfc15d9
• Fix up room inspector status
  smoogipoo · 2019-02-07 17:59:14 +09:00
  1c2450a95a
• Move StatusColouredContainer into a more public location
  smoogipoo · 2019-02-07 17:52:40 +09:00
  1e0135af6f
• Fix room name being coloured
  smoogipoo · 2019-02-07 16:45:36 +09:00
  2d61548251
• Merge pull request #4220 from HoLLy-HaCKeR/diffcalc-proper-attributes

  Use correct DifficultyAttributes where possible

  Dan Balasescu · 2019-02-07 12:42:31 +09:00
  7ee8115eaa
• Merge branch 'master' into diffcalc-proper-attributes
  Dan Balasescu · 2019-02-07 12:30:55 +09:00
  5b4933ca60
• Merge pull request #4221 from Morilli/patch-1

  Fix typo in README.md

  Dan Balasescu · 2019-02-07 12:20:26 +09:00
  8402c4c4ef
• Fix typo in README.md
  Moritz Bender · 2019-02-06 21:59:47 +01:00
  6e2ecd5fcc
• Use correct DifficultyAttributes where possible
  HoLLy · 2019-02-06 21:28:42 +01:00
  ae9d5f999c
• Fix match settings not showing
  smoogipoo · 2019-02-06 18:50:43 +09:00
  4f86fe92ea
• Fix background being cut off at the top of the screen (#4207)

  Fix background being cut off at the top of the screen

  ProgrammaticNajel · 2019-02-06 18:14:33 +09:00
  9f8e724a76
• Fix current room being set to null when parted
  smoogipoo · 2019-02-06 15:12:40 +09:00
  3207983a1c
• Remove ShadowModel requirement
  smoogipoo · 2019-02-06 13:52:48 +09:00
  a9aa22c97b
• Merge pull request #4213 from ekrctb/vscode-task-restore-fix

  Fix VSCode Restore task

  Dan Balasescu · 2019-02-06 12:12:30 +09:00
  0d6ce3b8bb
• Fix VSCode Restore task
  ekrctb · 2019-02-06 12:02:04 +09:00
  0e3a087ed3
• Merge pull request #4209 from peppy/fix-combo-color-fallbacks

  Fix combo colour fallbacks when skin is not providing any

  Dan Balasescu · 2019-02-06 11:38:59 +09:00
  43d66b2e90
• Fix a few cases of missed instant invocation
  smoogipoo · 2019-02-05 19:11:20 +09:00
  594dffba41
• Use CMC for all of multiplayer
  smoogipoo · 2019-02-05 19:00:08 +09:00
  aac371ba6e
• Rollback other fallthrough regressions
  Dean Herbert · 2019-02-05 18:14:43 +09:00
  5b1f111922
• Fix class name
  Dean Herbert · 2019-02-05 18:09:15 +09:00
  8ae2861ed6
• Remove unused pieces of ini
  Dean Herbert · 2019-02-05 18:08:27 +09:00
  a6b2e9eb0b
• Fix combo colour fallbacks when skin is not providing any
  Dean Herbert · 2019-02-05 17:54:14 +09:00
  2f8f4fac64
• Implement MultiplayerComposite, replaces RoomBindings
  smoogipoo · 2019-02-05 16:14:37 +09:00
  be51ee4ed5
• Use CMC in the Multiplayer screen
  smoogipoo · 2019-02-05 16:03:05 +09:00
  d9537017c8
• Split polling logic from RoomManager, now a container
  smoogipoo · 2019-02-05 15:38:19 +09:00
  37c1f5a824
• Merge pull request #4203 from EVAST9919/keybindings-settings-groups

  Use sidebar in key bindings overlay

  Dan Balasescu · 2019-02-05 12:11:29 +09:00
  e33277bd76
• Merge branch 'master' into keybindings-settings-groups
  Dan Balasescu · 2019-02-05 11:42:53 +09:00
  84ab16c7c8
• Merge pull request #4205 from smoogipoo/fix-background-fade-2

  Fix background not being faded correctly

  Dean Herbert · 2019-02-04 22:43:10 +09:00
  a47023b607
• Merge branch 'master' into fix-background-fade-2
  Dean Herbert · 2019-02-04 22:32:50 +09:00
  216030fe64
• Merge pull request #4192 from UselessToucan/fix_song_rearranging_in_music_controller_playlist

  Add PlaylistItemHandle.HandlePositionalInput override

  Dan Balasescu · 2019-02-04 17:05:43 +09:00
  ea7b56c8b1